Guillem
faf8ed3ba6
Replace only user changed values
...
removed machine_settings and settable_per_extruder_check. Not needed.
2018-03-19 14:57:31 +01:00
Guillem
1bb5b8ff3e
add Copy all values to all extruders
...
context menu option
2018-03-13 12:31:03 +01:00
Aleksei S
73517cd176
The infill denstiy was updated twice, first in Custom view and then in Recomended view
...
CURA-5071
2018-03-13 11:41:48 +01:00
Ghostkeeper
b4a40915bb
Code style: Brackets on new line
...
Contributes to issue CURA-4606.
2018-03-13 09:28:01 +01:00
Ghostkeeper
d904f677bc
Store extruder position of quality groups as int
...
Instead of as a string with a number in it.
For the actual global stack's extruders we still need to convert to string, sadly. I could go refactor that too, but then I won't be going home until 23 o'clock or something.
Contributes to issue CURA-4606.
2018-03-12 17:08:13 +01:00
Mark
981c47ed87
Put the support extruder dropdown behind the checkbox to prevent scrolling
2018-03-12 17:03:10 +01:00
Jack Ha
552618fcd4
CURA-4400 added function to find model index by extruder position in SettingExtruder
2018-03-12 09:56:08 +01:00
Jack Ha
d70cc072e9
Merge branch 'master' into feature_enable_disable_extruder
2018-03-12 09:06:24 +01:00
Mark
af89209cde
Changed rounding of prettyTime by accident
2018-03-09 14:02:04 +01:00
Lipu Fei
3550ef80e0
Fix quality management page QML
...
CURA-5063
2018-03-09 11:00:39 +01:00
Jack Ha
53764a8274
CURA-4400 use extrudersEnabledCount for recommended mode's extruder number visibility
2018-03-08 15:39:23 +01:00
Jack Ha
5135a972a2
CURA-4400 code style
2018-03-08 14:32:10 +01:00
Jack Ha
961b868424
CURA-4400 fix updating quality slider
2018-03-08 09:47:22 +01:00
Jack Ha
32ce458516
CURA-4400 solved merge conflict
2018-03-06 17:05:39 +01:00
Lipu Fei
eb84e6aa3e
Disable not supported custom profiles
...
CURA-5051
2018-03-06 15:47:49 +01:00
Lipu Fei
31b7374689
Fix material settings saving upon dialog close
...
CURA-4606
Force to trigger a lose focus on all editing fields so their
onEditingFinished callback will get triggered.
2018-03-06 13:40:32 +01:00
Lipu Fei
ff0d694e72
Select the activated material when material management page shows up
...
CURA-4606
2018-03-06 11:55:24 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +01:00
Jaime van Kessel
2de587a8c6
Made some changes so the code also works with lower versions of Qt & pyQt
2018-03-05 15:32:46 +01:00
Lipu Fei
3004b146ad
Fix: move createQualityChanges() to QualityManager
...
CURA-4606
2018-03-05 13:36:13 +01:00
Lipu Fei
6199e8e15a
Fix merge conflicts with master
2018-03-05 13:27:00 +01:00
Ghostkeeper
08f114ee6e
Don't make print estimates translateable
...
This was very very confusing for our translators. And all of the translators basically came down to the same translation: Leave it untranslated. So let's make it a bit easier on them and don't allow this to be translated.
If we really want the currency to be translated to the correct position, Qt has currency printing in its locale as an option too.
2018-03-05 13:02:11 +01:00
Lipu Fei
a29a6122f1
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-03-05 11:29:21 +01:00
Lipu Fei
eb5ce04229
Fix code style in materialspage
2018-03-05 10:59:10 +01:00
Lipu Fei
caca5e5021
Fix code style in materialspage
2018-03-05 10:57:36 +01:00
Lipu Fei
6a14e39610
Remove outdated TODOs in ProfilesPage
2018-03-03 16:34:31 +01:00
Lipu Fei
730048d2b2
Simplify code in MaterialsPage.qml
2018-03-03 16:32:29 +01:00
Lipu Fei
86b75ae3b6
Remove outdated TODO
2018-03-03 16:29:31 +01:00
Lipu Fei
0e5aff84e9
Remove outdated comment in MaterialsPage.qml
2018-03-03 16:26:03 +01:00
Lipu Fei
575f38e63e
Fix code style in MaterialView.qml
2018-03-03 16:25:09 +01:00
Lipu Fei
d24bc0b41b
Fix code style in MaterialView.qml
2018-03-03 16:23:54 +01:00
Lipu Fei
c93643bc2f
Move createMaterial() to MaterialManager
2018-03-02 17:30:19 +01:00
Lipu Fei
5f0bb3a283
Move removeMaterial() to MaterialManager
2018-03-02 17:20:26 +01:00
Lipu Fei
7642afb9fe
Move duplicateMaterial() to MaterialManager
2018-03-02 17:16:35 +01:00
Lipu Fei
ca785c9df3
Move duplicateQualityChanges() to QualityManager
2018-03-02 17:08:58 +01:00
Lipu Fei
355b8cbac3
Move renameQualityChangesGroup() into QualityManager
2018-03-02 16:58:50 +01:00
Lipu Fei
8324f4f44e
Move removeQualityChangesGroup() into QualityManager
2018-03-02 16:47:25 +01:00
Lipu Fei
c6128ef5ba
Move setMaterialName() into MaterialManager
2018-03-02 16:22:22 +01:00
Ghostkeeper
acbc6893f5
Also allow backspace to delete models
...
See the documentation in the code as to why. Macintosh keyboards...
Fixes #3257 .
2018-03-02 14:51:13 +01:00
Lipu Fei
93190dde9b
Merge remote-tracking branch 'origin/master' into refactoring_machine_manager
2018-03-02 09:55:14 +01:00
Diego Prado Gesto
ae57e23eec
Create a mouse area around the sidebar to avoid propagating mouse wheel events.
...
Contributes to CURA-4495
2018-03-01 19:48:41 +01:00
Jack Ha
53ec846436
CURA-4400 introduced value -1 for extruder number setting (not optional_extruder); this one takes the defaultExtruderPosition in MachineManager
2018-03-01 17:21:35 +01:00
Lipu Fei
71e8478419
Rename to selected_position
2018-03-01 16:26:12 +01:00
Jack Ha
2538c689f1
CURA-4400 make extruder combobox disabled items grey
2018-03-01 16:22:40 +01:00
Lipu Fei
e87077802f
Change to layer_height and layer_height_unit
2018-03-01 15:55:44 +01:00
Lipu Fei
06ec16d627
Rename quality drop down menu models
2018-03-01 15:37:48 +01:00
Jack Ha
ac76d6ea52
Merge branch 'refactoring_machine_manager' into feature_enable_disable_extruder
2018-03-01 13:14:10 +01:00
Jack Ha
71e631150d
CURA-4400 update extruder disabled color
2018-03-01 13:06:12 +01:00
Jack Ha
c94d88cd9d
CURA-4400 added context menu on right click extruder in SidebarHeader
2018-03-01 12:58:27 +01:00
Lipu Fei
580244a546
Split material models into separate files
2018-03-01 11:50:55 +01:00
