3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-24 23:23:57 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
10085 commits 307 branches 272 tags 787 MiB
Commit graph

4553 commits

Author SHA1 Message Date
Lipu Fei
e15a96263d Update extruder button styles 
CURA-4211
 2017-09-06 12:00:53 +02:00
Jaime van Kessel
bcd8e2ca67 Merge branch 'feature_extruder_buttons' of github.com:Ultimaker/Cura 2017-09-05 09:57:14 +02:00
Lipu Fei
4249274af0 Move license window size to light theme 
CURA-4279

The light theme is now the default and it's a base theme, so the window
size needs to be there.
 2017-09-04 17:25:58 +02:00
Jaime van Kessel
7d12ebe860 Merge pull request #2368 from smartavionics/mb-fix-layer-start-min-values 
Now layer start X/Y can be < 0 when machine centre is zero.
 2017-09-04 16:52:49 +02:00
Mark
e3f319a644 less margin when support extruder pops up 
CURA-4148
 2017-09-04 16:23:19 +02:00
Jaime van Kessel
dd7ea80b68 Also added canPreheatBed option 2017-09-04 15:33:04 +02:00
Jaime van Kessel
8683275d4f Added canAbort & canPause feature to PrinterOutputDevice 2017-09-04 15:16:55 +02:00
Lipu Fei
1b66eaea22 Move extruder button sizes to cura-light theme 
CURA-4211
 2017-09-04 12:14:18 +02:00
Lipu Fei
8e774dede4 Change extruder combobox style for simple mode 
CURA-4211
 2017-09-04 08:42:55 +02:00
Lipu Fei
0025369762 Remove old extruder material icons 
CURA-4211
 2017-09-04 08:30:59 +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
Mark
d18d9223a5 refix the alignmet of the support and adhesion chackboxes 
CURA-4148
 2017-09-03 08:18:12 +02:00
Mark Burton
ab4da4ab36 Now layer start X/Y can be < 0 when machine centre is zero. 2017-09-02 08:40:01 +01:00
alekseisasin
24c9dc9bee Merge branch 'feature_light_colours_icons' 
CURA-4148
 2017-09-01 19:25:29 +02:00
alekseisasin
a288668bae Adjusted color for the extruder counter number in left toolbox and added 
extra margin-right in sidebar_category
CURA-4148
 2017-09-01 17:45:50 +02:00
Jaime van Kessel
98795d8953 Added missing not supported profiles for PP 
CURA-3977
 2017-09-01 14:36:19 +02:00
Jaime van Kessel
2b54d75453 Merge branch 'mb-more-z-seam-options' of https://github.com/smartavionics/Cura 2017-09-01 13:22:13 +02:00
Jaime van Kessel
9ec7ef8dba Made print spec invisible when monitoring print 2017-09-01 13:07:00 +02:00
Jaime van Kessel
a6e90270cf Updated margins so low resolution screens can actually have some settings visible 2017-09-01 12:05:20 +02:00
Lipu Fei
ceccca8244 Reduce the width of the license window 
CURA-4222
 2017-09-01 10:18:27 +02:00
Lipu Fei
aad628a46f Change to new design for extruder number settings 
CURA-4211
 2017-08-31 17:49:24 +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
7de9ccefaa Change extruder button on the toolbar side 
CURA-4211

Change the extruder button on the toolbar side according to the new
design.
 2017-08-31 17:49:23 +02:00
Lipu Fei
b174d04a9b Add SVG image for extruder button 
CURA-4211
 2017-08-31 17:49:22 +02:00
Ghostkeeper
062957c249
Hide the header if it would be empty 
It would be empty if the machine is single extrusion and has no materials or variants.

Contributes to issue CURA-4241.
 2017-08-31 15:51:51 +02:00
Ghostkeeper
0fc40d571a
Only make separator visible if the element above and below it are visible 
The behaviour should be the same, if it was implemented correctly previously.

Contributes to issue CURA-4241.
 2017-08-31 15:47:29 +02:00
alekseisasin
e38ec9d5e8 Renamed "Hotend" to "Extruder" 
CURA-4256
 2017-08-31 14:19:01 +02:00
alekseisasin
7c637029b6 Merge pull request #2334 from fieldOfView/feature_target_hotend_temperature 
Show target hotend temperatures
 2017-08-31 13:46:55 +02:00
alekseisasin
37eb74e99e Fixed quality file names 
CURA-4128
 2017-08-31 13:16:08 +02:00
alekseisasin
d23e9cafe4 Merge pull request #2162 from FABtotum/master 
FABtotum Personal Fabricator
 2017-08-31 12:56:24 +02:00
Ghostkeeper
18a07b6eee
Change support Z offset to 2*layer_height 
The materials team found this to work better.
 2017-08-31 11:49:24 +02:00
Ghostkeeper
582a17c6af
Sort all UM2+ profiles 
This will make it easier to modify these profiles in the future.
 2017-08-31 11:48:41 +02:00
Ghostkeeper
ed7e204cc0
Fix colour of time estimates text 
I'd like it to be the same colour as the text underneath it, so subtext it is.

Contributes to issue CURA-4148.
 2017-08-31 10:21:28 +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
Mark Burton
0efa2ac168 Tweak z_seam_corner option strings and the descriptive blurb. 2017-08-30 20:14:35 +01:00
Mark Burton
092bc2f916 Revert "Tweak z_seam_corner option strings and the descriptive blurb." 
This reverts commit 27967a1531.
 2017-08-30 19:20:49 +01:00
Mark Burton
27967a1531 Tweak z_seam_corner option strings and the descriptive blurb. 2017-08-30 19:19:16 +01:00
krios-fabteam
b4ae52b4c3 added 2 more variants 
improved quality profiles
 2017-08-30 17:17:39 +02:00
Ghostkeeper
5b36869b32
Update background colour of status icons 
This outline needs to be the same colour as the background of the top bar.

Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Ghostkeeper
99cae1469e
Copy status icons to dark theme 
We want the dark theme to use these icons, but we want to update these icons for the light theme so I'm back-upping the icons for the dark theme.

Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Ghostkeeper
a60cf07844
Use black logo for light theme 
It's black on white instead of white on black.

Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Ghostkeeper
c0f7d6aa19
Copy Cura logo from Light theme 
We're going to keep this dark theme with the white Cura logo but modify the Light themed one to have a black logo.

Contributes to issue CURA-4148.
 2017-08-30 16:08:49 +02:00
Ghostkeeper
d4e5e10825
Restore vertical margins 
We weren't allowed to change that yet.

Contributes to issue CURA-4148.
 2017-08-30 16:08:49 +02:00
Ghostkeeper
f301464987
Update missing colours 
And colours that have to change because the behaviour was changed (such as opacities now being themeable.

Contributes to issue CURA-4148.
 2017-08-30 16:08:49 +02:00
Ghostkeeper
e619c11e01
New base theme: Cura-light 
There is a new theme now, Cura Light, based on the original colours of Cura 15.6 through 2.7. It is now also the base of the themes. It will soon be made the temporary default until the UX team can come up with something better for the dark theme.

Contributes to issue CURA-4148.
 2017-08-30 16:08:42 +02:00
Jaime van Kessel
8830fa7e10 Merge branch '2.7' of github.com:Ultimaker/Cura 2017-08-30 15:12:56 +02:00
Ghostkeeper
6f77cfc763
Always show plain monitor icon, never with_status 
The status icons are just overlaid on top of the monitor icon.
No need for any specialised icon with a background or anything.

Contributes to issue CURA-4148.
 2017-08-30 15:02:43 +02:00