GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-28 17:18:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
13,789 Commits 293 Branches 266 Tags
Commit Graph

2571 Commits

Author SHA1 Message Date
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
4468f4d620 WIP: Fix NozzleMenu warning on non-notifiable bindings 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
6dc53eb741 WIP: Fix NozzleMenu extruder binding 2018-02-16 14:23:11 +01:00
Jack Ha
8aab8f4394 CURA-4606 cleanup and optimization for replaceContainer 2018-02-16 14:23:11 +01:00
Lipu Fei
bf2317a74d WIP: use new QualityChangesGroups 2018-02-16 14:23:11 +01:00
Jack Ha
27169e883c CURA-4606 Ensure the correct material is highlighted in the material menu 2018-02-16 14:23:10 +01:00
Lipu Fei
54363bad02 WIP: Refactor NozzleMenu.qml 2018-02-16 14:20:03 +01:00
Lipu Fei
cd53ae0639 WIP: Refactor ProfileMenu.qml 2018-02-16 14:20:03 +01:00
Lipu Fei
8ac9811b41 WIP: Create QualityManager 2018-02-16 14:20:02 +01:00
Lipu Fei
f0d9fba2f5 WIP: Create MaterialManager 2018-02-16 14:20:02 +01:00
Lipu Fei
55bdc0c853 WIP: Create VariantManager 2018-02-16 14:20:02 +01:00
Jaime van Kessel
16ab593eab Merge branch 'master' of github.com:Ultimaker/Cura 2018-02-16 11:15:48 +01:00
Jaime van Kessel
4a0a9f521c Bumped the required version numbers down again, as they should specifcy a min version number. 
As the summary describes; We should use *min* version numbers. If we have a higher version installed as defined, it will have the bugfixes and not the features. Increasing version nr should therefore only be done if we want new features.
 2018-02-16 11:13:40 +01:00
Diego Prado Gesto
85059882fe CURA-4959 Add buildplate information to the summary when saving a 
project file.
- The activeVariantNames now returns only the names of the variants in
the extruder stacks.
 2018-02-16 11:01: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
Mark
2f37bd4b73 Add native rendering to Print Setup Label 
CURA-4941
 2018-02-15 12:57:42 +01:00
fieldOfView
85aed830a6 Merge branch 'master' into feature_setting_visibility_profiles 2018-02-15 11:56:36 +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
fieldOfView
32d677295f Set rendertype for units in SettingTextField 2018-02-15 11:38:51 +01:00
fieldOfView
593dad7cca Fix categories too 2018-02-15 11:34:46 +01:00
fieldOfView
ec1cf4065e Set renderType to Text.NativeRendering for qtquick controls 2 Labels 
Apparently, the qtquickcontrols 2 Label no longer defaults to using renderType: Text.NativeRendering
This causes text to render with QtRendering which looks subtly different on Windows and succinctly broken on some OSX installations.
 2018-02-15 11:12:19 +01:00
Mark
64ea2399a1 Add tags to urls 2018-02-14 15:15:02 +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
Mark
12b2348309 Revert "Use QTQuick 2.2 to fix garbled fonts" 
This reverts commit 0d5bb952efc468522b55cbf903349aaf7f979af9.
 2018-02-13 14:37:05 +01:00
Mark
0d5bb952ef Use QTQuick 2.2 to fix garbled fonts 
CURA-4941
 2018-02-13 12:42:31 +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
Mark
466926fecd Increased the version of QtQuick 2018-02-13 11:07:14 +01:00
Mark
7493fae667 Fix to make sure margins cant have partial values 
CURA-4941
 2018-02-13 07:32:10 +01:00
Mark
7ea654df3d Fix to make sure margins cant have partial values 
CURA-4941
 2018-02-13 07:31:02 +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
Ian Paschal
72788445ab Added one more floor 2018-02-12 11:49:14 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors 
CURA-4941
 2018-02-10 12:45:36 +01:00
fieldOfView
3f9d92ade0 Remove "Search Results" item 
It makes no sense to have it; instead none of the other menuitems are selected when search results are shown.
 2018-02-09 20:22:46 +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
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Mark
8fca183a5e Fix rounding errors for garbled text 
CURA-4941
 2018-02-09 11:30:56 +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
Ian Paschal
fbf955f3a0 Updated Noto Sans in Cura About info 2018-02-08 17:24:41 +01:00
fieldOfView
872efd16b2 Fix selecting presets from menu 
Switching back to Custom is not yet implemented, and the menu selection does not yet change if the preset is changed in the preferences
 2018-02-08 17:13:59 +01:00
fieldOfView
69d7bf4130 Merge branch 'master' into feature_setting_visibility_profiles 2018-02-08 16:06:48 +01:00