GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-09 15:29:00 +08:00
Code Issues Packages Projects Releases Wiki Activity
18,863 Commits 290 Branches 260 Tags
Commit Graph

3647 Commits

Author SHA1 Message Date
ChrisTerBeke
08ab28a23a Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:41:52 +01:00
Jaime van Kessel
ef6f666c3e Remove duplicate alias definition 
Yay. Merges.
 2018-12-14 16:41:07 +01:00
ChrisTerBeke
0bbd77e0f0 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:34:52 +01:00
Ian Paschal
38ca23a22f
Merge pull request #4997 from Ultimaker/prevent_monitor_stage_overlap 
Quick fix to prevent monitor stage from overlapping header
 2018-12-14 16:29:39 +01:00
Ghostkeeper
78a5f95c43
Merge branch 'CURA-5876_fixes' into 4.0 2018-12-14 16:28:04 +01:00
Ian Paschal
74af11d609 Anchor loader to stage menu vertical center 2018-12-14 16:20:08 +01:00
Aleksei S
9146a775a4 After resetting the custom settings the quality slider did not update selected value 
CURA-6028
 2018-12-14 16:17:05 +01:00
Ian Paschal
ffccbcea2f Anchor to bottom of header background 2018-12-14 16:13:49 +01:00
ChrisTerBeke
2772b3bcbd Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 16:10:20 +01:00
Ghostkeeper
3a74511d23
Remove padding from views selector 
This padding made it break the height of the item for some reason. I guess that is a Qt bug.
In any case, the padding shouldn't be there either since the lining is on the inside of the child buttons so the padding only causes a gap to appear on the left and right sides, which looks weird.

Contributes to issue CURA-6029.
 2018-12-14 15:02:14 +01:00
Jaime van Kessel
b70a4ae0a2 Merge branch 'CURA-6015_fix_osx_crash' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:35:37 +01:00
Jaime van Kessel
c4a0f19d56 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-14 13:23:43 +01:00
Jaime van Kessel
d379f94775 Make the dark theme a bit more readable 2018-12-14 13:23:28 +01:00
Ghostkeeper
a010823a4e
Fix warning when active stage is not yet instantiated 
Edit: Originally this was more or less the same fix as what Diego just did at the same time, which caused a merge conflict, but I think my solution is more elegant than the ternary operator that was originally there so I'm keeping mine.
 2018-12-14 13:22:32 +01:00
Ghostkeeper
8a4a1c9d49
Don't let print info take space if invisible 
This way there is a little bit more space for the text 'No time estimation available', which was previously abbreviated to 'No time estimation availa...'.
 2018-12-14 13:21:00 +01:00
ChrisTerBeke
53eae3ee92 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-14 12:04:31 +01:00
Jaime van Kessel
c3aca8907c Fix extruder number not being visible in dark theme 2018-12-14 12:02:52 +01:00
Jaime van Kessel
6a3ac99551 Ensure that all icons use the same color from theme. 
Also added some fixes for the dark theme
 2018-12-14 11:59:22 +01:00
Lipu Fei
cd3a9e02d6 Merge remote-tracking branch 'origin/4.0' into CURA-6015_fix_osx_crash 2018-12-14 11:45:51 +01:00
Jaime van Kessel
15cd2a9269 Changed textColor of recommended infill slider text to be themed. 
This is required to make the dark theme work correctly
 2018-12-14 11:36:40 +01:00
Lipu Fei
4252b95603 Make ConnectionType Enum type accessible to QML 
CURA-6011
 2018-12-14 11:28:21 +01:00
Lipu Fei
a1ad7851d9 Merge remote-tracking branch 'origin/4.0' into CURA-6011_connection_types 2018-12-14 11:11:40 +01:00
Jaime van Kessel
5e4e52e6fc Fix blue square being shown in selector if no icon is set 
CURA-5876
 2018-12-14 11:09:48 +01:00
ChrisTerBeke
e1f95c6ec1 Merge branch 'master' into STAR-322_cloud-connection 2018-12-14 09:24:56 +01:00
Aleksei S
8dc2a41fb7 Typo, wrong item type, "item" 
CURA-5941
 2018-12-13 17:27:16 +01:00
Jaime van Kessel
8f278fe938 Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 17:21:35 +01:00
Jaime van Kessel
856c1dcb20 Also disconnect the signal for the old parent of printSetupSelector 2018-12-13 17:21:07 +01:00
Diego Prado Gesto
473160a102 Add a check for null to avoid warnings in the logs. 2018-12-13 17:02:13 +01:00
Diego Prado Gesto
d435f21193
Merge pull request #4986 from Ultimaker/CURA-6028_preview_stage_doesnt_switch 
Cura 6028 preview stage doesnt switch
 2018-12-13 16:47:22 +01:00
Diego Prado Gesto
012ee0c02a Use the MouseArea trick to assure that the binding still works for the 
checked property of the button.

Contributes to CURA-6028.
 2018-12-13 16:44:49 +01:00
Jaime van Kessel
bd565bf4cf Merge branch '4.0' of github.com:Ultimaker/Cura into 4.0 2018-12-13 16:33:46 +01:00
Jaime van Kessel
d48e89e224 Prevent the parent of printSetupSelector from being set to null 
If it's parent gets set to null it will break the focus, which we need for the binding updates.

CURA-5941
 2018-12-13 16:32:48 +01:00
alekseisasin
70e60e5313
Merge pull request #4981 from Ultimaker/fix_output_device_selector 
Change the behaviour of the output device selector
 2018-12-13 16:21:49 +01:00
Aleksei S
973970a895 Every print ouput device should define its connection type(usb, network, cluster and etc) 
CURA-6011
 2018-12-13 16:00:12 +01:00
Jaime van Kessel
1b3cb32334 Fix the simulation view not being selected as default 
CURA-6028
 2018-12-13 15:59:15 +01:00
Diego Prado Gesto
0d780e61ff
Merge branch '4.0' into CURA-5876_fixes 2018-12-13 14:39:11 +01:00
Jaime van Kessel
8091b2810c
Apply suggestions from code review 
Change some margins for the corresponding absolute values instead of adding formulas.

Contributes to CURA-5876.

Co-Authored-By: diegopradogesto <d.pradogesto@ultimaker.com>
 2018-12-13 14:36:58 +01:00
Jaime van Kessel
c4700b2752 Also update the model if the data changed 
CURA-6028
 2018-12-13 14:30:00 +01:00
Jaime van Kessel
a1a9b058f5 Let header listen to activeStageId instead of the model 
CURA-6028
 2018-12-13 14:28:32 +01:00
Lipu Fei
8021c8e449 Fix errors in SettingOptionalExtruder.qml 
CURA-6015
 2018-12-13 14:12:51 +01:00
Lipu Fei
620790ae3d Reduce the creations of ExtrudersModels 
CURA-6015
 2018-12-13 14:12:23 +01:00
Lipu Fei
2cf80b4578 Remove unused simpleNames flag 
CURA-6015
 2018-12-13 14:12:04 +01:00
Diego Prado Gesto
635115a879
Merge pull request #4982 from Ultimaker/fix_preview_stage_menu 
Fix preview stage menu
 2018-12-13 09:32:01 +01:00
Diego Prado Gesto
e7fe7571aa Change the behaviour of the output device selector 
Now the behavior is the following:
- The active output device is the one that shows up in the button (same as before)
- The list of the output devices don't show the active device
- When clicking in one item of the list, it becomes the active output and automatically it performs the action.

Contributes to CURA-6026.
 2018-12-13 09:02:14 +01:00
Diego Prado Gesto
77ede1ae6b Unify the fonts to only have 8 instead of 13. 
Contributes to CURA-6025.
 2018-12-12 17:50:21 +01:00
Diego Prado Gesto
f38f140430 Merge branch '4.0' into CURA-5876_fixes 2018-12-12 17:06:59 +01:00
Diego Prado Gesto
17173aba06 Add a component to show when no configurations are available because lack of connection. 
Contributes to CURA-5876.
 2018-12-12 17:04:17 +01:00
Diego Prado Gesto
1d3da3244f Remember the previous selected method in the configuration 
The current behavior now is to open the configuration panel in the previous state, in case it was manually selected. That means that after selecting a printer, the manual state is reset so it will open the auto configuration if it is a connected printer. It will open the custom state in case it's not connected or the printer has no connection.

Contributes to CURA-5876.
 2018-12-12 14:09:15 +01:00
ChrisTerBeke
6150bd665a Merge branch 'master' into STAR-322_cloud-connection 2018-12-12 14:04:59 +01:00
Diego Prado Gesto
4ba448077e Add an empty state, when there are no configurations, showing a label indicating that the list is empty 
Contributes to CURA-5876.
 2018-12-12 13:33:46 +01:00