Jaime van Kessel
|
8e7e8354e7
|
Set colors to the correct ones
|
2018-11-27 09:41:45 +01:00 |
|
Lipu Fei
|
2e81b97623
|
Use global_stack.extruders to find extruders
CURA-5978
|
2018-11-27 08:45:45 +01:00 |
|
pinchies
|
47ed9e3f5d
|
deleting the old wrong file....
|
2018-11-27 15:09:36 +11:00 |
|
pinchies
|
519e2a3399
|
uploaded wrong file... oops
|
2018-11-27 15:06:54 +11:00 |
|
Diego Prado Gesto
|
fcc6af68af
|
Don't show the current checked version of the firmware if the version number we gather is ZERO. That means that there was a problem getting the right value.
Contributes to CURA-5980.
|
2018-11-26 17:55:25 +01:00 |
|
Diego Prado Gesto
|
ad3fa9548a
|
Add sourceSize to the open file button.
Contributes to CURA-5942.
|
2018-11-26 17:53:38 +01:00 |
|
Diego Prado Gesto
|
6a2bbca7ce
|
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
|
2018-11-26 17:53:24 +01:00 |
|
Jaime van Kessel
|
5ddb3ff909
|
Factor out superfluous use of small_tool_button style
The style was overly complicated for what it should do
|
2018-11-26 17:40:34 +01:00 |
|
Jaime van Kessel
|
a3b45ff203
|
Simplify the viewOrientation controls
|
2018-11-26 17:35:23 +01:00 |
|
Jaime van Kessel
|
a825daea95
|
Cleanup the Theme.json
There were a lot of sizes that weren't used
|
2018-11-26 17:10:48 +01:00 |
|
Jaime van Kessel
|
d85aee1c53
|
Ensure that no weird data is set in the printSetupSelector on first start
CURA-5961
|
2018-11-26 16:40:29 +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 |
|
Mark
|
7019afe21f
|
Merge pull request #4717 from forkineye/fix-wanhao_profiles
Fix Wanhao profiles to use speed_travel macro
|
2018-11-26 16:03:25 +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 |
|
Diego Prado Gesto
|
3d1157522a
|
Reuse the RoundedRectangle component and indicate that only the bottom part of the popup should be rounded.
Contributes to CURA-5942.
|
2018-11-26 15:51:36 +01:00 |
|
Mark
|
39f123f8e0
|
Merge pull request #4670 from pinchies/add-cc-mm-2
Add Cocoon Create ModelMaker
|
2018-11-26 15:49:21 +01:00 |
|
Mark
|
88cedd25cf
|
Merge pull request #4664 from pinchies/master
Add JGAurora Z-603S
|
2018-11-26 15:47:28 +01:00 |
|
Mark
|
037bf8863e
|
Merge pull request #4666 from pinchies/add-jg-a5
Add JGAurora A5
|
2018-11-26 15:43:41 +01:00 |
|
Mark
|
734a8882b1
|
Merge pull request #4667 from pinchies/add-jg-a1
Add JGAurora A1
|
2018-11-26 15:41:30 +01:00 |
|
Diego Prado Gesto
|
67cba50e9b
|
Merge branch 'ui_rework_4_0' into CURA-5942_printer_selector
|
2018-11-26 15:41:05 +01:00 |
|
Diego Prado Gesto
|
d1a5d548a9
|
Merge pull request #4884 from Ultimaker/add_border_to_rounded_rectangle
Add border to rounded rectangle.
|
2018-11-26 15:40:02 +01:00 |
|
Mark
|
30c585f298
|
Merge pull request #4834 from mcmidget/master
Add BIBO2 printer (dual and single extruder settings)
|
2018-11-26 15:39:39 +01:00 |
|
Diego Prado Gesto
|
9afc5748a8
|
Add copyright header.
|
2018-11-26 15:39:34 +01:00 |
|
ChrisTerBeke
|
da5683c876
|
add typing to models
|
2018-11-26 15:30:30 +01:00 |
|
Jaime van Kessel
|
9732099250
|
Add border to rounded rectangle.
It's designed so that it works in exactly the same way as rectangle.
|
2018-11-26 15:14:32 +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
|
a9fedb4f66
|
Restore NetworkedPrinterOutputDevice for now
|
2018-11-26 15:05:53 +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 |
|
Marijn Deé
|
579522857a
|
Fix the code-style test
|
2018-11-26 14:42:50 +01:00 |
|
Diego Prado Gesto
|
0a1c0e18d1
|
Reuse the component SecondaryButton in the printer selector.
Contributes to CURA-5942.
|
2018-11-26 14:38:43 +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 |
|
Diego Prado Gesto
|
12f78fa21a
|
Remove border of the popup selector for the output devices.
Contributes to CURA-5959.
|
2018-11-26 14:29:42 +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 |
|
Diego Prado Gesto
|
b63c4f7a74
|
Add header in new files. Remove unused imports.
Contributes to CURA-5959.
|
2018-11-26 14:06:34 +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 |
|
Diego Prado Gesto
|
ebae4347a8
|
Fix unit tests that were failing after adding the getAbbreviatedMachineName to the machine manager.
Contributes to CURA-5942.
|
2018-11-26 13:44:32 +01:00 |
|
Mark
|
8bae9fa667
|
Merge branch 'master' into ui_rework_4_0
|
2018-11-26 13:41:25 +01:00 |
|