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
Jaime van Kessel
c6e589e7d9
Merge branch '3.0' of github.com:Ultimaker/Cura into 3.0
2017-09-21 15:19:35 +02:00
Jaime van Kessel
78987ba666
When tool icon can not be found in theme, try to find it in the plugin folder
...
CURA-4345
2017-09-21 15:19:00 +02:00
ChrisTerBeke
cdc1b9ba66
CURA-4303 infill slider icon color, border, alignment
2017-09-21 14:28:22 +02:00
Jaime van Kessel
3cdf3f6097
Merge branch '3.0' of github.com:Ultimaker/Cura
2017-09-20 10:43:06 +02:00
Jaime van Kessel
5d4b23e72a
Merge branch 'feature_home_camera' of https://github.com/fieldOfView/Cura
2017-09-19 16:47:40 +02:00
Mark
03a159e423
Add some margin for the helper boxes, not perfect yet
...
CURA-4303
2017-09-19 11:36:05 +02:00
Mark
db072eae8e
Add some margin for the helper boxes, not perfect yet
...
CURA-4303
2017-09-19 10:11:41 +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
fieldOfView
3f903d2c76
Add menu item to reset the camera
2017-09-16 10:05:45 +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
Diego Prado Gesto
0e1b9d8c5d
Changed the way in which print times are shown in Sidebar - CURA-4232
2017-09-15 10:46:01 +02:00
alekseisasin
aa0ade2e74
Merge branch 'master' of github.com:Ultimaker/cura
2017-09-14 18:05:28 +02:00
alekseisasin
98ab571483
Removed 14bitVoid code accord to a new LGPL license
...
CURA-4232
2017-09-14 18:03:31 +02:00
ChrisTerBeke
a4ebedee83
CURA-4321 make print button blue when available, slight color changes on hover and pressed
2017-09-14 17:40:44 +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
5df5dfec02
Auto-adjust mode tab position based on text length
...
CURA-4322
2017-09-14 08:50:25 +02:00
Lipu Fei
3d6648fc59
Rearrange quality profile slider and dropdown box
...
CURA-4182
- Remove the quality profile dropdown box from Recommended mode
- Move the quality profile dropdown box to Custom mode
2017-09-13 17:12:51 +02:00
Lipu Fei
d82a1daacf
Add new quality/resolution slider
...
CURA-4182
2017-09-13 16:53:04 +02:00
Lipu Fei
84ad9c6ad1
Add "available" flag for quality profiles
...
CURA-4182
Add "available" flag for quality profile model so the slider can use it
to show available and unavailable profiles.
2017-09-13 16:40:59 +02:00
fieldOfView
53d2b8ea97
Remove solid white background behind simple mode controls
2017-09-13 16:15:24 +02:00
Mark
766bc9ae97
Changed bold fonts to normal
...
CURA-4148
2017-09-12 14:37:29 +02:00
ChrisTerBeke
3a098f4b4c
CURA-4319 material compatibility link style
2017-09-12 13:24:33 +02:00
ChrisTerBeke
073c2d3335
style and code improvements for combobox with color swatch
2017-09-12 12:11:23 +02:00
ChrisTerBeke
9e62c4db15
CURA-4318 remove active printer hover underline, theme inheritance, theme names
2017-09-12 11:39:48 +02:00
alekseisasin
637b536536
Merge pull request #2342 from hroncok/localefix
...
Relocate locales to proper locations
2017-09-11 17:23:12 +02:00
ChrisTerBeke
485b71c010
top bar improvements
2017-09-11 15:08:06 +02:00
ChrisTerBeke
7efe3a3b9e
Merge branch 'master' into feature_top_right_layer_view
2017-09-11 11:50:18 +02:00
Lipu Fei
a041d005fa
Merge pull request #2335 from fieldOfView/fix_simple_mode_disabled_features
...
Hide adhesion & support options if they are disabled
2017-09-11 11:43:48 +02:00
Lipu Fei
b2eead7736
Resolve merge conflicts from master
...
CURA-4212
2017-09-11 10:32:34 +02:00
