Commit graph

4362 commits

Author SHA1 Message Date
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
Ghostkeeper
42b8e87d00
Make opacity of print monitor themeable
The new dark design specifies a colour for the print monitor overlay that is darker than what would be attainable with the default 75% opacity. So I'm making it 100% opacity (but still with a fade, so we need the opacity) and let the theme specify what opacity it wants.

Contributes to issue CURA-4148.
2017-08-21 10:50:36 +02:00
Ghostkeeper
d793dc68ea
Add Creality CR-10
This definition was provided to me via e-mail. The initial data was badly formatted, so I corrected it and verified back with Michael Wildermuth that the new profile worked. Apparently it works, so thank you Michael.
2017-08-21 00:23:36 +02:00
Lipu Fei
24d3f8aab1 Put remove some zags settings as child settings
CURA-3957
2017-08-18 14:23:09 +02:00
Ghostkeeper
9241cfa5c6
Make tooltip backgrounds dark as well
Looks very professional.

Contributes to issue CURA-3948.
2017-08-18 14:19:53 +02:00
Lipu Fei
662e3b9cd1 Fix coding style
CURA-4147
2017-08-18 13:38:16 +02:00
Ghostkeeper
64753f8c8b
Merge branch '2.7' 2017-08-18 10:42:14 +02:00
alekseisasin
7978b0efe9 Move quality profile, material and print core to it's new location
CURA-4147
2017-08-18 09:15:17 +02:00
Lipu Fei
16cfb768d2 Move dont show again checkbox above the buttons
CURA-4113

The Don't show again checkbox is on the same row with the buttons. In
some translations, the text for the checkbox is very long, which
overlaps with the button.
2017-08-16 16:07:02 +02:00
Lipu Fei
b74c09dec8 Merge branch '2.7' 2017-08-16 11:51:26 +02:00
Jaime van Kessel
d5daf9ff81 Merge branch 'CURA-4146' of github.com:Ultimaker/Cura 2017-08-16 11:37:09 +02:00
Ghostkeeper
abcec2157e
Use the lowest of the layer heights for initial layer height
This was discussed with the materials team. A layer height of 0.4mm for a 0.4mm nozzle could give problems. This would be even worse with a 0.25mm nozzle.
2017-08-16 11:29:13 +02:00
Ghostkeeper
19bab721ef
Change language metadata field to contain language codes
According to the standard specified by GNU: https://www.gnu.org/software/gettext/manual/html_node/Header-Entry.html

Contributes to issue CURA-4113.
2017-08-15 17:51:47 +02:00
Lipu Fei
3a22d1916f Go back to "Recommended/Custom" tabs
CURA-4146
2017-08-15 17:42:34 +02:00
Lipu Fei
1c747a962f Merge remote-tracking branch 'CURA-4032' 2017-08-15 16:11:44 +02:00
Ghostkeeper
ddf35826dc
Merge branch '2.7' 2017-08-15 15:32:39 +02:00
Ghostkeeper
17a615d30c
Don't translate HTML tags and variable names
It says so in the context of the build dimensions translation. Not yet in the context of the HTML tags with <filename> and such, but it will do that for the next translation round properly.

Contributes to issue CURA-4113.
2017-08-15 15:32:23 +02:00
Ghostkeeper
31757f4ce1
Merge branch '2.7' of https://github.com/Patola/Cura into Patola-2.7 2017-08-15 15:29:24 +02:00
alekseisasin
3116ff829c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 15:04:18 +02:00
alekseisasin
7ad7fb0a3c Merge pull request #2200 from fieldOfView/fix_monitoritem_size
Adapt camera image to available space
2017-08-15 14:45:34 +02:00
Ghostkeeper
72bf74e513
Merge branch '2.7' 2017-08-15 14:16:08 +02:00
Ghostkeeper
3110349f5e
Fix misunderstood translation
Literally it should've been 'weergavenaam', but I'm now opting for a less literal translation because weergavenaam sounds so weird.

Contributes to issue CURA-4113.
2017-08-15 14:15:51 +02:00
Cláudio Sampaio (Patola)
0449e4e63a Updated brazilian portuguese translation 2017-08-15 09:06:50 -03:00
Ghostkeeper
59058ad77f
Merge branch '2.7' 2017-08-15 11:24:00 +02:00
Ghostkeeper
1f778e8d2f
Fix translated replacement strings
Bad translators! Bad! It even says so in the context!

Contributes to issue CURA-4113.
2017-08-15 11:13:48 +02:00
Ghostkeeper
8f46733dec
Correct whitespace of fatal exception text
It's not salient for our translation files really, since it is displayed in QML in the end which removes those. It is salient for gettext though, which gives an error when one message ends in a newline and the other doesn't.

Contributes to issue CURA-4113.
2017-08-15 11:05:50 +02:00
Ghostkeeper
cbc60c7689
Minor fixes for German translations
Contributes to issue CURA-4113.
2017-08-15 09:58:42 +02:00
Ghostkeeper
262691c1ff
Update German translations
These are the translations from Bothof. They look mostly correct.

Contributes to issue CURA-4113.
2017-08-15 09:56:57 +02:00
Ghostkeeper
f6c84e054b
Fix HTML tags
They shouldn't be translated. Bad translator! BAD!

Contributes to issue CURA-4113.
2017-08-15 09:28:42 +02:00
Ghostkeeper
5ddbbd91db
Merge branch '2.7' 2017-08-14 17:30:45 +02:00
Ghostkeeper
4f471ea1a4
Update Spanish translations
These are the updates from Bothof. I found some older mistakes here, which I'll solve next.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
1e1e6386fc
Update Finnish translation
These are the translation files from Bothof. They are excellent as far as I could detect.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
22d7312265
Minor fixes to French translations
These must've been in there for a while...

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
cd8b485e98
Update French translations
These are the new translations from Bothof. I've found some mistakes in cura.po which I'll fix in the next commit to make it clear which changes are from me.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
50508baad7
Minor interpunction fixes for Italian translation
The one with the href attribute is pretty serious.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
7c86e476c8
Update Italian translations
These look almost correct. Just one mistake with an HTML tag.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
45673a3586
Fixes to Dutch translations
Some consistency fixes and several places where they misunderstood the meaning of a text.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
92f5a4c392
Update Dutch translations
There's several mistakes in these translations. I'm fixing those in the next commit to keep it separate.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
673e281e4d
Fix XML tags in Turkish translation
Bad, BAD translator!

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
7682ffad08
Update Turkish translations
Some of these are plain wrong. We'll fix those in the next commit.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Ghostkeeper
fa49c7a939
Update Japanese translations
These are the new texts for 2.7.

Contributes to issue CURA-4113.
2017-08-14 17:30:14 +02:00
Tim Kuipers
1d5cc92e47 Merge branch 'remove_some_zags' 2017-08-14 16:11:44 +02:00
Tim Kuipers
317de1c75d update support_skip_zag_per_mm default value (CURA-3957) 2017-08-14 15:58:03 +02:00
Tim Kuipers
c2ac731324 update support_skip_zag_per_mm description and default value (CURA-3957) 2017-08-14 15:49:16 +02:00
Lipu Fei
67f820af04 Pass tray_icon_name to QtApplication
CURA-4032
2017-08-14 15:26:17 +02:00
alekseisasin
bc4b1d9c4d Merge remote-tracking branch 'origin/2.7' 2017-08-14 15:11:33 +02:00
alekseisasin
e88f74fe5a Merge branch 'master' of github.com:Ultimaker/cura 2017-08-14 15:07:59 +02:00
alekseisasin
160f21cdac Merge branch 'feature_move_printing_time' 2017-08-14 13:55:18 +02:00
Ghostkeeper
7ab6a551c1
Clarify that XML material tags don't get translated
Some of the translators got this wrong last time. Let's see how good they read this next time...

Contributes to issue CURA-4113.
2017-08-14 13:54:11 +02:00