GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-30 01:55:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,077 Commits 294 Branches 267 Tags
Commit Graph

10077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 27967a1531009b52882f3cdd6c094c8e7002b0d3.
 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
Thomas Karl Pietrowski
2b78e8abde Install cura icon on Linux 
This commit is needed for b9970d57b4
Never tested it, but believing the author of the commit that this change will work.
 2017-08-30 19:32:38 +02:00
krios-fabteam
b4ae52b4c3 added 2 more variants 
improved quality profiles
 2017-08-30 17:17:39 +02:00
alekseisasin
01c7b5307f Merge branch 'feature_license_for_plugins' 
CURA-4222
 2017-08-30 17:11:27 +02:00
alekseisasin
088092c7bc Added min and max dialog size 
CURA-4222
 2017-08-30 17:07:43 +02:00
Ghostkeeper
831a91afff
Add test for upgrading preference file 
Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +02:00
Ghostkeeper
d929359d77
Implement version upgrade 2.7 to 3.0 
The theme 'cura' was renamed to 'cura-light', so that needs to be updated in the user's preferences.

Contributes to issue CURA-4148.
 2017-08-30 16:08:50 +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
b677a81d9b
Change default theme 
This new field is now read by Uranium that indicates the default theme to load first before there are any changed preferences.

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
053fdd679d Don't send duplicated materials to printer 
CURA-4199
 2017-08-30 15:52:31 +02:00
Jaime van Kessel
8830fa7e10 Merge branch '2.7' of github.com:Ultimaker/Cura 2017-08-30 15:12:56 +02:00
Jaime van Kessel
3b2c528595 If no licence text is set, use empty string 
It doesn't really matter that much, but QT complaining about it annoyed me.
CURA-4222
 2017-08-30 15:07:58 +02:00
Jaime van Kessel
6d40882bdc Ensure that installing files works on non Windows os'es as well 
CURA-4222
 2017-08-30 15:06:08 +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
23544ad1fe Only fall back to use fdmprinter when the quality profiles for the current machine cannot be found 
CURA-4139

UM2 family don't have machine material, but they do have their dedicated
profiles. When Cura searches for quality profiles, it should only fall
back to use "fdmprinter" as the definition if no quality profile can be
found for the current machine.
 2017-08-30 14:59:12 +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
Lipu Fei
679c7dcfda Let user accept/decline a plugin license if present 
CURA-4222

If a downloaded plugin contains a license file, a dialog which contains
the license information will pop up. The user has to accept the license
before he/she can install the plugin.

If a plugin doesn't have a license file, after it is downloaded, it will
be installed directly just like before.
 2017-08-30 14:09:51 +02:00
Ghostkeeper
2c7c29dc71
Merge branch 'master' into quarter_cubic_infill 2017-08-30 11:03:04 +02:00
Ghostkeeper
611ed083a0
Merge branch 'probonopd-patch-5' 2017-08-30 10:27:50 +02:00
Ghostkeeper
aed0c59cda
Merge branch 'patch-5' of https://github.com/probonopd/Cura into probonopd-patch-5 2017-08-30 10:23:44 +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).
2.7.0 		2017-08-29 15:27:10 +02:00
krios-fabteam
be4fa98638 removed quality duplicates 2017-08-29 11:34:21 +02:00
fieldOfView
85b20ab16b Get UM3 target hotend temperatures 2017-08-29 11:05:36 +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
a29c9307de
Merge branch '2.7' 2017-08-28 16:46:42 +02:00
Ghostkeeper
08f69d168d
Add Chinese language entry to change log 
Contributes to issue CURA-4000.
 2017-08-28 16:46:26 +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
alekseisasin
788e42d294 Merge branch 'master' of github.com:Ultimaker/cura 2017-08-28 15:38:48 +02:00