GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-07-16 05:41:48 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,749 Commits 295 Branches 268 Tags
Commit Graph

10749 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Jaime van Kessel
d74d865ec8 Merge branch 'skin_preshrink' of github.com:Ultimaker/Cura 2017-08-23 13:34:21 +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
fieldOfView
6656cd0c36 Hide adhesion & support options if they are disabled for the current printer 2017-08-23 13:26:47 +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
Lipu Fei
5564d80950 Merge branch '2.7' 2017-08-23 13:02:05 +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
Jaime van Kessel
904682945a Decreased the value of the u_z_bias, so the plate quad is drawn again. 
CURA-4150
 2017-08-23 12:48:19 +02:00
Mark Burton
d536630501 Fix initial value for relative_extrusion. 2017-08-23 11:45:35 +01:00
Lipu Fei
7a2493dd2f Use per-object stack instead of the active extruder 
CURA-4186
 2017-08-23 12:32:20 +02:00
Mark Burton
326e0b2fbd Add relative_extrusion setting to special modes category. 
Default value is true for RepRap firmware, otherwise false.
 2017-08-23 11:28:58 +01:00
fieldOfView
32a863d9dc Find a material with the correct diameter when adding a printer 2017-08-23 11:13:36 +02:00
Jaime van Kessel
ca1f7430c1 Merge branch 'fix_add_machine_material_diameter' of https://github.com/fieldOfView/Cura 2017-08-23 11:11:45 +02:00
Mark
2d0a4d443d Switch material and print core 
CURA-4147
 2017-08-23 10:54:46 +02:00
Ghostkeeper
b58fb0d05d
Merge branch '2.7' 2017-08-23 09:23:29 +02:00
Ghostkeeper
90860c67c2
Minor tweaks suggested by fieldOfView 
See the comments in this commit: c4d23437f2
 2017-08-23 09:23:04 +02:00
alekseisasin
9363f93467 Merge pull request #2224 from fieldOfView/fix_multiextruder_menus 
Fix multiextruder menus
 2017-08-23 09:08:48 +02:00
Lipu Fei
16764f4750 Create user containers for newly created custom FDM printer extruders 
CURA-4188

The newly created extruder stacks don't have user containers, so the
user changes cannot be saved. This fix makes sure that in the upgrade,
user containers will be created.
 2017-08-22 17:37:25 +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
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