Commit graph

797 commits

Author SHA1 Message Date
Ian Paschal
a3f0630ee9 Rename printer images
Contributes to CL-1150
2018-11-27 11:19:30 +01:00
Ian Paschal
475a94d10d Add printer images
Commit to CL-1150
2018-11-27 10:55:08 +01:00
Ian Paschal
8965695a59 Update MonitorPrintJobProgressBar.qml
Contributes to CL-1150
2018-11-27 10:54:46 +01:00
Ian Paschal
616ec13457 Change context menu button size
Contributes to CL-1150
2018-11-27 10:54:26 +01:00
Ian Paschal
7340b6dbc4 Update CameraButton.qml
Contributes to CL-1150
2018-11-27 10:53:00 +01:00
Ian Paschal
0cd9c8e087 Add machine images
Contributes to CL-1150
2018-11-27 10:52:49 +01:00
Lipu Fei
edf8460619 Return empty material model for empty material
CURA-5982
2018-11-27 10:35:19 +01:00
Ghostkeeper
a3fe9839ba
Change all uses of 'small' and 'very small' fonts to default
These two fonts are exactly the same, but I want to use the 'small' font to be something a bit smaller. I'm 'removing' the superfluous font but will be re-using it immediately to look a bit smaller.

Contributes to issue CURA-5876.
2018-11-26 17:33:37 +01:00
ChrisTerBeke
efd5f3799b Also catch TypeError now that we have explicit arguments 2018-11-26 16:31:32 +01:00
ChrisTerBeke
6506596ece Fix typing syntax 2018-11-26 16:19:01 +01:00
ChrisTerBeke
e4d8fb36ab Add more typing as per request from @sedwards2009 2018-11-26 15:53:04 +01:00
ChrisTerBeke
da5683c876 add typing to models 2018-11-26 15:30:30 +01:00
Marijn Deé
a382b77eaa Added validation to the models 2018-11-26 14:30:17 +01:00
ChrisTerBeke
68a90ec510 Use simple models instead of namedtuples
Named tuples would throw a TypeError if an unknown attribute was set, but we just want to ignore those
2018-11-26 14:08:21 +01:00
Mark
8bae9fa667 Merge branch 'master' into ui_rework_4_0 2018-11-26 13:41:25 +01:00
Ghostkeeper
48c24b1034
Remove log entry for bonjour services added
For most networks that would not be a problematic log entry. But for our own debugging on Ultimaker's network this is a very spammy log entry and doesn't add much value anyway.
2018-11-23 10:50:16 +01:00
Marijn Deé
76542a82d5 Removed the asserts on internals 2018-11-23 10:33:57 +01:00
Ian Paschal
9f1ce72b9e Add Cura 4.0 printer cards
Contributes to CL-1150
2018-11-23 10:03:08 +01:00
Marijn Deé
294527f7fe Review changes 2018-11-23 09:21:09 +01:00
Marijn Deé
bb5c0326de Used duoble quotes iso single quotes 2018-11-23 09:20:19 +01:00
Diego Prado Gesto
81c776213a Merge branch 'master' into ui_rework_4_0 2018-11-22 16:11:06 +01:00
Ian Paschal
963b8aa974 Fix QML warnings
Contributes to CL-1148
2018-11-22 13:56:01 +01:00
Ian Paschal
55554c62a9 Use array for extruder configurations
Contributes to CL-1148
2018-11-22 13:55:43 +01:00
Ian Paschal
da834d6a1f Silence binding loop
Contributes to CL-1148
2018-11-22 13:55:22 +01:00
Ian Paschal
1de21c1d94 Remove unnecessary "else"
Contributes to CL-1148
2018-11-22 13:13:06 +01:00
Ian Paschal
3c3343a407 Use bool for expanded or collapsed state
Contributes to CL-1148
2018-11-22 13:11:59 +01:00
Ian Paschal
ba7863c9d9 Fix type error for hovering manage queue link
Contributes to CL-1148
2018-11-22 11:09:35 +01:00
Marijn Deé
352427e460 Moved exception handling closer to the cause of error 2018-11-22 10:01:15 +01:00
Marijn Deé
7e3f86f091 Moved some of the mocks to class level because they are used in every test method 2018-11-22 09:37:47 +01:00
Marijn Deé
7b0f8882a2 Reverted models to namedtuples from collections because
NamedTuple is a Python3.6 feature
2018-11-21 11:01:26 +01:00
Marijn Deé
9e8be286af Used NamedTuple from typing iso namedtuple from collections so we can at least give type hints 2018-11-21 10:12:53 +01:00
Marijn Deé
f3338aa187 Fixed the failing tests 2018-11-20 16:53:01 +01:00
Marijn Deé
ca60744292 Made the tests work with the named tuples
Tests only use the _onGetRemoteMaterial
2018-11-20 16:34:11 +01:00
Marijn Deé
481ca8cd2f Fixed some bugs and added the color_code field to the named tuple 2018-11-20 16:33:52 +01:00
Ian Paschal
2f84339f5c Finalize queue
Contributes to CL-1148
2018-11-20 15:58:09 +01:00
Ian Paschal
fb3cb67da0 Add printer configuration components
Contributes to CL-1148
2018-11-20 13:46:41 +01:00
Diego Prado Gesto
fab0d5a4b7 Rename the color of the sidebar to main_background, since it was deleted
but not updated in the usages.

Contributes to CURA-5785.
2018-11-20 13:25:15 +01:00
Ian Paschal
421a64c7b0 Replace queued print job cards with new design
Contributes to CL-1148
2018-11-19 16:42:36 +01:00
ChrisTerBeke
2497325d60 Test with named tuples, not working yet 2018-11-19 16:35:19 +01:00
ChrisTerBeke
c04ce7fce8 Use call_count on specific method to be more precise 2018-11-19 15:44:07 +01:00
ChrisTerBeke
60dd130393 Use logException where possible 2018-11-19 15:39:12 +01:00
ChrisTerBeke
66fbadf2de Convert all single quotes to double quotes 2018-11-19 15:37:56 +01:00
ChrisTerBeke
d65114bd56 use call_count to assert device was not called 2018-11-19 15:08:58 +01:00
ChrisTerBeke
0b1ac87354 Fix some formatting, cleanup import 2018-11-19 15:03:43 +01:00
ChrisTerBeke
dc17bd8499 Fix the first tests 2018-11-19 13:54:45 +01:00
ChrisTerBeke
ee9210d8d1 Rewrite tests 2018-11-19 10:57:47 +01:00
ChrisTerBeke
23e957e1c5 Some more refactoring, splitting up methods 2018-11-19 10:44:24 +01:00
Marijn Deé
22aac7b566 Renamed TestContainerRegistry to ContainerRegistryMock 2018-11-16 16:35:08 +01:00
Marijn Deé
565f009e9b Added comments 2018-11-16 16:34:44 +01:00
Marijn Deé
1000625d69 Added spaces around all = 2018-11-16 16:07:17 +01:00