GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-19 05:47:29 +08:00
Code Issues Packages Projects Releases Wiki Activity
12,817 Commits 290 Branches 260 Tags
Commit Graph

2286 Commits

Author SHA1 Message Date
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
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
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
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
Ghostkeeper
c16214e0f3
Traditional Chinese is complete again 
At least, complete for 3.2.
 2018-02-26 15:48:04 +01:00
Ian Paschal
fcff00e9da Remove plugins from preferences since they're now managed via the plugin browser 2018-02-21 14:42:28 +01:00
probonopd
c84ba800d3
Update AboutDialog.qml 2018-02-17 14:58:25 +01:00
probonopd
19eb37e612
Update AboutDialog.qml 2018-02-17 14:53:07 +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
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
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
Ian Paschal
fbf955f3a0 Updated Noto Sans in Cura About info 2018-02-08 17:24:41 +01:00
Ghostkeeper
e157d8e045
Fix position of additional components 
This fixes the position when disabling auto-slice.

The position of additional components was wrong, such as the post-processing button.
 2018-02-08 15:02:52 +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
Ghostkeeper
64e7a8e61f
Merge branch '3.2' 2018-02-05 14:18:18 +01:00
ChrisTerBeke
8e86c49c81
Merge pull request #3176 from fieldOfView/fix_dark_sidebar 
Fix sidebar theming (for Ultimaker Dark theme)
 2018-02-02 14:31:43 +01:00
Lipu Fei
367e50669d Refactor code 
CURA-3710
 2018-02-01 13:56:49 +01:00
Lipu Fei
0e5c67a38f Merge remote-tracking branch 'origin/master' into CURA-3710_setting_visibility_preset 2018-02-01 11:00:13 +01:00
Diego Prado Gesto
701ac7f91e Merge branch 'master' of https://github.com/Ultimaker/Cura 2018-02-01 09:05:32 +01:00
alekseisasin
e5c72cfdc5 Validate material profile 
CURA-4851
 2018-01-31 14:58:44 +01:00
Diego Prado Gesto
81488e0bbc Merge branch '3.2' 2018-01-31 09:13:29 +01:00
Aleksei S
f065a08c82 Added visible settings 
CURA-3710
 2018-01-30 15:26:15 +01:00
Diego Prado Gesto
3981b717a8 CURA-4881 Remove the automatic option for buildplates 2018-01-30 13:31:14 +01:00