Lipu Fei
f9e377ec43
Enable/disable Keep/Discard buttons according to selection
2017-03-22 13:07:58 +01:00
Lipu Fei
12918b02b5
CTRL-P only works when the button is enabled
...
CURA-3496
2017-03-22 12:01:41 +01:00
Jaime van Kessel
94c6b23418
Codestyle & removal unused imports
2017-03-22 11:38:55 +01:00
Jaime van Kessel
808df4c228
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-22 11:03:27 +01:00
Lipu Fei
c6df3adddb
Update 2.5.0 BETA ChangeLog
...
CURA-3467
2017-03-22 10:26:01 +01:00
MaukCC
83f5619be0
Update cartesio.def.json
2017-03-22 09:45:41 +01:00
MaukCC
4e698cb685
Update cartesio.def.json
2017-03-22 09:45:23 +01:00
Jack Ha
72db7772f5
Merge branch '2.5'
2017-03-22 09:44:47 +01:00
Jack Ha
3d6e378289
Revert accidently added test-code.
2017-03-22 09:44:21 +01:00
Jack Ha
8275c419c1
Merge branch '2.5'
2017-03-22 09:34:06 +01:00
Jack Ha
40a7d2fecc
Added not supported quality profiles. CURA-3555
2017-03-22 09:33:17 +01:00
Arjen Hiemstra
411e3a3976
Fix up a bunch of things with type hints and imports
2017-03-21 17:45:07 +01:00
Arjen Hiemstra
88e8138004
Override ContainerStack::deserialize
...
This ensures we have the right set of containers in the stack
2017-03-21 17:44:36 +01:00
Arjen Hiemstra
95a6bef50f
Add properties for the individual containers in the global stack
2017-03-21 17:43:42 +01:00
Arjen Hiemstra
37b4326e99
Mark addContainer as override
2017-03-21 17:43:14 +01:00
Arjen Hiemstra
f32f8b60df
Explictly import Extruder/Global stack
...
For some reason, things were not being imported properly. This fixes
that.
2017-03-21 17:42:57 +01:00
Arjen Hiemstra
3ee3e0aee3
Add a private class to GlobalStack that defines the expected indices of each container type
2017-03-21 17:39:06 +01:00
Jaime van Kessel
f379791d70
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 14:43:58 +01:00
Jaime van Kessel
0752c4440c
Merge branch '2.5' of github.com:Ultimaker/Cura into 2.5
2017-03-21 14:43:30 +01:00
Jaime van Kessel
5489fc8caf
Added number of missing quality profiles
...
CURA-3555
2017-03-21 14:43:01 +01:00
Jack Ha
f2eebc165f
Merge branch '2.5'
2017-03-21 14:37:42 +01:00
jack
af43b2e8c4
Merge pull request #1554 from LipuFei/feature_CURA-3495_open_in_one
...
CURA-3495 Open project/models menu
2017-03-21 14:32:53 +01:00
jack
6d1a99ff33
Merge pull request #1556 from Ultimaker/feature_more_spacing_override_profile_combobox
...
Add more spacing between the label and combobox for override profile option
2017-03-21 14:12:40 +01:00
Lipu Fei
622ff4e662
Add default for preference "view/invert_zoom"
2017-03-21 13:56:12 +01:00
Lipu Fei
2d48809214
Also asks when opening a recent project file
...
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
9e5513ade6
Use QUrl to parse fileUrl
...
CURA-3495
2017-03-21 13:56:11 +01:00
Lipu Fei
f3167bb84b
Add dialog for opening a project file
...
CURA-3495
2017-03-21 13:56:09 +01:00
Jaime van Kessel
70dbeaf256
Merge branch '2.5' of github.com:Ultimaker/Cura
2017-03-21 13:24:06 +01:00
Jaime van Kessel
90a92dce19
If a container_changes can not be found, handle it more gracefully
...
CURA-3560
2017-03-21 13:23:50 +01:00
Lipu Fei
8dbb1d47e1
Shrink the widht of profile override combobox
2017-03-21 11:14:55 +01:00
Jaime van Kessel
00258e570f
If a container_changes can not be found, handle it more gracefully
...
CURA-3560
2017-03-21 11:13:10 +01:00
Lipu Fei
8f3e7c6fa5
More spacing for override profile combobox
2017-03-21 11:05:37 +01:00
Ghostkeeper
45934202a9
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-21 10:47:35 +01:00
Ghostkeeper
780e24d050
Merge branch 'master' of https://github.com/austin-makeit/Cura into austin-makeit-master
2017-03-21 10:45:43 +01:00
Lipu Fei
eaad358e42
Remove shortcut text in the SaveButton
2017-03-21 09:51:07 +01:00
Jaime van Kessel
8a1ad98ed5
Merge branch 'master' of github.com:Ultimaker/Cura
2017-03-21 09:39:27 +01:00
Jaime van Kessel
a8cec631b4
Lowered the required qtquick number for open dialog
2017-03-21 09:39:07 +01:00
jack
07cfe76edb
Merge pull request #1553 from Ultimaker/feature_CURA-3561_save_profile_override_with_codes
...
CURA-3561 Save with code names for profile override preference
2017-03-21 09:31:21 +01:00
Lipu Fei
139bb76806
Add CTRL+P shortcut for save/print button
...
CURA-3496
2017-03-21 09:28:03 +01:00
Lipu Fei
555cd58f5e
Save with code names for profile override preference
...
CURA-3561
2017-03-21 09:09:17 +01:00
austin-makeit
2be100ec42
Rename makeit_l_dual_2nd to makeit_l_dual_2nd.def.json
2017-03-20 10:45:06 -07:00
austin-makeit
f893fa8633
Rename makeit_l_dual_1st to makeit_l_dual_1st.def.json
2017-03-20 10:44:52 -07:00
austin-makeit
8b009181c4
Rename makeit_dual_2nd to makeit_dual_2nd.def.json
2017-03-20 10:44:20 -07:00
austin-makeit
16ac40f22e
Rename makeit_dual_1st to makeit_dual_1st.def.json
2017-03-20 10:44:01 -07:00
austin-makeit
6ed00900fe
Update and rename makeit_pro_m to makeit_pro_m.def.json
2017-03-20 10:43:10 -07:00
austin-makeit
f5c9620d3b
Update and rename makeit_pro_l to makeit_pro_l.def.json
2017-03-20 10:42:37 -07:00
Arjen Hiemstra
4904e449a0
Start overriding getProperty in GlobalStack
...
Since we have the "resolve" property, we should transparently handle it
so lookup can just use "value".
Contributes to CURA-3497
2017-03-20 17:30:00 +01:00
Arjen Hiemstra
0656dd53c3
Override setNextStack in GlobalStack and raise an error if called
...
Since the global stack should never have a next stack
Contributes to CURA-3497
2017-03-20 17:28:42 +01:00
Arjen Hiemstra
b9f01b30c8
Convert generic "ContainerStack" to an Extruder or Global stack
...
Dependendant on the "type" metadata key, we create either an
ExtruderStack or a GlobalStack instance to replace the ContainerStack
instance. This should allow for transparent upgrades to the new classes.
Contributes to CURA-3497
2017-03-20 17:28:01 +01:00
Arjen Hiemstra
12c50dbac8
Introduce a GlobalStack class
...
This will allow us to codify some of the assumptions made about the
global stack
Contributes to CURA-3497
2017-03-20 17:26:12 +01:00
