GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-29 09:38:21 +08:00
Code Issues Packages Projects Releases Wiki Activity
17,639 Commits 294 Branches 267 Tags
Commit Graph

3416 Commits

Author SHA1 Message Date
Ghostkeeper
c74d6fc1e7
Make printerTypeLabel smaller 
More in line with the theme.

Contributes to issue CURA-6025.
 2018-12-31 13:32:49 +01:00
Ghostkeeper
d020a49b75
Assign a font to Marketplace button 
Otherwise the font face may be different, and the theme has no effect on the font.

Contributes to issue CURA-6025.
 2018-12-31 13:26:55 +01:00
Ghostkeeper
c6fb0d70af
Use medium font size for everything in stage menu 
Except the material manufacturer, which should remain default.

Contributes to issue CURA-6025.
 2018-12-31 13:22:53 +01:00
Ghostkeeper
b54312fb9b
Merge branch '4.0' into unify_font_types 2018-12-28 15:51:54 +01:00
Ghostkeeper
abe684c1bd
Use Item instead of rectangle without defined colour 
Item should be faster to render.

Contributes to issue CURA-6056.
 2018-12-27 13:36:17 +01:00
alekseisasin
facf1428d6
Merge pull request #5020 from Ultimaker/CURA-6004_missing_tooltips 
Cura 6004 missing tooltips
 2018-12-21 14:57:06 +01:00
Jaime van Kessel
81e356ea1b Switch out the containersModel for the more specific printersModel 2018-12-21 11:20:09 +01:00
Jaime van Kessel
0965d909c0 Remove the show property from the tooltip 
This was a bit of a weird setup, so i removed it. This way the tooltip can be used
in the same way as the regular tooltip (by simply setting the visibility)

CURA-6004
 2018-12-20 16:41:26 +01:00
Jaime van Kessel
3f599bd06f Ensure that the tooltip text is translated 
CURA-6004
 2018-12-20 16:31:57 +01:00
Ghostkeeper
5bf260f524
Don't break binding of is_favorite upon clicking star 
We shouldn't override it here because doing that causes the binding to break. Just remove the favourite and let the model update itself, thus removing the star.

Contributes to issue CURA-6032.
 2018-12-20 14:40:37 +01:00
Ghostkeeper
f3a0b44d5e
Simplify is_favorite condition 
No stupid ternary operators necessary.

Contributes to issue CURA-6032.
 2018-12-20 14:40:29 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing 
CURA-6044
 2018-12-20 14:01:12 +01:00
Jaime van Kessel
dc473dc78d Add missing typing for setting visibility preset model 2018-12-20 11:09:02 +01:00
Jaime van Kessel
8bff0d17e8 Prevent the backend attempting to reslice everytime a preference changed 2018-12-20 09:43:01 +01:00
Aleksei S
d891d30ab8 The Cura logo in left top corner is not displayed properly. 
CURA-6044
 2018-12-19 15:51:32 +01:00
Aleksei S
3953c7bb3a Added Tooltip alignment 
CURA-6004
 2018-12-19 14:24:02 +01:00
Ghostkeeper
c0835f3a2f
Code style 
Just something I boyscouted while working on something else.
 2018-12-19 14:02:17 +01:00
Diego Prado Gesto
ef2fb53790 Merge branch '4.0' into unify_font_types 2018-12-19 11:56:22 +01:00
Diego Prado Gesto
382286509f Change the buildplate information to use a reusable component 
Boy scouting.

Contributes to CURA-6025.
 2018-12-19 09:49:12 +01:00
Diego Prado Gesto
6987d5ff78 Add a radius to the printer type label 2018-12-19 09:33:46 +01:00
Diego Prado Gesto
17cddac024 Merge branch '4.0' into CURA-6004_missing_tooltips 2018-12-19 09:03:31 +01:00
Ghostkeeper
c0c45519a0
Change another useless rectangle into an item 
It's more efficient to render. Also changed some code style.

Contributes to issue CURA-6032.
 2018-12-18 16:49:41 +01:00
Ghostkeeper
c66257bf4d
Use item instead of transparent rectangle 
This is faster to render.

Contributes to issue CURA-6032.
 2018-12-18 16:18:01 +01:00
Ghostkeeper
279812e4ff
Round width of buttons 
They were getting rendered a bit weird if your pixel scale was not an integer (for me it's 1.25).
 2018-12-18 13:58:21 +01:00
Jaime van Kessel
a181ffe79d Merge branch 'fix_print_monitor_dark_theme' of https://github.com/fieldOfView/Cura into 4.0 2018-12-18 13:54:45 +01:00
Lipu Fei
71e71e0a4f
Merge pull request #4975 from Ultimaker/CURA-6011_connection_types 
[4.0] Every output device should define its connection type
 2018-12-18 13:23:02 +01:00
Diego Prado Gesto
cc462ef3a6 Add a placeholder for a pattern in the header, if the theme wants to add one. 2018-12-18 10:29:44 +01:00
Jaime van Kessel
be9d35d45f Fix some minor layout issues 
CURA-6011
 2018-12-18 09:47:51 +01:00
Lipu Fei
6017c2b4d2 Replace isProfileUserCreated with hasCustomQuality 
CURA-6028
 2018-12-18 08:56:56 +01:00
Jaime van Kessel
d395c38436 Removed collapse / expand all 
I don't think it ever worked.
 2018-12-17 17:47:33 +01:00
fieldOfView
7d6e698f43 Fix (USB) print monitor in dark theme 2018-12-17 17:37:21 +01:00
Diego Prado Gesto
b5d8db6a77 Merge branch '4.0' into CURA-6011_connection_types 2018-12-17 15:44:02 +01:00
Jaime van Kessel
aad7540366 Fix situation where multiple connect configurations would cause issues 
CURA-6011
 2018-12-17 13:31:38 +01:00
Diego Prado Gesto
ed4d339dee Change the margin in the view orientation buttons to aling the pixels correctly 2018-12-17 11:00:49 +01:00
Jaime van Kessel
938287095f Use connection type instead of um_network_key to see if a printer has a network connection 
CURA-6011
 2018-12-17 10:47:14 +01:00
Diego Prado Gesto
cbd8e72bd5 Add fixed width to the preview button 
Doing that, the elide will work. Also increase the size of the panel a bit so it will fit better in other languages. Adding also the tooltip in case the text is too long in other languages.
 2018-12-17 10:42:52 +01:00
Lipu Fei
4ab123eb87 Merge remote-tracking branch 'origin/CURA-6028_stage_button_fixes' into 4.0 2018-12-17 08:48:31 +01:00
Jaime van Kessel
226d052468 Move the machines from machinelist into their own model 
CURA-6011
 2018-12-14 17:10:58 +01:00
Jaime van Kessel
ef6f666c3e Remove duplicate alias definition 
Yay. Merges.
 2018-12-14 16:41:07 +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
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