GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-04 11:14:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,882 Commits 295 Branches 268 Tags
Commit Graph

4978 Commits

Author SHA1 Message Date
Lipu Fei
946b8ae92d Remove executable bit for non-executable files 2017-10-19 10:28:57 +02:00
Lipu Fei
475f6223d4 Remove executable bit for json files 2017-10-19 10:24:38 +02:00
ChrisTerBeke
3ddb277477 Remove double sidebar header item, fixes #2605 2017-10-18 16:01:14 +02:00
ChrisTerBeke
b2dbefc823 Update helper text for custom changes in recommended settings - CURA-4333 2017-10-18 15:44:02 +02:00
Ghostkeeper
e897431c95
Fix default quality level for Creality CR-10 printers 
Instead of having a default layer height of 0.2mm, we change the default quality profile to be the one with a layer height of 0.2mm. This fixes up the quality slider.
 2017-10-18 13:03:33 +02:00
ChrisTerBeke
276232dae5 Merge pull request #2613 from Ultimaker/CURA-4333_Notification_icon_for_recommended_mode 
Cura 4333 notification icon for recommended mode
 2017-10-17 13:05:45 +02:00
Lipu Fei
38b9df80f3 Merge remote-tracking branch 'upstream/3.0' 2017-10-16 14:54:40 +02:00
Lipu Fei
fae65d7b83 Minor fixes for customized profile in simple mode 
CURA-4333

- Update comments
- Disable the quality slider when there is a customized profile
 2017-10-16 13:26:28 +02:00
Lipu Fei
9b8dc9bf55 Move simple-mode settings customization check into a separate file 
CURA-4333

Simple-mode is a special mode so it makes more sense to put those code
in a separate file instead of in the more generic MachineManager.
 2017-10-16 13:18:11 +02:00
Lipu Fei
e1234a09aa Add the missing parseInt()s back 
CURA-4333
 2017-10-16 11:42:13 +02:00
Lipu Fei
94a624e105 Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-16 11:37:55 +02:00
Ghostkeeper
a10390dbf1
Fix ANOTHER broken string freeze with plugin browser menu item 
This is annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:01 +02:00
Ghostkeeper
fb5aa97641
Forgot ellipses 
Contributes to issue CURA-4341.
 2017-10-16 11:01:01 +02:00
Ghostkeeper
5a221a31d9
Fix another broken string freeze with plugin browser menu item 
This is getting annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:00 +02:00
Ghostkeeper
639f22a986
Fix broken string freeze with plugin browser menu item 
This is getting annoying.

Contributes to issue CURA-4341.
 2017-10-16 11:01:00 +02:00
fieldOfView
d4e83ceba8 Fix one more fractional pixel offset affecting text placement 2017-10-16 10:39:02 +02:00
fieldOfView
464cf139a8 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-16 10:38:51 +02:00
ChrisTerBeke
5c0488c182 Merge pull request #2603 from fieldOfView/fix_textinput_rendertype 
Change renderType for TextInput elements
 2017-10-16 10:33:05 +02:00
Jaime van Kessel
c9ba269084 Merge branch 'master' of github.com:Ultimaker/Cura 2017-10-16 09:42:43 +02:00
fieldOfView
f9ca353f6a Fix one more fractional pixel offset affecting text placement 2017-10-14 11:49:27 +02:00
fieldOfView
29729d2a23 Change renderType for TextInput elements 
Unlike Label elements, which are defined to use Text.NativeRendering, TextInput uses Qt text rendering by default. This can lead to differences in font rendering between input fields and other texts.
 2017-10-14 11:43:18 +02:00
A.Sasin
7f5aed7ead User pyqtProperty instead of puqtSlot 
CURA-4333
 2017-10-13 16:34:49 +02:00
Mark
c2515ca7a9 Merge branch '3.0' 2017-10-13 16:21:54 +02:00
Mark
73f6427a88 Change mainwindow name to Ultimaker Cura 2017-10-13 16:21:23 +02:00
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
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
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