Commit graph

9820 commits

Author SHA1 Message Date
Ghostkeeper
b52446ed99
Use text colour specific to text in scene for job specs
Because the scene may have a different background colour than the rest, we need to be able to have inverted colours for that part.

Contributes to issue CURA-4148.
2017-08-23 14:58:43 +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
Ghostkeeper
85a1526912
Fix scaling of view mode button
Changed the size to 24x24 and moved the path 5 units down.

Contributes to issue CURA-4148.
2017-08-23 13:59:32 +02:00
Ghostkeeper
17e62ea6c1
Let theme decide upon coloured icons
We shouldn't colour the icons themselves, but rather let UM.RecolourImage choose the colours for just the outlines of the icons.

Contributes to issue CURA-4148.
2017-08-23 13:35:47 +02:00
Ghostkeeper
adb2fa739b
Correct setting_validation_error/warning and background/border
I modified these but forgot to commit them.

Contributes to issue CURA-4148.
2017-08-23 13:33:49 +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
Ghostkeeper
876c6aeced
Replace warning.svg with material_compatibility.svg
The warning icon is only used for the material compatibility warning, so it should just have been mixed.

Contributes to issue CURA-4148.
2017-08-23 13:14:21 +02:00
Ghostkeeper
2a1a41662a
Remove tab_monitor_with_status icon
It must always be the same as tab_monitor, but we'll just draw an additional icon on top of it.

Contributes to issue CURA-4148.
2017-08-23 12:53:07 +02:00
Ghostkeeper
07562e1745
Optimise new icons
Removed unnecessary groups. Removed unused IDs. Applied some transformations, including loads of transformations that did absolutely nothing. Truncated to 3 decimals. Removed unused imports. Removed empty defs. Removed generator markers.

Contributes to issue CURA-4148.
2017-08-22 17:36:21 +02:00
Ghostkeeper
054df31ee7
New icons
These are the raw icons as I got them from the UX designers.

Contributes to issue CURA-4148.
2017-08-22 17:00:27 +02:00
Ghostkeeper
09fef60711
Switch to dark colours
This is the big one.
The progress bar buttons and progress bars haven't been properly updated yet, since I have no new information about those. Also, some things currently look kind of weird because they were designed for a different layout. For instance, the layer view slider has a black rails on a black background, since it was designed for being on the white background of the 3D view.

Contributes to issue CURA-4148.
2017-08-21 19:11:57 +02:00
Ghostkeeper
ff30268dd7
Remove unused mode switch
Don't want to have to fill in theme items for that thing too.

Contributes to issue CURA-4148.
2017-08-21 18:41:58 +02:00
Ghostkeeper
9d910be212
Add borders to layer view slider handles
And all other sliders, of which we have exactly 0.

Contributes to issue CURA-4148.
2017-08-21 18:28:06 +02:00
Ghostkeeper
02e96f510a
Add hover and active colours for setting category text
They need to be able to have a different text colour depending on whether you're hovering, the category is expanded or not, etc.

Contributes to issue CURA-4148.
2017-08-21 17:05:39 +02:00
Ghostkeeper
b2338d9c2e
Re-use action button styling now that toggle is gone
We should keep these two types of buttons in sync, so have them share a theme.

Contributes to issue CURA-4148.
2017-08-21 15:11:07 +02:00
Ghostkeeper
12de8372b9
Use tooltip button colour for tooltips
That's what the theme entry was made for, wasn't it?

Contributes to issue CURA-4148.
2017-08-21 14:59:14 +02:00
Ghostkeeper
d50f498fef
Let button inactive opacity be defined by theme colours
They have an alpha channel. Let's put it to use...

Contributes to issue CURA-4148.
2017-08-21 14:50:27 +02:00
Ghostkeeper
f88ffee638
Make button text and icons change colour on active and hover
Just like the background colour, the foreground colour may now also change.

Contributes to issue CURA-4148.
2017-08-21 14:43:35 +02:00
Ghostkeeper
d73bbabda9
Change top bar text colour depending on hover and active state
Too bad we have to introduce additional theme entries for this sort of thing. Makes it harder to modify the theme!

Contributes to issue CURA-4148.
2017-08-21 14:11:16 +02:00
Ghostkeeper
5652bccc58
Change control border colour depending on validation state
The background colour was already changing, but the border colour was only depending on the hover state.

Contributes to issue CURA-4148.
2017-08-21 13:56:07 +02:00
Ghostkeeper
d94956dd23
Give time estimate a different text colour
Apparently it needs to be highlit a bit more than the rest.

Contributes to issue CURA-4148.
2017-08-21 13:51:36 +02:00
Ghostkeeper
4b8152d6fe
Allow fallthrough of switch statement
Makes it easier to modify.

Contributes to issue CURA-4148.
2017-08-21 13:21:33 +02:00
Ghostkeeper
226bb7b070
Write out border colour as full-fledged function
This makes it easier to read and to modify this functionality rather than a string of ternary operators. It's about to become more complicated too.

Contributes to issue CURA-4148.
2017-08-21 11:55:47 +02:00
Ghostkeeper
42b8e87d00
Make opacity of print monitor themeable
The new dark design specifies a colour for the print monitor overlay that is darker than what would be attainable with the default 75% opacity. So I'm making it 100% opacity (but still with a fade, so we need the opacity) and let the theme specify what opacity it wants.

Contributes to issue CURA-4148.
2017-08-21 10:50:36 +02:00
Ghostkeeper
db640c6f3d
Merge branch '2.7' 2017-08-21 00:58:15 +02:00
Ghostkeeper
df88772071
Add input checking for incorrect responses from printers
We should not crash when getting invalid data. Just put a warning in the log there and ignore the message for the rest.
2017-08-21 00:57:25 +02:00
Ghostkeeper
d793dc68ea
Add Creality CR-10
This definition was provided to me via e-mail. The initial data was badly formatted, so I corrected it and verified back with Michael Wildermuth that the new profile worked. Apparently it works, so thank you Michael.
2017-08-21 00:23:36 +02:00
Ghostkeeper
b917511528
Merge branch '2.7' 2017-08-18 16:58:21 +02:00
Ghostkeeper
b7493ae1a8
Also pull limit_to_extruder settings into per-object setting stack
Only for settings that are limited by a setting on the stack.

Contributes to issue CURA-4186.
2017-08-18 16:57:13 +02:00
Ghostkeeper
3c36c3427c
Cache top of stack for efficiency
Otherwise you need to retrieve this container for every key again. Doesn't matter much, but a bit.

Contributes to issue CURA-4186.
2017-08-18 15:36:15 +02:00
Ghostkeeper
4a788dfbdd
Reduce indentation by inverting input check
Reads a bit easier.

Contributes to issue CURA-4186.
2017-08-18 15:02:49 +02:00
Lipu Fei
24d3f8aab1 Put remove some zags settings as child settings
CURA-3957
2017-08-18 14:23:09 +02:00
Ghostkeeper
9241cfa5c6
Make tooltip backgrounds dark as well
Looks very professional.

Contributes to issue CURA-3948.
2017-08-18 14:19:53 +02:00
Lipu Fei
f0d5187896 Merge remote-tracking branch '2.7' 2017-08-18 13:43:00 +02:00
Lipu Fei
662e3b9cd1 Fix coding style
CURA-4147
2017-08-18 13:38:16 +02:00
Lipu Fei
67cfb064e6 Fix upgrading custom FDM printers from 2.5
CURA-4188

Custom FDM printers in 2.5 don't have multi-extrusion support but they
do since 2.6. Upgrading from 2.5 to 2.6 will not create the missing
extruder stacks for the old custom FDM printers, which causes a crash.
This fix makes sure that all custom FDM printers will have 8 extruder
stacks during the upgrade so that Cura can still start normally and
those printers will still be usable.
2017-08-18 13:06:46 +02:00
Jaime van Kessel
bab61b7f47 Merge branch 'master' of github.com:Ultimaker/Cura 2017-08-18 11:09:28 +02:00
Jaime van Kessel
1d9ac09053 No longer attempt to create monitorView if none was set 2017-08-18 11:09:02 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
Ghostkeeper
9a00c07c3d
Also upgrade variants
Variants can be customised as well, you know.
2017-08-18 09:59:51 +02:00
Jaime van Kessel
145b6825db Fixes #2284 2017-08-18 09:45:28 +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
Ghostkeeper
a44eb0152d
Repair globalPropertyProvider for per-object settings panel
Otherwise we can't find the correct limit_to_extruder property.

Contributes to issue CURA-4186.
2017-08-17 20:17:32 +02:00
Lipu Fei
b20711ef7c Remove incorrect maximum extruder count check
CURA-4188
2017-08-17 16:36:57 +02:00
Lipu Fei
16cfb768d2 Move dont show again checkbox above the buttons
CURA-4113

The Don't show again checkbox is on the same row with the buttons. In
some translations, the text for the checkbox is very long, which
overlaps with the button.
2017-08-16 16:07:02 +02:00
Lipu Fei
b9397aaa57 Check the content of definition changes container in SliceInfo
CURA-4107

Now we always create a definition changes container for a stack,
checking if the definition changes is empty in SliceInfo doesn't work.
It should check the content too.
2017-08-16 12:50:09 +02:00
Lipu Fei
b74c09dec8 Merge branch '2.7' 2017-08-16 11:51:26 +02:00
Jaime van Kessel
d5daf9ff81 Merge branch 'CURA-4146' of github.com:Ultimaker/Cura 2017-08-16 11:37:09 +02:00