ChrisTerBeke
0fa3bdd68b
CURA-4182 text color for unavailable quality to disabled
2017-09-22 11:57:05 +02:00
ChrisTerBeke
fe5910dd96
CURA-4182 final tweaks to quality slider color and position
2017-09-22 11:54:59 +02:00
ChrisTerBeke
781f2d56c8
CURA-4182 code improvements for slider property calcs 2
2017-09-22 11:31:24 +02:00
ChrisTerBeke
f016e5346a
CURA-4182 code improvements for slider property calcs
2017-09-22 11:29:18 +02:00
ChrisTerBeke
ae6b1a9f15
CURA-4182 better variable names
2017-09-22 11:14:13 +02:00
ChrisTerBeke
7f909df84a
CURA-4182 refactor quality slider to use model for updating
2017-09-22 11:04:46 +02:00
Aleksei Sasin
879b3df816
On Windows platform the qualitys slider is properly aligned CURA-4182
2017-09-21 21:20:54 +02:00
ChrisTerBeke
ecafa24888
code cleanup
2017-09-21 17:35:12 +02:00
ChrisTerBeke
a74a6a59fc
CURA-4182 fix merge conflicts with 3.0 branch
2017-09-21 15:33:00 +02:00
alekseisasin
bd6bb872b7
Changed Quality slider
...
CURA-4182
2017-09-21 15:24:40 +02:00
ChrisTerBeke
cdc1b9ba66
CURA-4303 infill slider icon color, border, alignment
2017-09-21 14:28:22 +02:00
Mark
03a159e423
Add some margin for the helper boxes, not perfect yet
...
CURA-4303
2017-09-19 11:36:05 +02:00
ChrisTerBeke
3be1b8ddf9
CURA-4303 fixes after comments on 1st commit
2017-09-18 17:39:14 +02:00
ChrisTerBeke
9553235b42
CURA-4303 finish infill slider, images, gradual checkbox, bindings
2017-09-18 15:15:59 +02:00
ChrisTerBeke
e8df185261
Merge branch 'master' into WIP_feature_infill_slider
2017-09-18 11:02:30 +02:00
ChrisTerBeke
86e5a1ed97
CURA-4182 tweak slider height to fix text cut off
2017-09-18 09:39:08 +02:00
Mark
1f3fa49ceb
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-15 16:48:58 +02:00
Mark
854c915502
Tweaked margins and cleanup
...
CURA-4182
2017-09-15 16:48:49 +02:00
alekseisasin
37869a8b14
Removed unused code. Shifted the last print quality number a bit to the left
...
CURA-4182
2017-09-15 16:36:00 +02:00
Lipu Fei
3188156da3
WIP: infill slider
...
CURA-4303
2017-09-14 17:19:43 +02:00
Lipu Fei
1e5b032cff
Make canvas use a one-time Timer to update
...
CURA-4182
The canvas approach has a drawback on the UI update: when a printcore
or a material is changed, calling requestPaint() to the canvas doesn't
trigger an immediate update. The solution is to have a built-in Timer in
the Canvas and to use that to update. Somehow this just works. The
problem with this approach is that the Timer constantly updates the
canvas which eats a lot of CPU power. To solve this, I changed the timer
to be a one-time timer and it will be started when there is a
material/print core update.
2017-09-14 15:59:12 +02:00
ChrisTerBeke
46cd712367
back to rectangle
2017-09-14 13:37:20 +02:00
ChrisTerBeke
f57fc6bb72
Merge branch 'master' into fix_dark_theme
2017-09-14 13:26:11 +02:00
Mark
159c79ab4b
Tweaked the margins to align better
...
CURA-4182
2017-09-14 13:17:35 +02:00
Lipu Fei
d14ac9e258
Fix text overlapping problem for adhesion in recommended mode
...
CURA-4322
2017-09-14 12:08:27 +02:00
ChrisTerBeke
e7ad4b7f17
Merge branch 'master' into feature_slider_for_quality
2017-09-14 10:34:34 +02:00
ChrisTerBeke
c5c6ed8b2b
CURA-4318 fix colors and layouts for dark design
2017-09-14 09:59:13 +02:00
Lipu Fei
d82a1daacf
Add new quality/resolution slider
...
CURA-4182
2017-09-13 16:53:04 +02:00
fieldOfView
53d2b8ea97
Remove solid white background behind simple mode controls
2017-09-13 16:15:24 +02:00
ChrisTerBeke
073c2d3335
style and code improvements for combobox with color swatch
2017-09-12 12:11:23 +02:00
fieldOfView
0896899179
Merge branch 'master' into fix_simple_mode_disabled_features
2017-09-08 14:24:05 +02:00
Mark
34f8db5450
Changed some margins to improve alignment
...
CURA-4211
2017-09-06 14:52:16 +02:00
fieldOfView
308e1793bc
Fix simple mode adhesion checkbox
2017-09-04 16:56:35 +02:00
fieldOfView
46b333bfc9
Merge branch 'master' into fix_simple_mode_disabled_features
...
# Conflicts:
# resources/qml/SidebarSimple.qml
2017-09-04 16:44:59 +02:00
fieldOfView
adc1630a20
Merge branch 'master' into fix_simple_mode_disabled_features
...
# Conflicts:
# resources/qml/SidebarSimple.qml
2017-09-04 16:38:32 +02:00
Mark
e3f319a644
less margin when support extruder pops up
...
CURA-4148
2017-09-04 16:23:19 +02:00
Mark
d18d9223a5
refix the alignmet of the support and adhesion chackboxes
...
CURA-4148
2017-09-03 08:18:12 +02:00
Ghostkeeper
c4910503e4
Correct height of tips text
...
The contentHeight property seems to indicate the height of only one line, contrary to the documentation...
Contributes to issue CURA-4148.
2017-08-31 10:18:54 +02:00
Ghostkeeper
526a42f7a0
Put sidebar contents inside a scroll view
...
That means that you can't depend on the parent height and such any more. Luckily I already changed that in the previous commit.
Contributes to issue CURA-4148.
2017-08-31 09:51:19 +02:00
Ghostkeeper
95ba4b9368
Link anchors differently
...
Once this is in a scroll view, the width of the parent box isn't fixed any more. We'd have a lot of binding loops. So now this linking is not dependent on the parent width any more but rather on the theme sizes.
Contributes to issue CURA-4148.
2017-08-31 09:35:27 +02:00
Ghostkeeper
11f8204644
Change margins in the side bar
...
These are more or less all margins in the side bar.
Contributes to issue CURA-4148.
2017-08-23 16:28:28 +02:00
Ghostkeeper
f5169f53f3
Remove text_reversed
...
This theme item is broken by nature since the theme itself allows you to change the colours such that these text elements don't get inversed colours at all. Instead I'm going to use text_emphasis for these which is currently the same. If ever they need to get different colours for these items than the normal colour, the theme item will have to be split up.
Contributes to issue CURA-4148.
2017-08-23 14:44:14 +02:00
Ghostkeeper
d55b8b2957
Add icon after Troubleshooting Guide text
...
Sadly the colour of this icon is hard-coded into the image... I didn't find any other solution to append an inline image after a multi-line text.
Contributes to issue CURA-4148.
2017-08-23 14:38:35 +02:00
fieldOfView
6656cd0c36
Hide adhesion & support options if they are disabled for the current printer
2017-08-23 13:26:47 +02:00
Lipu Fei
b274f63df0
Use the right stack to retrieve infill values in Recommended mode
...
CURA-3932
2017-08-04 14:19:14 +02:00
alekseisasin
d6c1a231ac
Translated text overlaps GUI
...
CURA-3799
2017-08-01 15:50:55 +02:00
Mark
4398960264
Give text in labels specific width so icons stay aligned
2017-05-31 12:46:07 +02:00
Jaime van Kessel
7508a0a981
Changed infill buttons so they work with all languages
...
CURA-3634
2017-05-12 10:24:15 +02:00
Ghostkeeper
e3236bec4d
Make wording more consistent
...
Contributes to issue CURA-3732.
2017-05-11 11:22:18 +02:00
Jaime van Kessel
e2b39e7e33
Fixed spacing of infill options
...
CURA-3732
2017-05-11 11:08:23 +02:00
