3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-23 14:44:13 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 6
18800 commits 306 branches 272 tags 787 MiB
Commit graph

8170 commits

Author SHA1 Message Date
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
Lipu Fei
e8e8081215 Add quality_definition for UM2ex and UM2go 
CURA-4139

UM2ex and UM2go should share the same set of quality profiles as UM2.
 2017-08-30 14:58:07 +02:00
Lipu Fei
f426a0aa62 Add quality files for UM2 
CURA-4139

Add dedicated quality files for UM2 so they won't get profiles with
layer height higher than 0.25mm
 2017-08-30 14:56:38 +02:00
Ghostkeeper
2c7c29dc71
Merge branch 'master' into quarter_cubic_infill 2017-08-30 11:03:04 +02:00
alekseisasin
ac6f50e686 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-29 18:24:47 +02:00
alekseisasin
472b9fc779 Setting was not visible because was applied wrong settings scope 
CURA-4192
 2017-08-29 18:23:35 +02:00
Ghostkeeper
f5e0db5e2a
Add missing period 
Spotted a small mistake in the translations by accident.
 2017-08-29 17:23:17 +02:00
Ghostkeeper
f7def41df8
Enable prime tower for CPE+ 0.8 Fast Print 
The prime tower is enabled for the other two quality profiles but not for this one, so we're making this consistent (with confirmation from the Materials team).
 2017-08-29 15:27:10 +02:00
krios-fabteam
be4fa98638 removed quality duplicates 2017-08-29 11:34:21 +02:00
fieldOfView
4d0c77683c Show target hotend temperature(s) 2017-08-29 11:02:37 +02:00
krios-fabteam
56bab36869 added generic label for materials 2017-08-28 17:56:01 +02:00
Lipu Fei
0781848af5 Reduce margin size for settings in recommended and custom mode 
CURA-4148
 2017-08-28 17:35:03 +02:00
Lipu Fei
0eb63637d4 Merge branch 'master' into feature_dark_colours_icons 2017-08-28 16:54:36 +02:00
Ghostkeeper
7a8956fd0e
Merge branch '2.7' 2017-08-28 16:21:40 +02:00
Jaime van Kessel
8a0f6d969e Merge branch '2.7_stack_context' of github.com:Ultimaker/Cura into 2.7 2017-08-28 16:05:59 +02:00
Ghostkeeper
3dbf91eb18
Fix mistakenly translated replace key 
Bad translator. Baaaaaaad.

Contributes to issue CURA-3999.
 2017-08-28 15:42:12 +02:00
Ghostkeeper
1401d90bd0
Update Chinese translations for 2.7 
These are the files I got from Bothof.

Contributes to issue CURA-3999.
 2017-08-28 15:41:27 +02:00
Ghostkeeper
eeea30f2d1
Update translation templates for 2.7 
New strings get empty translations. This is generated by calling 'make i18n-update-po-zh_CN'.

Contributes to issue CURA-3999.
 2017-08-28 15:32:36 +02:00
Ghostkeeper
22b808afb3
Merge branch 'master' of https://github.com/PCDotFan/Cura into PCDotFan-master 2017-08-28 15:29:45 +02:00
Lipu Fei
68a89db863 Move star icon in profile dropdown a little to the left 
CURA-4148

The star icon in the profile dropdown box is too much to the right,
which overlaps a little with the dropdown arrow button.
 2017-08-28 11:18:26 +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
alekseisasin
ae63060d75 Merge branch 'mb-z-offset' of https://github.com/smartavionics/Cura 2017-08-28 10:43:53 +02:00
Mark Burton
8c599c4869 The seam corner setting is now available for all seam types except random. 2017-08-25 17:09:47 +01:00
Mark Burton
ea93105079 Added sharpest_corner option to z_seam_type. 2017-08-25 15:26:24 +01:00
Mark Burton
438ea142c9 Tweak z_seam_corner strings. 2017-08-25 14:10:32 +01:00
Ghostkeeper
0aa1f04b1d
Correct width of monitor icon 
Because the overlay is wider this one needs to be just as wide.

Contributes to issue CURA-4148.
 2017-08-25 14:56:39 +02:00
Ghostkeeper
3db799c661
Remove unnecessary crap from monitor icon 
All the metadata and empty tags and no-op groups and such.

Contributes to issue CURA-4148.
 2017-08-25 14:55:13 +02:00
Ghostkeeper
aa9347d7be
New icon for monitor tab 
Fresh from the press.

Contributes to issue CURA-4148.
 2017-08-25 14:53:07 +02:00
Mark Burton
d40a317681 Revert the z_seam_type options back to how they originally were and add z_seam_corner. 2017-08-25 13:47:48 +01: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
165665247f
Remove unused property valueWarning 
It is unused here. There is such a property being used by the profile selection drop-down but that one uses the valueWarning property in SidebarHeader.qml which is exactly the same.

Contributes to issue CURA-4148.
 2017-08-25 14:03:54 +02:00
Ghostkeeper
0c7fd82e22
Give icons in the top bar a different size 
Because one of the icons now needs to be rectangular. All icons in there have the same style so they all have to be resized.

Contributes to issue CURA-4148.
 2017-08-25 13:57:24 +02:00
Ghostkeeper
5be0d664f4
Remove unused colour from tab_settings icon 
This icon is recoloured so the colour doesn't matter. When there is no colour, the icon preview shows up better in my browser and my file explorer...

Contributes to issue CURA-4148.
 2017-08-25 13:51:40 +02:00
Ghostkeeper
78dbe8c56a
Remove offline icon 
We don't show an icon in that case any more.

Contributes to issue CURA-4148.
 2017-08-25 13:03:50 +02:00
Ghostkeeper
c25b94ce31
Move status icons to the middle-right side of monitor icon 
They are actually moved inside the image, rather than in code. This way the theme can still adjust the icon.

Contributes to issue CURA-4148.
 2017-08-25 13:02:51 +02:00
Mark Burton
0cc0fe93b8 Add further options to z_seam_type. 
Can now specify that the z-seam should be located in either the most concave region of the
outline, the most convex region or the most curved (concave or convex) region.
 2017-08-25 09:25:53 +01:00
Ghostkeeper
9cea356a18
Replace tabs with spaces 
As per our code style standard.
 2017-08-25 09:22:47 +02:00
Ghostkeeper
90583bd56d
Replace tabs with spaces 
And fix the alignment while we're at it.
 2017-08-25 09:22:07 +02:00
Ghostkeeper
4b4f971222
Make 'other' the default category 
This should make it a bit easier for others to create a new definition since there is less for them to 'have to know'. Previously they would be required to fill in as category Other, but now they can just leave the category out.
 2017-08-25 09:17:55 +02:00