19026 Commits

Author SHA1 Message Date
Ghostkeeper
4be8af7cb2
Restyle printer type headers
It's now a grey box with the printer type name inside and some padding and such.

Contributes to issue CURA-5876.
2018-11-27 09:38:32 +01:00
Aleksei S
ec63e6c130 Added icons
CURA-5941
2018-11-27 09:27:25 +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
Ghostkeeper
7f2f2090da
Make small and very_small fonts actually smaller
Rather than the same as default_bold and default.
This also makes the extruder_icon font obsolete. Turns out it's actually just a very small font.

Contributes to issue CURA-5876.
2018-11-26 17:37:50 +01:00
Jaime van Kessel
a3b45ff203 Simplify the viewOrientation controls 2018-11-26 17:35:23 +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
Ghostkeeper
a03e1be601
Simplify sectionHeading element
No need to define that component in a higher location, just define it where you need it. Also, no need to use a Rectangle for this if it has no colour, just use an Item, but the Item itself is also not necessary if you just need the padding.

Contributes to issue CURA-5876.
2018-11-26 17:19:32 +01:00
Ghostkeeper
3b219e3ac3
Remove padding
The padding is already done by the enveloping Column and its parent popupItem.

Contributes to issue CURA-5876.
2018-11-26 17:13:25 +01:00
Ghostkeeper
a268c95559
Remove double header
This header is no longer necessary since the AutoConfiguration item provides its own header that doesn't scroll along.

Contributes to issue CURA-5876.
2018-11-26 17:10:56 +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
Ghostkeeper
87a0dc65e1
Add list of available configurations to AutoConfiguration
This is the main item it needs to display.

Contributes to issue CURA-5876.
2018-11-26 17:09:36 +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
Ghostkeeper
4b897ffd67
Fix width of content in tabbed content
Contributes to issue CURA-5876.
2018-11-26 16:03:40 +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
Ghostkeeper
ac5f79ba2c
Add tab style to tabbed content
It now gets a proper background colour, lining and radius.

Contributes to issue CURA-5876.
2018-11-26 15:47:32 +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