866 Commits

Author SHA1 Message Date
Arjen Hiemstra
f7ecc1dc40 Properly set the current index of variant/profile combo boxes 2015-09-01 15:07:13 +02:00
Arjen Hiemstra
5aa95f1258 Use the active machine instance for Build Volume 2015-09-01 15:06:03 +02:00
Arjen Hiemstra
510f5978f0 Remove most of the PrintInformation code and fix the material amount to use profile 2015-09-01 15:05:31 +02:00
Arjen Hiemstra
1f82e83093 Use SettingOverrideDecorator::getAllSettingValues to get per-object settings 2015-09-01 15:04:55 +02:00
Arjen Hiemstra
f618b54d69 Connect to MachineManager's addMachineRequested so we can show the add printer dialog 2015-09-01 15:03:59 +02:00
Arjen Hiemstra
47e96a9e2a Fix ConvexHull{Decorator,Job} to work with the new profile structure 2015-09-01 15:03:29 +02:00
Arjen Hiemstra
712ec6acdf Fix normal profile and add a very basic High Quality profile 2015-08-27 09:36:52 +02:00
Arjen Hiemstra
e6e563cf09 Use the profile for getting setting values, not the machine instance 2015-08-27 09:36:09 +02:00
Arjen Hiemstra
4d4192d6d6 Ignore some active machine changes since we need to port code 2015-08-27 09:35:05 +02:00
Arjen Hiemstra
5637c9ad94 Remove active machine preference from CuraApplication, it is now handled by MachineManager 2015-08-27 09:34:22 +02:00
Arjen Hiemstra
5ee587a745 Options property should now be a key - value dict 2015-08-27 09:33:07 +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
b9a306865e Add some data about wizard pages to ultimaker_original_plus JSON file 2015-08-25 18:13:09 +02:00
Arjen Hiemstra
cbd685596e Add metadata to dual_extrusion_printer file 2015-08-25 18:12:40 +02:00
Arjen Hiemstra
1fc4d28864 Use firstRun property for the Add machine wizard 2015-08-25 18:12:24 +02:00
Arjen Hiemstra
17d3033b9a Move new JSON files to the right location 2015-08-25 18:11:49 +02:00
Arjen Hiemstra
f081bf4026 Use the right resource path for locating Qml resources 2015-08-21 18:29:13 +02:00
Arjen Hiemstra
9888a6eb42 Fix a merge error 2015-08-21 18:28:53 +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
21ff2eaab0 Fixed machine head polygons 2015-08-20 16:14:58 +02:00
Jaime van Kessel
329b2d4f77 Removed unused settings from fdmprinter 2015-08-20 15:49:43 +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
Arjen Hiemstra
fd8185fcb9 Properly send profile and setting changes to the engine
This includes everything from the profile and all settings with child
settings.
2015-08-19 19:15:54 +02:00
Arjen Hiemstra
6fa6b1ac5d Render ConvexHullNode with different colors depending on setting/profile overrides 2015-08-19 19:14:22 +02:00
Arjen Hiemstra
79bd590656 Print backtrace on console when we are not running a py2exe/py2app build 2015-08-19 19:13:44 +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
a0e37d58e9 Update README.md
Third party plugins are now in a list.
2015-08-19 17:01:16 +02:00
Jaime van Kessel
02aee8baf0 Update README.md
Added link to post processing plugin
2015-08-19 17:00:06 +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
18497329db Fixed typo 2015-08-19 14:37:49 +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