654 Commits

Author SHA1 Message Date
Lipu Fei
32e1015f25 WIP: Cleanup PrintInformation 2018-02-22 16:07:56 +01:00
Jack Ha
c7499d6e17 CURA-4606 CURA-5003 fix saving material metadata when switching material; fix crashing on fallback material on materials without fallback 2018-02-22 15:52:02 +01:00
Jack Ha
b29d091b1d Merge branch 'refactoring_machine_manager' of github.com:Ultimaker/Cura into refactoring_machine_manager 2018-02-22 14:28:09 +01:00
Jack Ha
32afa9bfd4 CURA-4606 CURA-5003 fixed sometimes crash material management page upon opening, provide correct containerId to MaterialView 2018-02-22 14:27:58 +01:00
Lipu Fei
b014800eac Fix various quality related issues 2018-02-22 11:00:32 +01:00
Lipu Fei
47e4b35e70 WIP: Cleanup 2018-02-21 19:44:42 +01:00
Lipu Fei
7ea245a57d Fix: Show longer names on profile management page 2018-02-21 17:28:32 +01:00
Jack Ha
605043235a CURA-4606 fixed create profile from profile context menu 2018-02-20 11:36:51 +01:00
Lipu Fei
6cc65e97f2 WIP: Cleanup MaterialsModel 2018-02-20 09:13:11 +01:00
Lipu Fei
27f7d16a57 WIP: Make import/export profile work 2018-02-19 21:47:12 +01:00
Lipu Fei
0c3ac090c9 WIP: Cleanup 2018-02-19 21:11:01 +01:00
Lipu Fei
5b37de8adb WIP: Fix quality renaming 2018-02-19 20:33:36 +01:00
Lipu Fei
486bcae677 WIP: Fix remove quality 2018-02-19 20:21:02 +01:00
Lipu Fei
65e01d6203 WIP: Refactor Profile management code 2018-02-19 20:01:51 +01:00
Jack Ha
bd10f23311 CURA-4606 reimplemented duplicate profile 2018-02-19 16:47:04 +01:00
Jack Ha
7a78f9821f CURA-4606 fixed Create profile 2018-02-19 16:15:35 +01:00
Jack Ha
8efe13a55a CURA-4606 fix profiles page Active button 2018-02-19 15:24:58 +01:00
Jack Ha
3ff9cb6b1e CURA-4606 added first Profile management page 2018-02-19 15:07:50 +01:00
Jack Ha
5d4a2a7e49 CURA-4606 qtquick dialogs 1.2 to be compatible with older pyqt 2018-02-19 11:04:45 +01:00
Lipu Fei
96f1264364 WIP: Rework profile management page 2018-02-16 16:40:09 +01:00
Lipu Fei
bed2106fc6 WIP: Backup old profile management QMLs 2018-02-16 14:26:04 +01:00
Lipu Fei
f7f9c68fcc WIP: Refactor setMaterialName() 2018-02-16 14:23:11 +01:00
Lipu Fei
850661fbdc WIP: Remove old material management QMLs 2018-02-16 14:23:11 +01:00
Lipu Fei
581699cd8d WIP: Make material import work 2018-02-16 14:23:11 +01:00
Lipu Fei
0b859bb308 WIP: Make material export work 2018-02-16 14:23:11 +01:00
Lipu Fei
4f29fc9ab2 WIP: make material creation work 2018-02-16 14:23:11 +01:00
Lipu Fei
779f49f545 WIP: Make material removal work in material management dialog 2018-02-16 14:23:11 +01:00
Lipu Fei
a5afaab467 WIP: Fix material duplication and metadata update 2018-02-16 14:23:11 +01:00
Lipu Fei
f024f45cfe WIP: Rework Material management page 2018-02-16 14:23:11 +01:00
Lipu Fei
a0b53dc1c9 WIP: Materials management page, make Activate work 2018-02-16 14:23:11 +01:00
Lipu Fei
1e0a078af8 WIP: Refactor Materials management page to use new Managers 2018-02-16 14:23:11 +01:00
Lipu Fei
f0d9fba2f5 WIP: Create MaterialManager 2018-02-16 14:20:02 +01:00
Diego Prado Gesto
a2fde9f5f2 Revert "Fix rounded values in qml files"
This reverts commit f11a1341ee52069f47d9fbca5d2e043b7ff3b17d.
2018-02-15 14:58:58 +01:00
Diego Prado Gesto
f11a1341ee Fix rounded values in qml files 2018-02-15 13:27:13 +01:00
fieldOfView
a17160f52d Merge branch 'master' into feature_setting_visibility_profiles
# Conflicts:
#	resources/qml/Settings/SettingView.qml
2018-02-15 11:54:45 +01:00
Ghostkeeper
ee9de1f11b
Merge branch '3.2'
Lots of conflicts due to rounding vs. flooring of text element positions for weirdness with the font aliasing.
2018-02-14 10:53:51 +01:00
Ghostkeeper
582f6ff2d2
Disable Traditional Chinese
We didn't get a new translation for 3.2. Sorry. People that had their preferences set to Traditional Chinese will stay on that language until they choose another, but the translation will be incomplete. If someone wants to pick up the translation for a next release, we'll keep the files in our source code.

Contributes to issue CURA-4883.
2018-02-14 09:39:23 +01:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Ghostkeeper
c167325b3d
Simplify translation of printer and variant
The key-replacements are always in the same place regardless of translation. A translator can't put them before their translation any more now. But it greatly reduces the confusion among translators and produces fewer strings to translate.

Contributes to issue CURA-4883.
2018-02-13 15:57:32 +01:00
Ghostkeeper
f91c990fed
Streamline usage of g-code (vs. GCode, Gcode, G-code, gcode, etc.)
This makes it all the same. It is something that came up in our translation pass this time.

Contributes to issue CURA-4883.
2018-02-13 15:50:59 +01:00
Diego Prado Gesto
9053282e8a CURA-4947 The value of the diameter and density were not correctly
stored in the properties dict.
2018-02-13 11:29:32 +01:00
Ghostkeeper
03b4213e92
Merge branch '3.2'
Conflicts in Cura.qml and SaveButton.qml from people fixing positioning rounding at the same time...
2018-02-12 13:10:24 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors
CURA-4941
2018-02-10 12:45:36 +01:00
fieldOfView
61bbfcda3a Add back "custom" option to the setting visibility page 2018-02-09 19:28:00 +01:00
fieldOfView
74fe281e1d Sync currently selected preset between visibility-page and -menu 2018-02-09 18:54:04 +01:00
fieldOfView
f79e787f2c Refactor SettingVisibilityProfiles to SettingVisibilityPresets
This is closer to the current Cura intend
2018-02-09 09:01:39 +01:00
fieldOfView
080979caeb Move setting visibility presets into a model
Handling of "Custom" is still under consideration
2018-02-08 23:07:45 +01:00
Aleksei S
f655b0e033 Set Custom in visible setting preset
CURA-3710
2018-02-07 16:22:13 +01:00
Aleksei S
c890472641 Fix: save Custom setting visibility preset
CURA-3710
2018-02-07 10:53:17 +01:00
Lipu Fei
367e50669d Refactor code
CURA-3710
2018-02-01 13:56:49 +01:00