2391 Commits

Author SHA1 Message Date
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
Lipu Fei
71e8478419 Rename to selected_position 2018-03-01 16:26:12 +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
Lipu Fei
580244a546 Split material models into separate files 2018-03-01 11:50:55 +01:00
Lipu Fei
b5cf6b7531 Rename selectedQualityItem and add docs 2018-03-01 11:16:22 +01:00
Lipu Fei
3e23659c79 Merge remote-tracking branch 'origin/master' into refactoring_machine_manager 2018-02-28 15:29:22 +01:00
Ghostkeeper
4757f9dc0c
Remove invalid alias
This alias was referring to something that didn't exist any more and this broke our application menu.

Contributes to issue CURA-5029.
2018-02-28 13:49:11 +01:00
Andreea Scorojitu
356e13c225 Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-28 13:34:38 +01:00
Andreea Scorojitu
7881dce638 Remove_installed_plug-ins_submenu_CURA-5029
The Installed plugins from the Plugins menu is replaced by the browser plugin window.
2018-02-28 13:33:02 +01:00
Lipu Fei
6b0095014a Fix merge conflicts from master 2018-02-28 12:52:45 +01:00
Lipu Fei
7f5bb70bee Remove redundant setProperties
CURA-4916
2018-02-28 12:46:00 +01:00
Aleksei S
e533c4604c Update infill scroll bar if setting is changed in custom mode
CURA-4916
2018-02-28 10:52:46 +01:00
Jack Ha
01071da4c1 CURA-4606 corrected slider bar, it now updates correctly from 0 available qualities to 1 available quality 2018-02-27 16:33:37 +01:00
Jack Ha
df46241225 CURA-4606 CURA-5012 corrected and moved approximateMaterialDiameter to ExtruderStack 2018-02-27 13:03:08 +01:00
Jack Ha
d79206301d CURA-4606 CURA-5012 fix incompatible diameter update message in materialview 2018-02-27 11:43:54 +01:00
Jack Ha
22cf5abec2 Merge branch 'master' into refactoring_machine_manager 2018-02-27 10:24:56 +01:00
Jack Ha
c23827cfa1 CURA-4606 CURA-5003 activate duplicated material and always switch to correct material after some material change 2018-02-26 16:33:25 +01:00
Ghostkeeper
c16214e0f3
Traditional Chinese is complete again
At least, complete for 3.2.
2018-02-26 15:48:04 +01:00
Jack Ha
11be94c735 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-26 09:30:33 +01:00
Lipu Fei
f487c5b084 Fix profile management page 2018-02-22 23:31:41 +01:00
Lipu Fei
dec7ad25e2 Fix activate newly created custom quality profile 2018-02-22 23:08:26 +01:00
Lipu Fei
8dfa52f15c Fix material menu model extruder binding and initial update 2018-02-22 20:58:54 +01:00
Jack Ha
cad6a3bb3d CURA-4606 CURA-5003 select and activate material after create, duplicate 2018-02-22 17:14:23 +01:00
Lipu Fei
d2ffd59431 Switch to the new quality profile when it is created 2018-02-22 16:53:13 +01:00
Jack Ha
b23a85aa37 Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-22 16:14:24 +01:00
Jack Ha
b209badf68 CURA-4606 CURA-5003 fix density and diameter in material manager 2018-02-22 16:14:11 +01:00
Lipu Fei
32e1015f25 WIP: Cleanup PrintInformation 2018-02-22 16:07:56 +01:00