GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 01:04:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
10,984 Commits 289 Branches 260 Tags
Commit Graph

1949 Commits

Author SHA1 Message Date
Lipu Fei
67c11b8cdf
Fix code style 
CURA-4503
 2017-10-31 09:24:32 +01:00
Mark
334283e893 Found some more margins that wouldnt be fixed numbers and made the code more consistent 2017-10-27 14:12:35 +02:00
Mark
6c04a8be5d same font for checkbox label and some layout anchors 2017-10-27 13:48:55 +02:00
Diego Prado Gesto
92ac7c5a15 Merge branch 'CURA-4451_not_support_container' 2017-10-26 16:55:17 +02:00
fieldOfView
fff9330949 Merge branch 'master' into fix_is_clustersize 
# Conflicts:
#	plugins/UM3NetworkPrinting/UM3InfoComponents.qml
#	resources/qml/Menus/MaterialMenu.qml
#	resources/qml/Menus/NozzleMenu.qml
 2017-10-26 11:09:13 +02:00
ChrisTerBeke
b1a4c3488f Merge branch 'master' into CURA-4451_not_support_container 2017-10-26 09:48:52 +02:00
Chris ter Beke
b95ba24530 Remove some changes, debugging - CURA-4451 
WIP - CURA-4451

correctly show not supported when any of the extruders has a not supported profile - CURA-4451

Clean up and add comments - CURA-4451
 2017-10-26 09:23:27 +02:00
Lipu Fei
e4fec1f63d Move SaveButton downwards 
CURA-4490

Move SaveButton downwards so it doesn't overlay with the estimated print
time in some language.
 2017-10-25 16:35:38 +02:00
Diego Prado Gesto
87ba4056ee CURA-4485 Minor changes 2017-10-25 13:55:30 +02:00
fieldOfView
ff847aa329 Fix qml error when there is no connected printer 
Also fixes code style
 2017-10-25 11:52:43 +02:00
Diego Prado Gesto
0eedfa5c18 CURA-4485 Disabling automatic material and variant when connecting to a 
printer within a cluster of more than 1 printer.
 2017-10-24 15:45:20 +02:00
ChrisTerBeke
b50f027c83 Add not supported role to profiles model 2017-10-24 10:25:53 +02:00
ChrisTerBeke
35684e0aa4 Move profiles dropdown text generator to separate method 2017-10-24 09:57:48 +02:00
ChrisTerBeke
3794ae16ae Dont show layer height text in profiles drop down when there is not layer height set - CURA-4451 2017-10-23 17:41:58 +02:00
ChrisTerBeke
ff732720ca Set quality slider active index to -1 for user created profile, fix for CURA-4466 2017-10-23 12:45:07 +02:00
Diego Prado Gesto
eb0b08a813 CURA-4470 Hide quality slider handle when quality profile doesn't exist 2017-10-22 18:35:05 +02:00
Diego Prado Gesto
d2d28fbdfb CURA-4470 Fix quality slider not selecting correct quality profile 
Compare selected quality by quality_type instead of id when loading a
project file from older versions of Cura.
 2017-10-19 20:49:11 +02:00
ChrisTerBeke
30281f17f3 Add simple mode settings flag for user created profile - CURA-4466 2017-10-19 17:03:31 +02:00
Ghostkeeper
5a125aa514
Rename printCoreRow to variantRow 
Because on only one of our printers it's actually a print core. Internally we've always called it the variant.
 2017-10-19 13:38:08 +02:00
Lipu Fei
946b8ae92d Remove executable bit for non-executable files 2017-10-19 10:28:57 +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
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
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
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
Lipu Fei
b59b245bff Merge branch 'master' into CURA-4333_Notification_icon_for_recommended_mode 2017-10-12 10:20:35 +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
Mark
00205996da Change Text to Label and cast all sizes to int 
CURA-4437
 2017-10-11 14:53:46 +02:00
ChrisTerBeke
3db5787d5d Code cleanup for infill slider value binding - CURA-4438 2017-10-11 14:41:13 +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