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
Diego Prado Gesto
e227ab5a23
CURA-4881 Remove the automatic option for buildplates if there is no information about them
2018-01-30 13:29:28 +01:00
Diego Prado Gesto
b7093e8b57
Make the menu separator only show if there are quality changes profiles
2018-01-30 11:26:01 +01:00
fieldOfView
a1adce298e
Add color to "recommended"/"custom" button texts
2018-01-24 16:56:53 +01:00
fieldOfView
1a56eae186
Bring SettingOptionalExtruder up to speed
2018-01-24 16:46:53 +01:00
fieldOfView
6480926869
Add swatches in extruder dropdown
2018-01-24 16:44:15 +01:00
fieldOfView
19e74a2d45
Add extruder combobox popup styling
2018-01-24 16:29:36 +01:00
Ghostkeeper
ae40071ffd
Merge branch '3.2'
2018-01-24 16:17:49 +01:00
fieldOfView
428dfeaed7
Add combobox popup styling
2018-01-24 16:08:56 +01:00
Ghostkeeper
3f7eaaae94
Move HTML tags out of translated text
...
We always want the same HTML tag around it. There's no need to allow the translator to change that.
Discovered during issue CURA-4692.
2018-01-24 13:52:31 +01:00
Aleksei S
54dc63a596
Add missing changes
...
CURA-3710
2018-01-23 11:24:27 +01:00
Diego Prado Gesto
5c8a47275e
CURA-4845 Revert changes when accessing the quality changes at the time
...
of creating the global ProfileTab in the preferences.
2018-01-22 13:08:30 +01:00
Lipu Fei
ed939d31fa
Add hardware_type = nozzle for nozzle variants
...
CURA-4461
2018-01-22 12:20:10 +01:00
Diego Prado Gesto
0fbcd2d2ec
Merge branch '3.2'
2018-01-19 13:50:30 +01:00
ChrisTerBeke
99c40d09e9
Hitting enter on project loading dialog now loads the project instead of just closing the dialog - CURA-4735
2018-01-19 11:32:55 +01:00
Mark
00cf47a941
Merge branch '3.2'
2018-01-18 16:29:44 +01:00
Mark
a774012bd2
Default objectlist to collapsed CURA-4525
2018-01-18 16:28:46 +01:00
fieldOfView
259b1091f6
Fix QML errors building the material and nozzle menus
...
Since the network rewrite, outputdevices no longer have hotends and materials. This functionality may return, but until that time this does a better job at checking if the properties exist, preventing QML errors.
2018-01-17 19:36:20 +01:00
Lipu Fei
cb0ac9b0c8
Merge pull request #3137 from Ultimaker/feature_multiple_BP
...
Feature: Printers with different build plates
2018-01-17 10:55:46 +01:00
Jack Ha
07f0906b1c
Merge branch '3.2'
2018-01-16 16:05:38 +01:00
Jack Ha
cffeff0299
CURA-4805 remove modifiable settings when loading non sliceable file (gcode)
2018-01-16 15:58:14 +01:00
Diego Prado Gesto
da4c98b204
Merge branch 'master' into feature_multiple_BP
2018-01-16 09:59:21 +01:00
Diego Prado Gesto
cd4b162b86
CURA-4461 Change sizes and theme colors for the separator
2018-01-16 09:47:33 +01:00
Ghostkeeper
0007f3dafd
Merge branch '3.2'
2018-01-16 09:28:40 +01:00
Diego Prado Gesto
a7beb142ff
CURA-4461 Add line separator when the build plate selector is visible
2018-01-16 09:23:39 +01:00
