GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-01 08:14:22 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,026 Commits 291 Branches 260 Tags
Commit Graph

3755 Commits

Author SHA1 Message Date
Ghostkeeper
e8ea742cf6
Retain binding with isValidMaterial on hover 
So that if a material becomes valid, it updates this property.

Contributes to issue CURA-6033.
 2018-12-21 16:27:38 +01:00
ChrisTerBeke
912652654b Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 15:28:56 +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
Aleksei S
c8994102da Use short for each javascript function 
CURA-6033
 2018-12-21 14:44:25 +01:00
Aleksei S
01783e7f68 Check material name instead of material brand 
CURA-6033
 2018-12-21 13:54:01 +01:00
ChrisTerBeke
64f5c4f263 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-21 13:33:16 +01:00
Jaime van Kessel
81e356ea1b Switch out the containersModel for the more specific printersModel 2018-12-21 11:20:09 +01:00
Aleksei S
9430c421eb Code refactor 
CURA-6033
 2018-12-20 18:19:59 +01:00
Aleksei S
7cfb29e337 If a connected printer has a selected material which is unknown 
for Cura then show a message for  downloading it from Marketplace
CURA-6033
 2018-12-20 18:12:40 +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
ChrisTerBeke
bfd1debb8f Merge branch '4.0' into STAR-322_cloud-connection 2018-12-20 15:49:00 +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
ChrisTerBeke
af2061cd52 Simplify some checks for connection types and group size 2018-12-20 14:26:30 +01:00
Jaime van Kessel
9ffc039254 Fix logo aliasing 
CURA-6044
 2018-12-20 14:01:12 +01:00
ChrisTerBeke
2f92f6ef50 Simplify checking if cloud or network printer, small fixes 2018-12-20 13:45:59 +01:00
ChrisTerBeke
0edeb11a78 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-20 13:14:24 +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
ChrisTerBeke
f5150a7c89 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 16:24:31 +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
ChrisTerBeke
21cde5535a Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 14:15:19 +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
ChrisTerBeke
1b356a3219 Move cloud connection check logic to Python 2018-12-19 11:41:22 +01:00
ChrisTerBeke
60335681c7 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-19 10:47:03 +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
ChrisTerBeke
b66047c7d1 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-18 17:43:28 +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
ChrisTerBeke
4bf24671a2 Use the (not final) cloud icon when cloud connected 2018-12-18 16:33:39 +01:00
ChrisTerBeke
0588c54035 Start work on cloud icon 2018-12-18 16:29:13 +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
ChrisTerBeke
25caf1a087 Fix merge conflicts 2018-12-18 14:44:13 +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
Diego Prado Gesto
3c99b69724 Merge branch '4.0' into CURA-6005_cura_drive_plugin 
Remove unused file.

Contributes to CURA-6005.
 2018-12-18 07:17:37 +01:00
ChrisTerBeke
b2f32f81e4 Merge branch '4.0' into STAR-322_cloud-connection 2018-12-17 18:23:55 +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
Diego Prado Gesto
02825a062f Change the remove and the info buttons 
Contributes to CURA-6005.
 2018-12-17 13:38:41 +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