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

5457 commits

Author SHA1 Message Date
A.Sasin
16bd4430e4 Added a pyQtProperty to validate user settings (Might be wrong approach) 
CURA-4333
 2017-10-12 21:23:17 +02:00
Jaime van Kessel
a7e1017aa2 Added some missing widths en heights 
GammaRay complained about some objects not having a size
 2017-10-12 19:14:22 +02:00
Ghostkeeper
e4a53da763
Merge branch '3.0' 
Contributes to issue CL-508.
 2017-10-12 14:56:30 +02:00
Lipu Fei
39891551e3 Fix custom profile handling for quality slider 
CURA-4333
 2017-10-12 12:42:18 +02:00
A.Sasin
8d20f62dc9 Changed back to previous commit 2017-10-12 11:57:02 +02:00
A.Sasin
a3b8642a4e Added text.elideRight on SidebarSimple 2017-10-12 11:45:25 +02:00
A.Sasin
372e86e39b Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-12 11:42:24 +02:00
A.Sasin
a7e0d5147e Merge branch 'master' of github.com:Ultimaker/cura 2017-10-12 10:40:50 +02:00
Lipu Fei
0383cea816 Fix code style 
CURA-4333
 2017-10-12 10:31:13 +02:00
Ghostkeeper
ca28748bc3
Add missing translations from broken string freeze 
These texts were added later after the strings were frozen. Bad! But this is the German translation for it, retrieved from a secondary speaker here at the office.

Contributes to issue CURA-4341.
 2017-10-12 10:26:38 +02:00
Lipu Fei
b59b245bff Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-12 10:20:35 +02:00
Ghostkeeper
497327ba73
Merge branch '3.0' 2017-10-12 09:29:09 +02:00
Ghostkeeper
f94954e9ca
Improved end g-code 
This one removes the hair at the end of this print a bit better.

Contributes to issue EM-1859.
 2017-10-12 09:28:50 +02:00
Tim Kuipers
2c73b017a4 trihex infill 2017-10-12 09:26:45 +02:00
A.Sasin
a6a58c8c84 Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-12 09:22:52 +02:00
A.Sasin
b318dc7087 Added notification icon in recomended mode. The notification icon is only 
active if one of custom settings is changed
CURA-4333
 2017-10-12 08:57:26 +02:00
Lipu Fei
052ea7d90a Force use and update the job name with the loaded project file 
CURA-4348

- If no project is loaded beforehand and then a model file is loaded,
  the job name should be determined with the current machine name and
  the first loaded model name.
- If a project is loaded, the job name should be the same as the project
  name, and it should not change until another project is loaded.
 2017-10-12 07:59:43 +02:00
Jaime van Kessel
799d1a5b0c Updated setting items & sidebar to qtQuick controls 2.0 2017-10-11 21:02:27 +02:00
Mark
3a7fbdb173 Changed parseInt to Math.floor 2017-10-11 17:06:13 +02:00
Mark
eaa7b75f0e Changed parseInt to Math.floor 2017-10-11 16:47:40 +02:00
Lipu Fei
a835ffa54a Merge pull request #2561 from Ultimaker/FixGridShaderForOlderOpenGLVersions 
Fix the OpenGL shader for older (legacy?) OpenGL.
 2017-10-11 15:03:12 +02:00
ChrisTerBeke
551adc058f Merge branch '3.0' 2017-10-11 14:54:30 +02:00
ChrisTerBeke
331574eec0 Merge branch '3.0' of https://github.com/Ultimaker/Cura into 3.0 2017-10-11 14:53:59 +02:00
Mark
00205996da Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 14:53:46 +02:00
Ghostkeeper
be268a88dc
Fix order of commented-out translations 
Apparently it's not allowed to put a comment halfway through a translation item.

Contributes to issue CURA-4341.
 2017-10-11 14:53:18 +02:00
ChrisTerBeke
3db5787d5d Code cleanup for infill slider value binding - CURA-4438 2017-10-11 14:41:13 +02:00
Ghostkeeper
e4580b6cd2
Delete unused cura.po file 
To crevent ponfusion.

Contributes to issue CURA-4341.
 2017-10-11 14:39:50 +02:00
Ghostkeeper
92e931e02e
Add translations out-of-band for string freeze violations 
These texts were added after the string freeze. Bad! We've now translated half of these with a native speaker in the office, and the other half via Google and some clever copying from existing translations.

Contributes to issue CURA-4341.
 2017-10-11 14:35:05 +02:00
ChrisTerBeke
e97bdc526b Merge branch '3.0' 2017-10-11 14:13:57 +02:00
Lipu Fei
bb476752a4 Fix infill density binding in Recommended mode 
CURA-4438

Infill density in Recommended mode should be bound to the correct stack
when the infill extruder is/is not set to a specific extruder.
 2017-10-11 14:05:56 +02:00
ChrisTerBeke
23d0201f6b Merge branch 'fix_garbled_fonts_part_2' 2017-10-11 13:41:33 +02:00
Lipu Fei
4927a639cd Always update the job name with the loaded project 
CURA-4348
 2017-10-11 12:49:22 +02:00
Mark
d4a8dbdee7 Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 12:48:42 +02:00
Buco
6dc3b29047 Add Builder Premium 
Add definitions for the Builder Premium Small, Medium and Large printers.
 2017-10-11 11:51:39 +02:00
Ghostkeeper
cadfa14fb4
Fix mistake in verb vs. noun of 'Print' 
The translator misunderstood this. It's not 'to print the details', but 'details of the print'.

Contributes to issue CURA-4341.
 2017-10-11 11:22:08 +02:00
Ghostkeeper
69f6a7de73
Fix mistaken negation 
The translator read this one wrong.

Contributes to issue CURA-4341.
 2017-10-11 11:16:59 +02:00
Ghostkeeper
d3853815ea
Add missing strings for broken string freeze 
Bad. Bad!

Contributes to issue CURA-4341.
 2017-10-11 11:10:42 +02:00
ChrisTerBeke
30c9ccfb7f Merge branch '3.0' 2017-10-10 16:31:29 +02:00
A.Sasin
5b52ad441b Merge branch '3.0' of github.com:Ultimaker/cura into 3.0 2017-10-10 15:51:19 +02:00
ChrisTerBeke
fc1282773a Merge branch 'thopiekar-remove-cura-under-cura-logo' 2017-10-10 15:43:21 +02:00
Lipu Fei
c7ccc3c1b8 Fix long text display in mode toggle buttons 
CURA-4341
 2017-10-10 14:47:13 +02:00
Ghostkeeper
d962ffb8d8
Merge branch '3.0' 2017-10-10 14:36:38 +02:00
Lipu Fei
444204f6a1 Fix "Print Speed" text width for some translations 
CURA-4341
 2017-10-10 14:35:07 +02:00
Lipu Fei
0e45ec1197 Fix auto-adjust for "Print Setup" text 
CURA-4341
 2017-10-10 14:26:55 +02:00
Ghostkeeper
b86f98c444
Remove mistakenly translated setting labels 
Not all labels were translated so it looked very inconsistent.
Using a bunch of fun regular expressions, I filtered out all translations that were actually translated and left them in but commented out. There were also a lot that were exactly the same as the original English, so I've just emptied those translations.

Contributes to issue CURA-4341.
 2017-10-10 14:19:46 +02:00
Ghostkeeper
a74dfafdd1
Remove unused .po file 
The Korean translation only translates the setting descriptions, so there is no data here. Let's remove it to avoid confusion.
 2017-10-10 14:16:52 +02:00
Ghostkeeper
ab2e761423
Remove unused .po file 
The Japanese translation only translates the setting descriptions, so there is no data here. Let's remove it to avoid confusion.
 2017-10-10 14:16:46 +02:00
A.Sasin
19e9336214 Revert "Adjust column width for Materials "Print Settings" page" 
This reverts commit 7b6faf0030.
 2017-10-10 09:43:43 +02:00
ChrisTerBeke
641b3c21f7 fix merge conflicts 2017-10-10 09:21:31 +02:00
Lipu Fei
7b6faf0030 Adjust column width for Materials "Print Settings" page 
CURA-4428
 2017-10-10 08:03:08 +02:00