116 Commits

Author SHA1 Message Date
ChrisTerBeke
496791db7f simplify updating max layers changed - CURA-4432 2017-10-11 11:55:54 +02:00
Lipu Fei
0e7f209efa Fix updating upper handle in layer view
CURA-4432
2017-10-11 11:46:22 +02:00
ChrisTerBeke
0b5fac28b9 fix merge conflicts 2017-10-10 09:43:16 +02:00
ChrisTerBeke
48e938675f start adding back slider labels - CURA-4412 2017-10-09 11:26:26 +02:00
ChrisTerBeke
d435541908 create separate layerslider component, fix updating when changing view 2017-10-06 17:29:37 +02:00
Ghostkeeper
d458fcde5c
Revert "Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0""
This reverts commit e07e7bc9e714843cf853f0a255ee5a8432696886.

Contributes to issue CURA-4414.
2017-10-05 10:58:49 +02:00
Ghostkeeper
e07e7bc9e7
Revert "Merge branch 'fix_garbled_fonts_macos' into 3.0"
This reverts commit b62c19206f5e494fa27eb0b877197556c559e449, reversing
changes made to 104926c6ed1648ec20b4308fdacad4e99c14c8b3.

Contributes to issue CURA-4414.
2017-10-05 10:28:54 +02:00
fieldOfView
50f596cc2a Fix width of the layerview layer box
Fixes #2396
2017-10-02 14:49:29 +02:00
Mark
9a193ad5c5 Changing AGPLv3 to LGPLv3 2017-09-28 13:00:43 +02:00
fieldOfView
72bf073101 Fix LayerView layer box width 2017-09-27 11:43:14 +02:00
fieldOfView
c5fd0e6c80 Use screenScaleFactor to consistently adapt sizes to display pixel ratio 2017-09-25 22:07:12 +02:00
Jaime van Kessel
b434fdb875 Layerview scrollbar now has fixed size.
Instead of using the size of the other items. This worked when the bar was still part of the larger view, but since it's now
below the item it broke it.

CURA-4342
2017-09-20 13:35:13 +02:00
Jaime van Kessel
ddacdf523e Fixed some small issues when certain qml objects were null
CURA-4349
2017-09-20 09:48:00 +02:00
ChrisTerBeke
c5c6ed8b2b CURA-4318 fix colors and layouts for dark design 2017-09-14 09:59:13 +02:00
ChrisTerBeke
92617e2177 remove layerview toolbox arrow 2017-09-12 10:15:08 +02:00
ChrisTerBeke
7d719c4ab5 layer view toolbox height depending on color scheme mode 2017-09-12 09:54:24 +02:00
ChrisTerBeke
4143effbe1 only show slider track when layers are available 2017-09-12 09:13:16 +02:00
ChrisTerBeke
89cbaca257 Hide layer view toolset when in monitoring mode 2017-09-11 15:20:46 +02:00
Lipu Fei
94a8d2dfc6 Fix LayerView text colour
CURA-4212
2017-09-11 11:15:56 +02:00
Lipu Fei
96678b11ca Update LayerView slider according to new style
CURA-4212
2017-09-11 11:10:56 +02:00
Lipu Fei
b2eead7736 Resolve merge conflicts from master
CURA-4212
2017-09-11 10:32:34 +02:00
Lipu Fei
c8a92f2c59 Move LayerView slider down
CURA-4212
2017-09-07 17:04:14 +02:00
Lipu Fei
750f1ce158 Make extruder icons on LayerView panel round
CURA-4212
2017-09-07 16:24:48 +02:00
Lipu Fei
dd62367937 Move View mode button and LayerView panel to top right
CURA-4212
2017-09-07 16:24:43 +02:00
Lipu Fei
40b60a2d95 Fix colour for LayView panel and per object settings panel
CURA-4148
2017-09-06 16:23:29 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons
CURA-4148

Resolve merge conflicts.
2017-08-28 11:13:38 +02:00
Jaime van Kessel
b1160c2c37 Labels in layerview now correctly use font
Fixes #2309
2017-08-23 14:02:02 +02:00
Ghostkeeper
9d910be212
Add borders to layer view slider handles
And all other sliders, of which we have exactly 0.

Contributes to issue CURA-4148.
2017-08-21 18:28:06 +02:00
Lipu Fei
b4be6fcb9f Use Label for LayerView legend texts
CURA-3799
2017-08-03 16:18:58 +02:00
Lipu Fei
ddee562129
Fix typo in LayerView.qml
CURA-3799
2017-08-03 13:06:20 +02:00
alekseisasin
b984b99c30
Translated text overlaps GUI
CURA-3799
2017-08-03 13:05:53 +02:00
Thomas Karl Pietrowski
fe3bccaf5f LayerView: Set color for comp. mode text
Before it was using the system's default, which is not that nicely visible, if you are using a dark theme.
2017-07-25 09:35:42 +02:00
fieldOfView
5fec3d4f6d Replace mock borders with true borders 2017-07-03 16:04:18 +02:00
fieldOfView
48efcdf6e4 Use a PointingRectangle for the LayerView pane 2017-06-22 14:59:15 +02:00
Lipu Fei
0171d9637c Fix mode switching issue in LayerView
CURA-3730
2017-05-04 15:15:38 +02:00
Lipu Fei
0b57fa0bcb Hide Top/Bottom and Inner Wall legends in "Material Color"
CURA-3730
2017-05-03 10:37:24 +02:00
fieldOfView
9371b28cb3 Add color swatch for "by material" view style and show proper extruder names 2017-04-25 18:55:25 +02:00
fieldOfView
49880d54ad Remove code repetition while touching up layout 2017-04-25 18:45:43 +02:00
fieldOfView
0b9f451103 Apply color to layerview legend labels directly
The Label style property should not be confused with e TextField style property
2017-04-25 18:15:04 +02:00
fieldOfView
2493bd6fe6 Merge branch 'master' into themed-layer-view 2017-04-25 18:06:12 +02:00
Jaime van Kessel
f82aecb7ca Refactoring; no longer use "Printer" to identify CuraApplication 2017-03-30 20:19:05 +02:00
Jack Ha
aa79ca1d30 Layer view menu items now have Cura colors, not the system colors. 2017-03-20 15:49:27 +01:00
jack
3b1a15e1c4 Merge pull request #1495 from fieldOfView/feature_draggable_range_slider2
Use a single draggable range slider in Layerview
2017-03-07 11:43:17 +01:00
Jack Ha
c10dc2f07c Set old permissions back. CURA-3321 2017-03-07 10:36:30 +01:00
fieldOfView
34ac02f5bd Use Pointing Rectangle for layer number indicator 2017-03-06 18:23:08 +01:00
fieldOfView
2b49484dc7 Hide the slider controls when there are no layers
(and code cleanup)
2017-03-06 17:46:42 +01:00
fieldOfView
af265be900 Add up/down key navigation to layernum box 2017-03-06 17:27:37 +01:00
fieldOfView
d0c8b05314 Fix setting central value 2017-03-06 17:16:36 +01:00
fieldOfView
a6bc2b07f8 Fix setting lower value 2017-03-06 16:35:00 +01:00
fieldOfView
a664ee88b7 Fix setting upper value 2017-03-06 16:01:00 +01:00