220 Commits

Author SHA1 Message Date
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
Ghostkeeper
fc1a5e89c3
Change gradual infill upon clicking infill buttons
It sets the gradual infill to the value stored in the listmodel.

Contributes to issue CURA-3732.
2017-05-05 17:16:18 +02:00
Ghostkeeper
ad1b1e0455
Detect whether the current infill is gradual
And highlight the correct infill button in that case.

Contributes to issue CURA-3732.
2017-05-05 17:13:32 +02:00
Ghostkeeper
df0a971326
Improve tooltip wording for gradual infill button
Contributes to issue CURA-3732.
2017-05-05 16:59:35 +02:00
Mark
b590e7b86c [WIP] Add place for the extra gradual infill icon
CURA-3732
2017-05-03 17:05:56 +02:00
Jack Ha
5d15d6e792 Merge branch 'master' into feature_multiextruder_machinesettings 2017-05-02 17:26:27 +02:00
fieldOfView
98aca20197 Fix hover effect on "enable support" checkbox 2017-04-30 22:27:07 +02:00
fieldOfView
4d12ab1296 Merge branch 'master' into feature_multiextruder_machinesettings 2017-04-21 19:31:44 +02:00
fieldOfView
62f2fe062b Enable settings when machine_extruder_count is set to 1 but multiple extruders are defined 2017-04-19 16:20:01 +02:00
Mark
8ede111001 Texts in the mainwindow should be Text instead of Label
CURA-3389
2017-04-14 11:41:12 +02:00
Tim Kuipers
7f07be3444 JSOn rename: Enable Support ==> Generate Support (CURA-2747)
The generate support settings has been renamed because support will still be printed even when it is not generated by the engine,
but given by a support mesh
2017-04-03 17:11:57 +02:00
Jaime van Kessel
0b4a05a84c Recommended settings now shows correct status for adhesion when None was selected
Fixes #1454
2017-02-20 17:32:20 +01:00
fieldOfView
a823980d17 Replace "transparent" Rectangles by Items 2017-01-25 15:21:37 +01:00
fieldOfView
bf3d3d46e2 Fix Rectangles that always show as white regardless of the theme 2017-01-25 15:12:57 +01:00
Jack Ha
88f73d881c Enable Support tooltip translation. CURA-3123 2016-12-13 10:34:58 +01:00
fieldOfView
e642b4ebe9 Tweak 2.4 sidebar changes
* Make extruder-tabs more clear on badly calibrated displays
* Make infill selection same width as other "Recommended" controls
* Move printer selection to the top bar
* Add animation to support extruder selection combobox
2016-12-07 17:41:04 +01:00
Jack Ha
64c0cbd0a4 Fix clean config cura, recommended mode support extruder update. CURA-3033 2016-12-06 11:48:49 +01:00
Jack Ha
8c5d97f6a0 Removed log. CURA-2767 2016-12-01 14:52:40 +01:00
Jack Ha
8ff233871f Fixed typo. CURA-2767 2016-12-01 14:51:41 +01:00
Jack Ha
14701d89d0 Finally got edge cases regarding recommended mode support extruder color working. CURA-2767 2016-12-01 14:50:40 +01:00
Jack Ha
ef6e90283e Added color to recommended view support extruder by adding combobox_color style. CURA-2767 2016-12-01 11:34:37 +01:00
Ghostkeeper
79e8fc210a
Remove commented code
Contributes to issue CURA-2767.
2016-11-17 10:24:19 +01:00
Ghostkeeper
d448ed7e08
Code style: Brackets on new line
Contributes to issue CURA-2767.
2016-11-17 09:59:14 +01:00
Jack Ha
3acddddc7c Solve populating Support Extruder Combobox at first time start, adjusted spacings. CURA-2767 2016-11-15 17:09:19 +01:00
Jack Ha
d34c79249b Changed recommended sidebar options, seems to work. CURA-2767 2016-11-15 16:40:04 +01:00
Jaime van Kessel
3d30762c41 Improved difference between active and passive infill icons
CURA-2768
2016-11-04 09:53:14 +01:00
Jaime van Kessel
a969b45372 Increased width of support extruder combobox
CURA-2792
2016-11-03 15:41:15 +01:00
fieldOfView
1b4283257f Make Simple Mode reflect global settings (Support, Adhesion) 2016-08-25 13:41:39 +02:00