10077 Commits

Author SHA1 Message Date
Ghostkeeper
03311132f0
Merge branch 'feature_grid_lines' 2017-08-22 16:41:45 +02:00
Ghostkeeper
18b88065f4
Render build plate slightly lower than grid to prevent Z fighting
Looks much better.

Contributes to issue CURA-4150.
2017-08-22 16:40:11 +02:00
Lipu Fei
28670edf8e Align profile dropdown box correctly
CURA-4147
2017-08-22 16:11:15 +02:00
Lipu Fei
e17a88fe11 Merge branch '2.7' 2017-08-22 16:06:36 +02:00
alekseisasin
10b50244e0 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-22 14:00:41 +02:00
alekseisasin
a0b7a2d165 Merge branch 'feature_grid_lines'
CURA-4150
2017-08-22 13:59:19 +02:00
Mark
64f6cd237f Rename Print tab to Monitor
CURA-4106
2017-08-22 13:58:01 +02:00
Lipu Fei
39ab740adb Adding binding for per-object settings to update stack ID
CURA-4186

The stack ID to use for a setting in per-object settings is not updated
when it is set to limit to extruder.
2017-08-22 13:35:51 +02:00
krios-fabteam
0685df789c added head variants
changed category definition
2017-08-22 13:05:03 +02:00
Lipu Fei
812e262f39 When deserialising a material, also update the material derived from it
CURA-4204
2017-08-22 11:29:35 +02:00
Jaime van Kessel
fd6ee6ee3c Merge branch 'pirate' of github.com:Ultimaker/Cura into 2.7 2017-08-22 10:53:51 +02:00
Lipu Fei
3d75342a11 Stop the loop if any extruder is found
CURA-4188
2017-08-22 10:51:14 +02:00
Lipu Fei
72575eaf37 Rename function to _acquireNextUniqueCustomFdmPrinterExtruderStackIdIndex()
CURA-4188
2017-08-22 10:44:22 +02:00
Lipu Fei
1332489391 Add comments for upgradeMachineStack()
CURA-4188
2017-08-22 10:42:33 +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
ab0ab74fe8
Update Creality CR-10 definition
Michael found these settings to work towards better time estimate and neglegible quality differences.
2017-08-21 17:08:54 +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
25c5c5a888
Add minor grid cells for circular build plates
Same technique as the major grid cells.

Contributes to issue CURA-4150.
2017-08-21 10:24:53 +02:00
Ghostkeeper
3b93a9d309
Add grid lines for circular build plates
Some trigonometry is involved to find the correct lengths for the lines.

Contributes to issue CURA-4150.
2017-08-21 10:21:25 +02:00
Ghostkeeper
d8dd9c0d3a
More efficient and elegant grid line creation
Since the zero point is always in the centre, we can just re-use this loop to prevent code duplication and gain a minor speed increase.

Contributes to issue CURA-4150.
2017-08-21 09:44:39 +02:00
Ghostkeeper
e7c5854694
Make grid size into global variables
It doesn't need to be a preference, but it should be easy to modify in the code.

Contributes to issue CURA-4150.
2017-08-21 09:24:31 +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
fieldOfView
43c6801e58 Find a material with the correct diameter when adding a printer 2017-08-20 16:52:56 +02:00
probonopd
b9970d57b4 Make it pass desktop-file-validate, closes #1784
```
cura.desktop: error: (will be fatal in the future): value "cura-icon.png" for key "Icon" in group "Desktop Entry" is an icon name with an extension, but there should be no extension as described in the Icon Theme Specification if the value is not an absolute path
```
__Solution:__ Remove `.png`. __PLEASE NOTE__ that for this to work, cura-icon.png must be located in one of the directories in which desktops search for icons, such as `/usr/share/icons/hicolor/128x128/apps/`. Please make sure it ends up there (also in the AppImage, too.)

```
cura.desktop: error: value "application/sla;application/vnd.ms-3mfdocument;application/prs.wavefront-obj;image/bmp;image/gif;image/jpeg;image/png" for string list key "MimeType" in group "Desktop Entry" does not have a semicolon (';') as trailing character
```
__Solution:__ Add `;`

Reference:
https://travis-ci.org/AppImage/AppImageHub/builds/266072586#L538-L539
2017-08-18 20:49:25 +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