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
2d7588903c
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 15:55:34 +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
ChrisTerBeke
aaf0f69820
Fix some more relative imports
2018-11-26 15:10:36 +01:00
ChrisTerBeke
42ccabc7b6
Fix relative imports for plugin
2018-11-26 15:09:56 +01:00
Diego Prado Gesto
84f263f111
Fix style for the open file button in the prepare menu.
...
Contributes to CURA-5942.
2018-11-26 15:08:33 +01:00
ChrisTerBeke
39f92ced90
Comment out test
2018-11-26 15:02:52 +01:00
ChrisTerBeke
269d596f5d
Fix typing for cluster list
2018-11-26 14:54:24 +01:00
ChrisTerBeke
856276d8b7
Cleanup plugin imports
2018-11-26 14:53:08 +01:00
ChrisTerBeke
6a43d10982
Use BaseModel for CloudCluster, some fixes
2018-11-26 14:51:24 +01:00
Diego Prado Gesto
52b916d45c
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
2018-11-26 14:33:41 +01:00
Diego Prado Gesto
9c240bdfe3
Merge pull request #4882 from Ultimaker/CURA-5959-action-panel-ui-fixes
...
Cura-5959 action panel ui fixes
2018-11-26 14:31:01 +01:00
ChrisTerBeke
7654f1c71c
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 14:30:50 +01:00
Marijn Deé
a382b77eaa
Added validation to the models
2018-11-26 14:30:17 +01:00
ChrisTerBeke
89e88a73bb
Temporary patch for when printer has one or more materials not installed
2018-11-26 14:11:20 +01:00
ChrisTerBeke
45159f7a80
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 14:09:13 +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
Jaime van Kessel
a654499752
Re-enable hover for marketplace button
...
CURA-5959
2018-11-26 13:47:22 +01:00
ChrisTerBeke
014b1d6e4e
test
2018-11-26 13:45:37 +01:00
Ghostkeeper
826044da7e
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
...
Conflicts:
plugins/PrepareStage/PrepareMenu.qml: Some indentation change caused it to misalign the diffs, thinking it couldn't merge two of the same lines which actually weren't the same lines.
resources/qml/Menus/ConfigurationMenu/QuickConfigurationSelector.qml: This file was deleted in my branch. I'm holding for the new version.
2018-11-26 13:43:20 +01:00
Mark
8bae9fa667
Merge branch 'master' into ui_rework_4_0
2018-11-26 13:41:25 +01:00
ChrisTerBeke
21c81603b4
Use application singleton instead of locally cached application
2018-11-26 13:33:14 +01:00
Lipu Fei
845b320981
Fix adjustable monitor component width
...
CURA-5943
- Add rounding
- If there's no sidebar, use full width
2018-11-26 13:08:33 +01:00
Marijn Deé
908628e2aa
Added a model to represent a cluster
2018-11-26 10:47:53 +01:00
Marijn Deé
d8232caec0
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-26 10:14:34 +01:00
Diego Prado Gesto
f3bf20ca1b
Separate the view selector into a different file.
2018-11-25 18:24:21 +01:00
Aleksei S
2b45262a85
Added test for definition container
...
CURA-5977
2018-11-23 17:01:05 +01:00
Diego Prado Gesto
a3bcdaf3b6
Make the popup in the printer selector resizable depending on the
...
contents. Also there is a maximum height that will fit 9 printers.
Contributes to CURA-5942.
2018-11-23 16:58:57 +01:00
ChrisTerBeke
1adf1096a3
Merge branch 'master' into cloud-output-device
2018-11-23 14:17:26 +01:00
ChrisTerBeke
cf27a211df
Remove unused TYPE_CHECKING import
2018-11-23 14:15:40 +01:00
ChrisTerBeke
ef5ca6f5a9
Remove unused typing import
2018-11-23 14:15:21 +01:00
ChrisTerBeke
3e100775df
Fix instantiating CloudOutputDeviceManager
2018-11-23 14:14:35 +01:00
ChrisTerBeke
8ee39c0489
Merge branch 'tests-for-um3networkplugin' into cloud-output-device
2018-11-23 14:08:55 +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
Lipu Fei
1c4f7c7fb7
Merge branch 'ui_rework_4_0', remote-tracking branch 'origin' into CURA-5943_ui_usb_printing
2018-11-23 08:06:43 +01:00
Diego Prado Gesto
2b08857331
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
2018-11-22 16:11:34 +01:00
Diego Prado Gesto
81c776213a
Merge branch 'master' into ui_rework_4_0
2018-11-22 16:11:06 +01:00
Simon Edwards
ee7355c2bb
Merge pull request #4841 from Ultimaker/CL-1148_restyling_monitor_queue_tiles
...
CL-1148 Re-styling monitor queue tiles
2018-11-22 15:08:42 +01:00
Lipu Fei
2d2f24251d
Fix MonitorMainView for USB printing
...
CURA-5943
2018-11-22 15:07:49 +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