143 Commits

Author SHA1 Message Date
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
Mark
3b12e39ba8 Selected state font is not bold anymore for custom and recommended
CURA-4148
2017-09-08 16:35:08 +02:00
Mark
db77a4690c Made the selected borders a little thicker
CURA-4148
2017-09-08 15:18:40 +02:00
Mark
748c72760b Typo 2017-09-08 13:53:21 +02:00
Mark
a50e228ba1 Fix onHover border for extruder buttons
CURA-4148
2017-09-08 11:56:37 +02:00
Lipu Fei
24e5c72e47 Update colour for light theme
CURA-4148
2017-09-06 16:04:31 +02:00
Lipu Fei
e18528d2ca Fix position of the material compatibility warning
CURA-4148
2017-09-06 15:49:54 +02:00
Mark
34f8db5450 Changed some margins to improve alignment
CURA-4211
2017-09-06 14:52:16 +02:00
Lipu Fei
e163cc0d84 Remove "Extruder Configuration" text
CURA-4211
2017-09-06 12:43:42 +02:00
Lipu Fei
fc7207e77e Remove "Sync" button
CURA-4211
2017-09-06 12:17:40 +02:00
Lipu Fei
e15a96263d Update extruder button styles
CURA-4211
2017-09-06 12:00:53 +02:00
Lipu Fei
d0740158b1 Merge branch 'master' into feature_extruder_buttons
CURA-4211

Resolve merge conflicts.
2017-09-04 08:29:26 +02:00
Lipu Fei
c2645d0022 Change extruder tabs to buttons
CURA-4211

Change extruder tabs to buttons according to the new design.
2017-08-31 17:49:23 +02:00
Lipu Fei
b75140973e Change extruder tab to use new button style
CURA-4211

- Use new button style ("Extruder" text with an extruder icon) for
  extruder tabs
- The "Extruder" text will disapear if the width is not enough
2017-08-31 17:49:23 +02:00
Lipu Fei
3fbdb27e8e Merge branch 'master' into feature_dark_colours_icons
CURA-4148

Resolve merge conflicts.
2017-08-28 11:13:38 +02:00
Ghostkeeper
585c04dfaa
Also show warning icon when the set-up on other extruders is unsupported
So I added a function that checks the support on all extruders and the global stack.

Contributes to issue CURA-4148.
2017-08-25 14:27:45 +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
c6d1ff0823
Don't colour Check Material Compatibility text red upon incompatibility
I would've liked it when it became yellow instead, but just keeping it white and displaying the warning icon is sufficient I suppose.

Contributes to issue CURA-4148.
2017-08-23 13:33:04 +02:00
Ghostkeeper
ab444943cb
Rename setting_validation_error/warning and border
In some places we want to use the bright error or warning colours to display that something is going on. In those places we'd like to refer to the colour setting_validation_error rather than setting_validation_error_border or something, so I'm renaming these four theme items.

Contributes to issue CURA-4148.
2017-08-23 13:30:25 +02:00
Mark
2d0a4d443d Switch material and print core
CURA-4147
2017-08-23 10:54:46 +02:00
Lipu Fei
662e3b9cd1 Fix coding style
CURA-4147
2017-08-18 13:38:16 +02:00
alekseisasin
7978b0efe9 Move quality profile, material and print core to it's new location
CURA-4147
2017-08-18 09:15:17 +02:00
Mark
4e03eeca8e Anchor the i-button to materialVariantContainer
CURA-3810
2017-05-31 12:00:44 +02:00
Mark
a934cc4182 Make the icon a litle bit smaller
CURA-3810
2017-05-31 10:50:49 +02:00
Mark
6311563909 Realign the selectboxes
CURA-3810
2017-05-31 10:50:49 +02:00
Lipu Fei
8af1cc886f Use .definition to access DefinitionContainer in qml
CURA-3810
2017-05-30 12:49:12 +02:00
Lipu Fei
7be05229d8 Fix material info button tooltip position
CURA-3810
2017-05-30 11:47:49 +02:00
Lipu Fei
9333ed1e35 Update copyright in comments
CURA-3810
2017-05-30 09:16:58 +02:00
Lipu Fei
68bd5a6e37 Use Item and anchors to set material row layout
CURA-3810
2017-05-30 09:16:28 +02:00
Lipu Fei
c80e1b67a5 Only show material info button for multi-extrusion machines
CURA-3810
2017-05-29 18:00:46 +02:00
Lipu Fei
85e875257b Use "/<version>/<machineName>" as the material info URL suffix
CURA-3810
2017-05-29 15:23:52 +02:00
Lipu Fei
9b67fa94b4 Add material info button to show Ultimaker.com materials page
CURA-3810

Add a new info button for materials. When a user clicks on the button,
it will open the materials information page on the Ultimaker website.
2017-05-29 14:52:05 +02:00
Mark
bfda8712e1 Change all Label to Text so fonts are rendered correct
CURA-3389
2017-04-14 13:16:48 +02: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
fieldOfView
3e369c2494 Hide profiles selection (variant/material/quality) when hiding settings 2017-01-11 18:31:33 +01:00
Jack Ha
0d023a196e Code layout. CURA-2763 2016-12-08 11:21:30 +01:00
fieldOfView
ace4bfba10 Fix QML error about use of anchors in a row 2016-12-07 22:30:31 +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
7694b8f128 Cannot do it simpler. CURA-2763 2016-12-07 15:40:25 +01:00
Jack Ha
4ecd1a0fe3 Simplifying layout by removing unneeded elements. CURA-2763 2016-12-07 15:16:47 +01:00
Jack Ha
67f1afb9ce Revert "Show extruder tabs only in custom mode. CURA-2763"
This reverts commit f916c9b4cfc47e8fa99c7a9888b0d12f118503af.
2016-12-07 14:32:40 +01:00
Jack Ha
f916c9b4cf Show extruder tabs only in custom mode. CURA-2763 2016-12-06 16:32:34 +01:00
Jack Ha
3efc5d63ef Improved layout, removed material name from extruder name. CURA-2763 2016-12-06 16:11:08 +01:00
Jack Ha
30a74fb2c1 Layout changes, extruders are now displayed as extruder tabs. CURA-2763 2016-12-06 15:49:34 +01:00
Jack Ha
a65a81e60b colours 2016-12-06 14:14:24 +01:00
Jack Ha
c3320bb1a4 Change settings to settings/overrides in selected messages. CURA-2898 2016-11-23 13:33:12 +01:00
Ghostkeeper
070767f0db
Blur focus upon changing profiles, material, variant, etc.
Otherwise the currently focussed setting gets taken along to after the switch.
2016-11-04 16:02:08 +01:00
Ghostkeeper
afd3dd6eec
Make separate theme colour for detail text
I would use the normal font colour with a lower alpha value here, but it seems that rendering text with transparency doesn't work in Qt.

Contributes to issue CURA-2737.
2016-10-21 13:06:49 +02:00