25 Commits

Author SHA1 Message Date
Arjen Hiemstra
73ec6e9f1c Use resolvedUrl since that does give the right path for qml files 2015-09-03 10:13:47 -07:00
Arjen Hiemstra
39b6f81bdf Use machine manager to get the platform width/depth 2015-09-02 12:23:51 +02:00
Arjen Hiemstra
de60fb47bf Remove superfluous log and unneeded hide 2015-09-02 12:23:14 +02:00
Arjen Hiemstra
c9f62a4eab Remove duplicate i18n catalog 2015-09-01 17:29:37 +02:00
Arjen Hiemstra
57b2ce4f3e Merge branch 'master' of github.com:ultimaker/Cura into per_object_settings
* 'master' of github.com:ultimaker/Cura: (49 commits)
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar header
  15.10 restyling of the sidebar
  split magic_mesh)surface_mode into Normal, Surface, Both
  Added preference to disable automatic scale
  Removed unused import
  Added changeLog plugin
  Added missing )
  Merging of mine and Jaimes work
  Removed font from rectangle
  JSON: git diff! removed triangles and grid top/bottom skin options (though they are available)
  Code style & switch to translation catalog
  15.10 re-alignment of the toolbar
  15.10 New Icons
  15.10 restyling of the savebutton Area
  Added message asking about sending data to server
  Added exception handling for checking overlap.
  Fixed default button for general and view page
  Fixed double ID in qml
  Removed unused import
  ...
2015-09-01 15:44:19 +02:00
Arjen Hiemstra
5e3d492aba Set wizard to null so we do not get complaints from QML 2015-09-01 15:07:45 +02:00
Jaime van Kessel
d195c859a2 Code style & switch to translation catalog 2015-08-27 16:04:02 +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
Arjen Hiemstra
9a88176f6f Clean up Add Machine Wizard and use the new MachineDefintionsModel 2015-08-25 18:14:48 +02:00
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Jaime van Kessel
07c19498f1 Added rudementary 3 point bed leveling 2015-08-19 16:47:48 +02:00
Jaime van Kessel
7fda5e9a39 Endstop now stops listening upon destruction 2015-08-19 14:35:35 +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
8dce3a6f8c Added endstop switch check to wizard 2015-08-19 10:27:32 +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
2454f78e2d Made machine wizard more dynamic 2015-08-18 10:46:56 +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
062df7c512 Changes the styling of the wizardPages
commits to #143
2015-08-13 10:49:24 +02:00
Tamara Hogenhout
783b75bcd9 combines work on the wizard by Jaime and myself
contributes to #128
2015-07-31 16:42:57 +02:00
Tamara Hogenhout
8596c08a80 Adds a generic wizard
contributes to #128
2015-07-30 19:11:48 +02:00