789 Commits

Author SHA1 Message Date
fieldOfView
b77f51c02e Renamed abs and cpe profiles to match Paul's new pla profiles
Also renamed Ultimaker2+Olsson profiles to match

Contributes to CURA-892
2016-02-25 11:10:42 +01:00
Jaime van Kessel
dc1ee1d73b Merge pull request #636 from Ultimaker/feature_um2upgrades
Support UM2 with Olsson block
2016-02-24 12:07:35 +01:00
fieldOfView
390dc7e2c6 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-24 00:15:22 +01:00
fieldOfView
de28561152 Remove Profiles from Per Object Settings panel
Also disables Per Object Settings tool button when sidebar is in simple mode.

Contributes to CURA-901
2016-02-24 00:14:54 +01:00
Ghostkeeper
ba39864af2 Add new PLA profiles
These were designed through rigorous testing by the test team.

Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00
Ghostkeeper
9233813768 Remove override settings from UM2+ machine settings
A lot of these settings were just normal tweaks, such as speed, which should be set in the profiles rather than the machine definition.

Contributes to issue CURA-892.
2016-02-23 17:27:17 +01:00
Tim Kuipers
88ddf714c4 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 15:20:48 +01:00
Tim Kuipers
3c7beac515 JSON: fix: all platform adhesion settings are not settable per object (CURA-458) 2016-02-23 13:45:18 +01:00
Tim Kuipers
ce99ab8630 JSON: fix: global_only not depending on print_sequence (CURA-923)
because there is a bug in the frontend which causes the per-meshgroup settings not to be sent to the meshgroup, but instead sends them to the object itself, no setting which are not editable per object should be editable per meshgroup.
2016-02-23 13:24:39 +01:00
fieldOfView
8eb6fecacf Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 12:50:26 +01:00
Arjen Hiemstra
2aaf633492 Replace usage of UM.Theme with Theme from context in Cura theme styles
This way we do not recursively try to create the Theme object
2016-02-23 12:30:01 +01:00
Arjen Hiemstra
e378c54ce2 Remove commented code from Cura theme styles.qml 2016-02-23 12:26:17 +01:00
Arjen Hiemstra
fa907dfb1b Fix sizing behaviour of Save button
Use the text size with some margin for the button size and simply anchor
it to the right drop down button.
2016-02-23 12:24:27 +01:00
Arjen Hiemstra
222b4666d3 Do not load the theme again when the UI has been loaded
Theme is now loaded on creation instead
2016-02-23 12:24:27 +01:00
Arjen Hiemstra
074048f83c Use the key property of action's source to scroll setting visibility 2016-02-23 12:24:27 +01:00
Arjen Hiemstra
e6ef4405c3 Replace a bunch of Theme property accessors with getThing calls 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
d208885755 Load preference pages dynamically and reset the current page to 0 on close 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
e2b2088246 Add a configureSettingsAction that will open the setting visibility page 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
4e139ae710 Fix minor error after rebase 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
19c25895bf Convert Toolbar.qml and styles.qml to Theme getThing style 2016-02-23 12:24:26 +01:00
Arjen Hiemstra
d93055da1a Fix syntax 2016-02-23 12:22:30 +01:00
Arjen Hiemstra
720324f0c6 Replace Theme property accessors with getThing calls 2016-02-23 12:22:30 +01:00
Ghostkeeper
0989f8ced7 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-23 09:31:15 +01:00
Tim Kuipers
a168eab140 JSON: fix: cone angle sign inverted compared to description (CURA-869) 2016-02-22 16:51:56 +01:00
fieldOfView
b519c910ea Fix reentry of add machine wizard when skipping bedleveling 2016-02-22 16:41:09 +01:00
Ghostkeeper
cbcbf3c971 Improve default support settings
These were found by Paul to be better. I agree on the Touching Buildplate option being the one that the user most likely would use most often, and I am inclined to take his word on the support angle.
2016-02-22 15:45:21 +01:00
Ghostkeeper
2aac62f55b Remove variant setting overrides from machine settings
These will be implemented by the new profiles.

Contributes to issue CURA-892.
2016-02-22 14:20:35 +01:00
fieldOfView
2d22b79d7a Add missing radius to MessageStack progressbar
Also removes two chunks of commented-out code
2016-02-19 23:15:05 +01:00
fieldOfView
1c88e35ed9 Move hardcoded preferences for Normal Quality, PLA & 0.4mm into machine config files 2016-02-19 21:30:24 +01:00
fieldOfView
e4d44acefb Add support for Ultimaker 2 Extended with Olsson Block upgrade 2016-02-19 20:39:32 +01:00
fieldOfView
bcf0f507ad Add Add Machine wizard, machine definitions & profiles for Ultimaker 2 with Olsson Block 2016-02-19 20:39:32 +01:00
Tim Kuipers
2ab23513b2 Merge branch '2.1' of https://github.com/Ultimaker/Cura into 2.1 2016-02-19 16:08:50 +01:00
Tim Kuipers
7425c32aa4 JSON: moved Standby Temp to dual_extrusion_settings (CURA-868) 2016-02-19 16:08:40 +01:00
Tim Kuipers
f0e60d65ff JSON: disable Extrusion Cool Down Speed Modifier when no auto temp or single extrusion (CURA-868) 2016-02-19 15:56:14 +01:00
Jaime van Kessel
c0d167e751 Changing values in simple mode no longer influences local model
CURA-865
2016-02-19 10:42:38 +01:00
Ghostkeeper
bcbb28dd9f Fix application menu save-to-file option
Turns out that named parameters never worked. I've changed it into key-word arguments, but then not really key-word arguments but a QVariantMap.

Contributes to issues CURA-611 and CURA-898.
2016-02-18 13:30:24 +01:00
fieldOfView
b8113a9740 Reset menu selection without modifying the model
Contributes to CURA-853
2016-02-17 22:04:05 +01:00
Tim Kuipers
765185364f JSON: quickfix: made Auto Temp always not displayed (CURA-868) 2016-02-17 10:36:30 +01:00
fieldOfView
09c04d7c68 Add sidebar header icon for "machine" category 2016-02-16 22:43:36 +01:00
Ghostkeeper
ccd937a56f Make boolean trap more readable
This doesn't entirely remove it but it looks a bit better. In other calls, the variable name that's filled in the parameter sort of makes it clear what the boolean indicates.

Contributes to issue CURA-611.
2016-02-15 16:56:42 +01:00
Ghostkeeper
4ccf4fe718 Change global-only behaviour of some adhesion settings
They don't always work when set per-object. So don't allow it.

Contributes to issue CURA-458.
2016-02-15 15:30:52 +01:00
fieldOfView
5613a5de20 Reset menu selection when canceling profile switch
Contributes to CURA-853
2016-02-15 14:19:32 +01:00
Ghostkeeper
69331696f0 Revert UM2+ machine names
This was causing problems in the listing of the printers due to the variants. I still don't really know why it was causing these problems but I've reverted the changes and it seems to have been fixed now.

Contributes to issue CURA-440.
2016-02-15 11:03:44 +01:00
Ghostkeeper
9379b0a97b Update translation from machine name to hex file
There was an incongruence in the translation from the machine name to hex file. Sometimes the machine name was wrong. Sometimes the hex file was wrong.

Contributes to issue CURA-440.
2016-02-12 17:09:42 +01:00
Tim Kuipers
07d0e433a8 JSON: made some essential settings visible by default: conical support, brim settings, raft settings (CURA-877) 2016-02-12 16:19:00 +01:00
Tim Kuipers
ed5e59df57 JSON: made some settings not visible by default (CURA-877) 2016-02-12 16:04:17 +01:00
Tim Kuipers
58238a5933 JSON: made line_width max value warning depend on nozzle size (CURA-876) 2016-02-12 15:56:03 +01:00
Tim Kuipers
5614302f74 JSON: made layer height max value warning depend on nozzle size (CURA-876) 2016-02-12 15:54:06 +01:00
Tim Kuipers
9545f7da36 JSON: fix: retraction settings not visible for UM2 anymore (CURA-875) 2016-02-12 15:44:04 +01:00
Tim Kuipers
1271a7407e JSON: support tower settings disabled if use_tower=Flase (CURA-870) 2016-02-12 15:26:56 +01:00