13224 Commits

Author SHA1 Message Date
Jaime van Kessel
f68fdb01b4 Added preference to disable auto center when selecting object 2015-08-20 10:55:13 +02:00
Tamara Hogenhout
0ea042a140 Cleanup 2015-08-19 17:11:23 +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
9324dbff02 15.10 New font for Cura
Contributes to: issue CURA-60
2015-08-19 15:24:06 +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
Tim Kuipers
6047d85c7f JSON: 100% infill bugfix: 100% infill now triggers all layers to be bottom layers 2015-08-18 17:14:22 +02:00
Tim Kuipers
56e4fb71ad JSON: extruder_nr was still present in UMO and UM2 2015-08-18 16:27:35 +02:00
Nicanor Romero Venier
933def40b2 Modified some settings in profiles 2015-08-18 16:22:32 +02:00
Jaime van Kessel
251c043add Removed debug print statements 2015-08-18 14:37:21 +02:00
Jaime van Kessel
2bd7b5764d Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-18 14:31:27 +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
Tim Kuipers
b785ba05ac JSON bugfix: maker_starter had become wrong 2015-08-18 13:38:08 +02:00
Tim Kuipers
2c10c3a36b Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-18 13:08:23 +02:00
Tim Kuipers
91aeef18cc JSON: removed dual settings from UMO and UM2 2015-08-18 13:08:05 +02:00
Tim Kuipers
3d58939738 moved new speed and line width settings to overrides 2015-08-18 13:07:38 +02:00
Tim Kuipers
2b81db03ed JSON: moved more settings to dual_extrusion_printer.json and corrected a json mistake there 2015-08-18 12:26:10 +02:00
Tim Kuipers
77778742b9 JSOn: refactor: renamed fill_... to infill_... 2015-08-18 11:51:42 +02:00
Tim Kuipers
9d9e6c5cf0 JSON: moved platform adhesion category below support 2015-08-18 11:39:49 +02:00
Tim Kuipers
8e74fbfff3 renamed wrong setting names in 3rd party machines, removed machine_nozzle_offsets 2015-08-18 11:38:29 +02:00
Tim Kuipers
1684b9c5f1 JSON: extracted dual extrusion settings and renamed categories Fixes and Line Dimensions to Mesh Fixes and Quality 2015-08-18 11:37:44 +02:00
Jaime van Kessel
c20b3bc2d5 Fixed crash 2015-08-18 10:50:54 +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
bd76a18ea7 15.10 Adds a color for the line between the toolbar buttons
Contributes to: issue CURA-60
2015-08-17 17:32:50 +02:00
Tamara Hogenhout
ac95858e4b 15.10 Restyling buttons in the contentArea
Still have to change the buttonsizes, but I don't have the final designs/sizes yet.

Contributes to: issue CURA-60
2015-08-17 17:32:20 +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
Tim Kuipers
bed540e912 JSON: default top/bottom layers back to 6 2015-08-17 17:09:57 +02:00
Tim Kuipers
5b5b02f599 JSON: bugfix: turn off infill overlap when infill is dense 2015-08-17 17:00:02 +02:00
Tim Kuipers
6b98cea003 JSONs: implemented overrides block for all [printer].json files: 3rd party and UMO 2015-08-17 16:24:44 +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
d69ca6fa41 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-17 15:18:56 +02:00
Jaime van Kessel
2b5627234a Changed selectupgradeparts 2015-08-17 15:18:46 +02:00
Arjen Hiemstra
f9bf27c148 Replace category stuff with the new setting overrides
As a test for the new functionality. Also cleans up the file a little.
2015-08-17 15:07:19 +02:00
Tamara Hogenhout
82e4f04e27 Merge branch 'master' of https://github.com/Ultimaker/Cura 2015-08-17 14:34:11 +02:00
Tamara Hogenhout
6a097aaded put wizardcontant in a scrollview 2015-08-17 14:33:48 +02:00