Guillem
1bb5b8ff3e
add Copy all values to all extruders
...
context menu option
2018-03-13 12:31:03 +01:00
Jack Ha
552618fcd4
CURA-4400 added function to find model index by extruder position in SettingExtruder
2018-03-12 09:56:08 +01:00
Jack Ha
5135a972a2
CURA-4400 code style
2018-03-08 14:32:10 +01:00
Jack Ha
bad637eb14
CURA-4400 fixed merge conflicts
2018-03-05 16:47:40 +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
Jack Ha
53ec846436
CURA-4400 introduced value -1 for extruder number setting (not optional_extruder); this one takes the defaultExtruderPosition in MachineManager
2018-03-01 17:21:35 +01:00
Jack Ha
2538c689f1
CURA-4400 make extruder combobox disabled items grey
2018-03-01 16:22:40 +01:00
Lipu Fei
6e5fed6b5e
WIP: Fix quality name in SettingView
2018-02-21 11:21:16 +01:00
Jack Ha
c3349baf39
CURA-4606 fix bug concerning activeMaterialsCompatible; factor out activeQualityName
2018-02-21 10:36:51 +01:00
Jack Ha
ad6548a5dc
CURA-4606 factored activeMaterialName out
2018-02-21 10:35:17 +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
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
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
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
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
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
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
Ghostkeeper
64e7a8e61f
Merge branch '3.2'
2018-02-05 14:18:18 +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
fieldOfView
428dfeaed7
Add combobox popup styling
2018-01-24 16:08:56 +01:00
Ghostkeeper
0007f3dafd
Merge branch '3.2'
2018-01-16 09:28:40 +01:00
Aleksei S
9a3c9921ca
Fix: remove unnecesary cura slice request
...
CURA-4785
2018-01-15 17:21:43 +01:00
Ghostkeeper
e7c5120f9c
Merge branch '3.2'
2018-01-15 16:52:28 +01:00
Aleksei S
38ae75637a
Revert "Fix: Cura update setting after delay"
...
This reverts commit f823a98708dd3eed2485ff412d3fe2dd03a31f35.
2018-01-15 16:15:36 +01:00
Aleksei S
8498946de1
Merge branch 'master' of github.com:Ultimaker/cura
2018-01-15 15:40:10 +01:00
Aleksei S
f823a98708
Fix: Cura update setting after delay
...
CURA-4785
2018-01-15 15:39:25 +01:00
Lipu Fei
616615067c
Fix quality name in selected profile box
...
CURA-4796
2018-01-15 15:17:15 +01:00
Ian Paschal
dac67ef2fc
Merge pull request #3134 from Ultimaker/3.2
...
Fix for CURA-4789
2018-01-15 14:41:23 +01:00
Lipu Fei
03bd4d8d22
Fix profile menu text for custom profiles based on not supported
...
CURA-4796
2018-01-15 14:29:52 +01:00
Jaime van Kessel
ed9634ebe0
Merge branch 'master' of github.com:Ultimaker/Cura into network_rewrite
2018-01-08 10:56:12 +01:00
ChrisTerBeke
9784faf181
Merge pull request #3017 from fieldOfView/feature_textfield_select
...
Select text when gaining focus
2018-01-04 17:01:46 +01:00
Lipu Fei
d20895a055
Fix code style
...
CURA-4758
2018-01-04 13:51:47 +01:00
Lipu Fei
84adbc5f41
Use the 5.8 versions of QtQuick modules in QMLs
...
CURA-4758
2018-01-04 13:26:14 +01:00
ChrisTerBeke
4cec27b181
Fix QML warnings for combo boxes - CURA-4758
2018-01-04 11:53:34 +01:00
ChrisTerBeke
3f7d8997a1
Fix icon positions - CURA-4758
2018-01-04 11:33:12 +01:00
ChrisTerBeke
4f77b2ea6d
More layout and font fixes
2018-01-03 13:50:06 +01:00
ChrisTerBeke
b7aadbe3c3
Fix extruder dropdown text model
2018-01-03 13:08:20 +01:00
ChrisTerBeke
1fa3031486
Fix text color for extruder comboboxes
2018-01-03 12:52:40 +01:00
ChrisTerBeke
3a2b2d3333
Also fix combobox list item heights for extruder dropdowns
2018-01-03 12:48:33 +01:00
