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

17731 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Ian Paschal
3bd5d141ab Add easing and make animation less snappy and awesome 
Contributes to CL-1151
 2018-12-14 15:39:17 +01:00
Ian Paschal
2f6a274c0e Small style improvements 
Contributes to CL-1151
 2018-12-14 15:27:55 +01:00
Lipu Fei
ae695b77e6 Add native rendering for QML Label 
CURA-6013
 2018-12-14 15:23:59 +01:00
Ian Paschal
b2ea597543 Fix button color 
Contributes to CL-1151
 2018-12-14 15:10:34 +01:00
Ian Paschal
5d0da580b9 Fix border colors 2018-12-14 15:04:22 +01:00
Ghostkeeper
2e835bf48d
Merge branch '4.0' 2018-12-14 15:02:30 +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
Ian Paschal
7fc5742b7f Add monitor carousel 
Contributes to CL-1151
 2018-12-14 15:01:40 +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
Ghostkeeper
64e436f814
Merge branch '4.0' 2018-12-14 13:27:54 +01:00
Ghostkeeper
475b008310
Reduce minimum window size slightly 
This way it just fits on the screen of a 13 inch MacBook Air.
 2018-12-14 13:27:36 +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
Lipu Fei
a02bccf74d Fix NozzleModel to work with new ListModel data update 
CURA-6015

ListModels should not modify items directly. All ListModels should use
setItems() and the insertions/removals/modifications will be done in
setItems() itself.
 2018-12-14 13:00:06 +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
Lipu Fei
a18203b286 Fix typing 
CURA-6011
 2018-12-14 11:37:32 +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
Jaime van Kessel
edd4f6e1fa Fix some minor QML warnings 
CURA-6013
 2018-12-14 11:02:10 +01:00
Jaime van Kessel
7616f9c97d Make hardcoded color themeable 
CURA-6013
 2018-12-14 10:59:59 +01:00
Jaime van Kessel
450f301c8c Fix binding loop 
CURA-6013
 2018-12-14 10:56:13 +01:00
Lipu Fei
aba3b6dd8e Rename setKey() and add docs 
CURA-6011
 2018-12-14 10:55:36 +01:00
Lipu Fei
99cee1dfe7 Use double-quotes for custom type hinting in functions 
CURA-6011
 2018-12-14 10:54:54 +01:00
Lipu Fei
8bb8ae8652 Rename ConnectionType.none to ConnectionType.Unknown 
CURA-6011

Cannot use None
 2018-12-14 10:48:26 +01:00
Jaime van Kessel
bb1bf14a01 Prevent rating when user is not logged in 
CURA-6013
 2018-12-14 10:46:31 +01:00
Lipu Fei
3e1993d876 Rename Enum name to camal cases 
CURA-6011
 2018-12-14 10:11:10 +01:00
Lipu Fei
644944bc41 Remove unused function setConnectionType() 
CURA-6011
 2018-12-14 10:00:21 +01:00
Lipu Fei
0aa49270eb Remove unused function checkConnectionType() 
CURA-6011
 2018-12-14 09:57:43 +01:00
Lipu Fei
6bf39a32a9 Rename Enum names to camal cases 
CURA-6011
 2018-12-14 09:56:10 +01:00
Jaime van Kessel
8f04316ef8 Merge branch '4.0' of github.com:Ultimaker/Cura 2018-12-13 19:40:59 +01:00
Jaime van Kessel
9d929b90c3 Merge branch 'master' of github.com:Ultimaker/Cura 2018-12-13 19:40:51 +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
Ghostkeeper
bb45680b98
Merge branch '4.0' 2018-12-13 16:49:57 +01:00
Ghostkeeper
3d4da94b36
Remove obsolete description detail about old Cura versions 
This setting had a detail in the description about how the setting used to behave in old Cura versions. Let's remove it since it is not relevant any more.

Fixes #4536.
 2018-12-13 16:49:45 +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
Ghostkeeper
3f3cd5e334
Remove broken load of PrepareSidebar.qml 
This file no longer exists. Loading it gives a warning.
 2018-12-13 16:32:49 +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