Diego Prado Gesto
c03d54f598
Merge branch '3.0' into fix_infill_slider_rounding
2017-09-27 16:11:10 +02:00
fieldOfView
3be8f45636
Move the quality indicator to the center when there is only one quality available
...
Fixes #2485
CURA-4383
2017-09-27 15:18:53 +02:00
ChrisTerBeke
83e612c1c1
Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0
2017-09-27 14:51:34 +02:00
ChrisTerBeke
c1cfb76f8a
CURA-4380 code improvements for build plate adhesion label
2017-09-27 14:51:20 +02:00
ChrisTerBeke
a8ce7185cc
CURA-4380 gradual infill checkbox closer to slider to indicate category
2017-09-27 14:35:13 +02:00
ChrisTerBeke
a337fd4e9c
CURA-4380 quality slider text disabled color when slider cannot be used
2017-09-27 14:32:05 +02:00
Mark
500989e36d
Re-add the margin between infill and support checkbox
...
CURA-4380
2017-09-27 14:28:31 +02:00
Mark
aa93c67a94
Re-add the margin between infill and support checkbox
...
CURA-4380
2017-09-27 14:27:04 +02:00
ChrisTerBeke
f8e8dcacdf
CURA-4381 use modulus to set infill slider step size and tick show
2017-09-27 13:55:57 +02:00
ChrisTerBeke
aed5e631dc
CURA-4352 fix passing int values as float when changing slider value
2017-09-27 13:13:55 +02:00
Jaime van Kessel
2dee054003
Merge branch 'fix_screen_scale_factor' of https://github.com/fieldOfView/Cura into 3.0
2017-09-27 12:57:42 +02:00
fieldOfView
3d08ec6bac
Fix Simple mode sliders for Hi DPI
2017-09-27 11:43:57 +02:00
fieldOfView
c5fd0e6c80
Use screenScaleFactor to consistently adapt sizes to display pixel ratio
2017-09-25 22:07:12 +02:00
alekseisasin
c33bd80818
Added NOT SUPPORTED profile for UM2++ and quality slider validation if value:-1
...
CURA-4182
2017-09-25 15:38:47 +02:00
alekseisasin
ea65457920
After first start (no machine added) the controls on right side are invisible
...
CURA-4357
2017-09-22 14:45:23 +02:00
alekseisasin
e1f8676cac
Removed tooltip translation in SidebarSimple
...
CURA-4182
2017-09-22 14:02:13 +02:00
alekseisasin
4c3f146995
Merge branch '3.0' of github.com:Ultimaker/cura into 3.0
2017-09-22 13:51:15 +02:00
alekseisasin
9a0926b009
Check undefined text
...
CURA-4182
2017-09-22 13:50:31 +02:00
Ghostkeeper
0b166defd3
Merge branch 'master' of github.com:Ultimaker/Cura
2017-09-22 12:58:57 +02:00
Ghostkeeper
2020e355a2
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
...
Contributes to issue CURA-4357.
2017-09-22 12:58:20 +02:00
Ghostkeeper
bf6c6891c4
Don't display layer height before a printer is added
...
Contributes to issue CURA-4357, somewhat.
2017-09-22 12:52:22 +02:00
alekseisasin
191854adef
Added tooltip text for the infill icons
...
CURA-4303
2017-09-22 12:52:03 +02:00
Ghostkeeper
0183616b8f
Only switch profiles with slider if there is an added machine
...
Otherwise we crash and burn.
Contributes to issue CURA-4357.
2017-09-22 12:48:05 +02:00
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
