3111 Commits

Author SHA1 Message Date
Jaime van Kessel
d195c859a2 Code style & switch to translation catalog 2015-08-27 16:04:02 +02:00
Tamara Hogenhout
3d5f4e6bd6 15.10 re-alignment of the toolbar
This is a test to be reviewed

Contributes to: issue CURA-60
2015-08-27 14:59:33 +02:00
Tamara Hogenhout
55f51a53b6 15.10 restyling of the savebutton Area
More elaborate shortdescription for especially the outputdevices still have to be implemented. And the filename textfield is not finished.

Contributes to: issue CURA-60
2015-08-27 14:29:44 +02:00
Jaime van Kessel
4fb577b893 Fixed default button for general and view page
contributes to Ultimaker/Cura#245
2015-08-26 15:49:53 +02:00
Jaime van Kessel
87364f37a6 Fixed double ID in qml 2015-08-26 15:37:10 +02:00
Jaime van Kessel
a49ce21fbe Adding a machine now hides if there are no more pages 2015-08-26 15:18:01 +02:00
Jaime van Kessel
97f80914c5 Fixed slice settings sender 2015-08-26 15:09:53 +02:00
Arjen Hiemstra
9a88176f6f Clean up Add Machine Wizard and use the new MachineDefintionsModel 2015-08-25 18:14:48 +02:00
Arjen Hiemstra
1fc4d28864 Use firstRun property for the Add machine wizard 2015-08-25 18:12:24 +02:00
Tamara Hogenhout
534c277b00 15.10 restyling of the layerview slider
Adds a textfield to the handle for per layer selection and removes the display of the min- and maxvalue

Contributes to: issue CURA-60
2015-08-25 12:20:13 +02:00
Arjen Hiemstra
f081bf4026 Use the right resource path for locating Qml resources 2015-08-21 18:29:13 +02:00
Arjen Hiemstra
f099c30dfd Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (98 commits)
  15.10 Restyling of the message stack
  Fixed machine head polygons
  Removed unused settings from fdmprinter
  Added action for togling fullscreen
  Fixed usage of wrong checkbox in viewpage
  Added preference to disable automatic push free
  Added preference to disable auto center when selecting object
  Cleanup
  15.10 Restyling toolbar, viewmode button
  Update README.md
  Update README.md
  Added rudementary 3 point bed leveling
  15.10 New font for Cura
  15.10 Changes the styling for the open file button
  15.10 Changes the label names for the different action buttons
  Fixed typo
  Endstop now stops listening upon destruction
  15.10 Re-alignment of the messagestack
  Cleaned up code a bit
  Added heated bed check
  ...
2015-08-21 13:29:30 +02:00
Tamara Hogenhout
3cb3cce31c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-21 10:55:44 +02:00
Tamara Hogenhout
720577ff8e 15.10 Restyling of the message stack
specifically the progressbar, styling of the messages and colors

Contributes to: issue CURA-60
2015-08-21 10:54:39 +02:00
Jaime van Kessel
5f844d4039 Added action for togling fullscreen
Contributes to CURA-52
2015-08-20 13:33:10 +02:00
Jaime van Kessel
21d8eb941b Fixed usage of wrong checkbox in viewpage 2015-08-20 11:55:03 +02:00
Jaime van Kessel
bbf0b92f87 Added preference to disable automatic push free
fix #49
2015-08-20 11:53:30 +02:00
Jaime van Kessel
04999a42c8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-20 10:55:25 +02:00
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Tamara Hogenhout
b7e9accf75 15.10 Restyling toolbar, viewmode button
Contributes to: issue CURA-60
2015-08-19 17:05:59 +02:00
Jaime van Kessel
5cab8b9467 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 16:51:47 +02:00
Jaime van Kessel
07c19498f1 Added rudementary 3 point bed leveling 2015-08-19 16:47:48 +02:00
Tamara Hogenhout
ab9cd7793c Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 14:53:25 +02:00
Tamara Hogenhout
2df2c9c6c8 15.10 Changes the styling for the open file button
Everything related to the font is not changed yet, first we have to agree on the chosen font

Contributes to: issue CURA-60
2015-08-19 14:52:38 +02:00
Tamara Hogenhout
43aee84f12 15.10 Changes the label names for the different action buttons
Contributes to: issue CURA-60
2015-08-19 14:51:03 +02:00
Jaime van Kessel
d7704a1ae5 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 14:35:47 +02:00
Jaime van Kessel
7fda5e9a39 Endstop now stops listening upon destruction 2015-08-19 14:35:35 +02:00
Tamara Hogenhout
b799acafab 15.10 Re-alignment of the messagestack
Contributes to: issue CURA-60
2015-08-19 12:18:01 +02:00
Jaime van Kessel
83426878d2 Cleaned up code a bit 2015-08-19 11:55:24 +02:00
Jaime van Kessel
d146801da6 Added heated bed check 2015-08-19 11:35:02 +02:00
Jaime van Kessel
f0a358d175 Added heater check 2015-08-19 11:18:58 +02:00
Jaime van Kessel
d683a6b77b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-19 10:27:41 +02:00
Jaime van Kessel
8dce3a6f8c Added endstop switch check to wizard 2015-08-19 10:27:32 +02:00
Arjen Hiemstra
a425036c4c Merge branch '15.06'
* 15.06:
  Fix poor visibility of MessageStack against grid
  Fix USB printer detection and reconnect after firmware update on MacOSX
  Correct the icon for the Cura .desktop file
  Bump version
  support defaults to ZigZag instead of Lines
  Fix the platform activity check
2015-08-18 17:59:16 +02:00
Jaime van Kessel
251c043add Removed debug print statements 2015-08-18 14:37:21 +02:00
Jaime van Kessel
c95cf5263b Changes to USB printer manager so its usable by other qml files 2015-08-18 14:12:48 +02:00
Jaime van Kessel
b35912e7ba Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-18 10:47:38 +02:00
Jaime van Kessel
2454f78e2d Made machine wizard more dynamic 2015-08-18 10:46:56 +02:00
Tamara Hogenhout
efbae53e6e 15.10 Restyling Toolbar buttons
Contributes to: issue CURA-60
2015-08-17 17:30:53 +02:00
Tamara Hogenhout
7adc9732e8 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-17 17:24:21 +02:00
Tamara Hogenhout
42fd35a8c2 15.10 Placement of the buttons in the contentArea
Contributes to: issue CURA-60
2015-08-17 17:22:58 +02:00
Jaime van Kessel
a7f33ea5e7 Updated other wizard pages to fit the changed wizard.qml 2015-08-17 15:24:24 +02:00
Jaime van Kessel
2b5627234a Changed selectupgradeparts 2015-08-17 15:18:46 +02:00
Tamara Hogenhout
6a097aaded put wizardcontant in a scrollview 2015-08-17 14:33:48 +02:00
Tamara Hogenhout
3a1e6333cc cleanup 2015-08-13 14:03:03 +02:00
Tamara Hogenhout
062df7c512 Changes the styling of the wizardPages
commits to #143
2015-08-13 10:49:24 +02:00
Tamara Hogenhout
b14f3d98bc Adds the styling and wizardPages (more directly) to the generic wizard
contributes to #143
2015-08-13 10:48:33 +02:00
Arjen Hiemstra
900e733839 Add a combo box and menu entries to select the current machine variant 2015-08-11 17:36:05 +02:00
Arjen Hiemstra
255caf8693 Add a combo box to select active profile 2015-08-11 17:35:36 +02:00
Arjen Hiemstra
09cfda095b Convert the last bits over to the changed API 2015-08-11 17:02:17 +02:00