32 Commits

Author SHA1 Message Date
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
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
428dfeaed7 Add combobox popup styling 2018-01-24 16:08:56 +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
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
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
1fe653b231 Fix combobox dropdown item height 2018-01-03 12:47:08 +01:00
ChrisTerBeke
77c8ac3950 Layout fixes for controls 2.0 2018-01-03 11:46:20 +01:00
Jaime van Kessel
799d1a5b0c Updated setting items & sidebar to qtQuick controls 2.0 2017-10-11 21:02:27 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
fieldOfView
0f9cfa0304 Fix tab order after expanding categories or using search
This reimplements the behavior of pressing tab/backtab to force the correct order of items in the listview.
2017-06-26 14:35:37 +02:00
fieldOfView
edee53b0b1 Scroll setting with active focus into view 2017-06-26 13:00:59 +02:00
fieldOfView
b324e90ba5 Show hover state on active focus 2017-06-22 18:33:30 +02:00
Lipu Fei
6153fd70a8 Set SettingsComboBox value if we get undefined from resolve
CURA-3421
2017-04-03 11:10:05 +02:00
Jaime van Kessel
9057174691 Resolve is now updated from the base property
The resolve doesn't update always update well for single extrusion machines, so the wrong value gets used.
There is however, no need for a resolve with a single extrusion machine, so we can disable the resolve for those alltogether.

CURA-2939
2016-11-21 11:10:23 +01:00
Arjen Hiemstra
5a14c5e5ba Replace manual function calls to updateCurrentIndex with an explicit binding
This is mostly in support of Uranium PR #165 . That changes
SettingPropertyProvider so that the "properties" property does not
always change. However, in general this is the more correct approach.

Relates to CURA-2232
2016-10-04 13:22:20 +02:00
Simon Edwards
0fdd9279bb Resolvement strategy for bed adhesion and prime tower enable.
Contributes to CURA-2232 No resolvement strategy for prime_tower_enable and platform adhesion
2016-09-13 14:07:18 +02:00
fieldOfView
1bbf987921 Fix SettingComboBox and SettingExtruder in some contexts
Use propertyProvider instead of provider; fixes comboboxes in PostProcessing plugin.
2016-07-28 13:45:11 +02:00
Arjen Hiemstra
e473d7a4e9 Ensure the control has active focus when clicking a SettingItem
This way we ensure that things update properly when for example changing
infill pattern.

Fixes CURA-1494
2016-06-14 17:29:05 +02:00
Arjen Hiemstra
f5e97c5001 Make SettingComboBox work (mostly) properly
=
2016-05-16 18:22:37 +02:00
Arjen Hiemstra
3514d4839d Fix combo box setting item so it displays the right things 2016-05-11 17:19:31 +02:00
Arjen Hiemstra
2abb9a47c1 Stop using SettingItemStyle
Since everything is now in Cura, using SettingItemStyle does not make a
lot of sense anymore
2016-05-11 17:19:31 +02:00
Arjen Hiemstra
fa7e186b2f Import Uranium's SettingView related files and start making them work
This is too cura-specific now so we should not put it in Uranium.
2016-05-10 17:31:18 +02:00