241 Commits

Author SHA1 Message Date
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
Ghostkeeper
cd4bffb380
Set author to Ultimaker B.V. instead of Ultimaker
To be consistent with the rest of the plug-ins and with the material files.

Contributes to issue CURA-3857.
2017-06-28 13:50:37 +02:00
Mark Burton
6d6fec46b2 In geometry41core, take the line width/depth from the second vertex rather than the first.
This change fixes a problem where a sequence of lines that have different widths are displayed
with the widths shifted by 1, i.e. line 1 had the width of line 2 and so on.
2017-06-26 08:20:13 +01:00
fieldOfView
48efcdf6e4 Use a PointingRectangle for the LayerView pane 2017-06-22 14:59:15 +02:00
Lipu Fei
4ea8cc448a Use semantic versioning for all plugin.json
CURA-3712
2017-06-22 08:57:47 +02:00
Lipu Fei
73f598ff9f Fix code style
CURA-3712
2017-06-22 08:54:04 +02:00
Jaime van Kessel
e3629cec39 Replaced catalog metadata entry with i18n-catalog
CURA-3712 & Cura-3856
2017-06-21 14:24:00 +02:00
Jaime van Kessel
44125d3275 Moved certain meta data entries to seperate file
CURA-3856 & CURA-3712
2017-06-21 11:22:35 +02:00
sheinz
de62a3c0fe Fix displaying layers with python3.6 2017-06-06 23:47:40 +03: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
Lipu Fei
7315a09c7d Use layer_id to determine total layer count
CURA-3615
2017-04-04 11:45:30 +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 Ha
f47ec27014 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-07 16:44:41 +01:00
Jack Ha
afec26eb62 Merge branch 'master' of github.com:Ultimaker/Cura 2017-03-07 11:47:25 +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
73dff09443 Travel moves now have a width of 0.1. CURA-3321 2017-03-07 10:47:34 +01:00
Jack Ha
efbc624ea8 More defensive setExtruderOpacity, removed unnecessary part. CURA-3321 2017-03-07 10:40:59 +01:00
Jack Ha
c10dc2f07c Set old permissions back. CURA-3321 2017-03-07 10:36:30 +01:00
Jack Ha
42d939b34e Solved merge conflict. CURA-3321 2017-03-07 10:34:53 +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
0fa32c3c16 Step by 10 layers with shift key down 2017-03-06 16:48:59 +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
fieldOfView
694da25bb7 Show proper values of the active handle of the slider 2017-03-06 14:35:36 +01:00
fieldOfView
a0df6bf542 Jerry-rig single slider to replace dual slider design 2017-03-06 14:33:48 +01:00
Jack Ha
b2e06bed37 Fix 'inverting slider' when switching between Layer view and a different view. CURA-3321 2017-03-06 14:03:42 +01:00
Jack Ha
1f61017946 Fix updateLegend function. CURA-3321 2017-03-06 13:20:14 +01:00
Jack Ha
1c40c94c44 Fix compatibility options. CURA-3321 2017-03-06 11:55:39 +01:00
Jack Ha
e89b1afa2c Initial layer view color mode -> legend. CURA-3321 2017-03-02 16:55:54 +01:00
U-ULTIMAKER\j.ha
c54d5ce707 Fixed compatibility mode active extruder. CURA-3321 2017-03-02 13:15:29 +01:00
Jack Ha
bdd07bd160 Removed commented out stuff. CURA-3321 2017-03-01 14:54:12 +01:00
Jack Ha
f9a5dc885c Solved merge conflicts #1479 CURA-3321 2017-03-01 14:47:54 +01:00
Jack Ha
f22299c80d Added option for show_travels in compatibility mode top layers. CURA-3321 2017-02-28 14:43:46 +01:00
Jack Ha
ba6a8eb869 Legend is now in the switching layer type area, removed legend upper right. CURA-3321 2017-02-28 13:34:58 +01:00