246 Commits

Author SHA1 Message Date
fieldOfView
1b4bd05106 Make doubly sure that settings are changed before closing dialog 2017-07-11 23:27:31 +02:00
fieldOfView
d00bb2524e Fix layout
Dialog is now more robust against being too small
2017-07-11 22:33:05 +02:00
fieldOfView
219d1938c2 Move labels into components with the controls...
...so they are both children of the same TooltipArea
2017-07-11 16:40:05 +02:00
fieldOfView
2ba0dd094e Simplify layout 2017-07-11 15:54:21 +02:00
fieldOfView
aa7ab2e0a7 Remove unnecessary eval() construct 2017-07-10 16:49:03 +02:00
fieldOfView
79e38407c8 Add tooltip to "Number of Extruders" control 2017-07-10 12:34:39 +02:00
fieldOfView
e2c978f88b Remove unused extruderContainerIndex property
Since the work on CuraContainerStack, the definition changes container for the extruder and for the global stack are always on the same index
2017-07-10 12:23:27 +02:00
fieldOfView
7fe674bc5b Improve test for empty containers 2017-07-10 12:19:19 +02:00
fieldOfView
d6ddf15e24 Fix selecting material for UM2 when switching from UltiGcode 2017-07-09 16:46:25 +02:00
fieldOfView
8c2f556616 Switch to an appropriate material when changing the material diameter
If we don't do this, the material will always override the setting in Machine Settings
2017-07-09 16:41:24 +02:00
fieldOfView
ddc94e9bec Improve readability 2017-07-09 15:44:01 +02:00
fieldOfView
b8ea762242 Override some tooltips for clarity in the context of Machine Settings 2017-07-09 14:57:51 +02:00
fieldOfView
cb7b845a32 Add tooltips to the head polygon fields 2017-07-09 14:39:55 +02:00
fieldOfView
4705ada6ef Add tooltip to gcode areas 2017-07-09 13:35:50 +02:00
fieldOfView
1eeb953072 Restructure propertyProviders to be part of setting components 2017-07-09 13:12:25 +02:00
fieldOfView
a2332ae304 Add tooltips to most fields 2017-07-09 12:32:16 +02:00
fieldOfView
de0ac5ccff Use CuraContainerStack API 2017-07-09 11:28:14 +02:00
Lipu Fei
73f598ff9f Fix code style
CURA-3712
2017-06-22 08:54:04 +02:00
Jaime van Kessel
e3629cec39 Replaced catalog metadata entry with i18n-catalog
CURA-3712 & Cura-3856
2017-06-21 14:24:00 +02:00
Jaime van Kessel
44125d3275 Moved certain meta data entries to seperate file
CURA-3856 & CURA-3712
2017-06-21 11:22:35 +02:00
Jaime van Kessel
b18b1d3cd0 Only disable timer of backend if it's initialised
Fixes #1939
2017-06-06 15:42:49 +02:00
Ghostkeeper
937207a0eb
Merge branch 'fix_machinesettings_negative_offsets' of https://github.com/fieldOfView/Cura into fieldOfView-fix_machinesettings_negative_offsets 2017-05-17 15:42:43 +02:00
Lipu Fei
40d70b5f39 Fix version upgrade for project loading
CURA-3756
2017-05-16 14:38:27 +02:00
fieldOfView
910811810b Allow setting negative values on extruder offset x/y fields 2017-05-16 13:54:45 +02:00
Ghostkeeper
ccda155882
Add setting_version every time we create InstanceContainer
Except when we fill the instancecontainer via deserialising. Because then we want to retain the original version number.

Contributes to issue CURA-3427.
2017-05-15 10:39:53 +02:00
Lipu Fei
9060bbf3b2 Update extruderCount when extrudersModel got changed
CURA-3755

The Timer delay is not reliable for updating the extruder Tabs.
So we now rely on the modelChanged signal of the ExtrudersModel
to do the update.
2017-05-11 09:47:37 +02:00
Jaime van Kessel
316f2bbdb5 Fixed switching g-code flavors with machineAction 2017-05-10 09:49:33 +02:00
Jaime van Kessel
bb0d534f4a Revert "Set machine_extruder_count in sync with defined extruders"
This reverts commit b69f337ddb50bb8e5dc39107f75d4112b14527d1.
2017-05-08 15:31:44 +02:00
Jaime van Kessel
ac39934336 Revert "Starting machineSettingAction no longer resets extruder count to 1"
This reverts commit 452a6a095c0866a080e19d89a71e1857e011456f.
2017-05-08 15:30:39 +02:00
Jaime van Kessel
452a6a095c Starting machineSettingAction no longer resets extruder count to 1 2017-05-08 14:25:13 +02:00
fieldOfView
98b127851b Fix setting number of extruders when hasVariants is set 2017-05-08 12:54:12 +02:00
Lipu Fei
a039f9552e Trigger extruderTabsCount update when MachineSettings dialog shows
CURA-3755
2017-05-08 09:47:42 +02:00
Ghostkeeper
b69f337ddb
Set machine_extruder_count in sync with defined extruders
The registry checks if they are in sync and complains if they aren't. The extruder count is set back to default to 1 upon adding the machine.

Contributes to issue CURA-3497.
2017-05-03 17:01:08 +02:00
Ghostkeeper
41e444714f
Fix spacing
Minor code style stuff.
2017-05-03 16:54:20 +02:00
Ghostkeeper
cd78ab850d
Remove semicolons
Semicolons, a relic of the past.

Contributes to issue CURA-3497.
2017-05-03 16:03:47 +02:00
Ghostkeeper
337be1b9be
Fix setting machine changes profile with new specified container stacks
Don't need to insert it, because there's already a slot for it on the stack. In fact, you're not allowed to insert anything.

Contributes to issue CURA-3497.
2017-05-03 15:38:20 +02:00
Jack Ha
0452cffff9 Fix setting active extruder when changing Custom FDM printer extruders. CURA-3299 2017-05-03 09:37:12 +02:00
fieldOfView
c9039bb6fc Add a field to set the material diameter for the printer
This is used to filter the list of available materials, see https://github.com/Ultimaker/Cura/pull/1685
2017-04-30 11:08:24 +02:00
fieldOfView
57f936e5ff Remove definition_changes containers when a stack is removed 2017-04-24 13:56:37 +02:00
fieldOfView
8b5ac81404 Fix extruder_stack global values are moved to
ExtruderManager.getMachineExtruders() result is not sorted, the result of getActiveExtruderStacks() is
2017-04-24 13:20:20 +02:00
fieldOfView
3e9fdb5db1 Prevent the DiscardOrKeepProfileChangesDialog from popping up (twice) if there are user changes 2017-04-24 13:11:10 +02:00
fieldOfView
fab0fa1dde Move setting values that are settable per extruder from/to global stack when setting extruder count 2017-04-24 12:58:20 +02:00
fieldOfView
d2d36b8c98 Lower extruder_nr settings when they exceed the number of extruders 2017-04-22 12:17:16 +02:00
fieldOfView
2ca24ba7e6 Restore both material and variant to match 1st extruder when switching to single extrusion 2017-04-22 11:20:55 +02:00
fieldOfView
8d42f9c187 Move some convoluted logic from QML into Python 2017-04-22 10:13:58 +02:00
fieldOfView
933ee408e4 Code style 2017-04-22 09:47:00 +02:00
fieldOfView
0966ef5338 Fix QML warnings when switching to an extruder tab 2017-04-21 21:48:20 +02:00
fieldOfView
656e7a8046 Change the scope of the head polygon functions to be inside the main tab 2017-04-21 21:27:15 +02:00
fieldOfView
ba229444b7 Pause autoslicing while the MachineSettingsAction is open
Each setting-change would cause a reslice, which is unnecessary.
2017-04-21 21:05:28 +02:00
fieldOfView
94545ec4ee Restore active extruder after forcing an update of the global extruder stack 2017-04-15 20:09:20 +02:00