10057 Commits

Author SHA1 Message Date
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
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
alekseisasin
6c280fff9a Merge pull request #2271 from Ultimaker/thopiekar-plugin-browser-send-more-info
PluginBrowser: Send also OS and architecture
2017-08-28 15:30:49 +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
b84500f742 Import Application instead of inline import CuraApplication
CURA-4186
2017-08-28 14:35:36 +02:00
Lipu Fei
37414e7bc7 Fix code style: double quotes instead of single quotes
CURA-4186
2017-08-28 14:34:53 +02:00
alekseisasin
977911169e Merge branch 'master' of github.com:Ultimaker/cura 2017-08-28 11:23:43 +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
fieldOfView
61442e512f Fix setting the Gantry height setting in Machine Settings 2017-08-28 10:13:06 +02:00
fieldOfView
2ac67a7d34 Fix setting the Gantry height setting in Machine Settings 2017-08-27 22:04:46 +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