100 Commits

Author SHA1 Message Date
Ghostkeeper
3ad2e4f62a
Re-use PrinterTypeLabel component and use abbreviated name
Contributes to issue CURA-5876.
2018-11-27 15:24:58 +01:00
Ghostkeeper
289399825b
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	plugins/PrepareStage/PrepareMenu.qml: Git was wrong, this was not really a conflict.
	resources/qml/ActionButton.qml: With iconSource being modified on ui_rework_4_0 and me modifying the icon to be able to display it on the left hand side.
	resources/qml/ActionPanel/OutputProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ActionPanel/SliceProcessWidget.qml: Git was wrong, not really a conflict.
	resources/qml/ExpandableComponent.qml: Both ui_rework_4_0 and me implemented a border around popups.
	resources/qml/MainWindow/MainWindowHeader.qml: Git was wrong, not really a conflict.
	resources/themes/cura-light/theme.json: Theme item was added in a place where I added whitespace.
2018-11-27 15:01:48 +01:00
Ghostkeeper
0a71a9dd3e
Increase margins around configuration item
As per the design.

Contributes to issue CURA-5876.
2018-11-27 14:47:18 +01:00
Ghostkeeper
956741922d
Make elements retain their position if hotend or material is missing
Just a space makes it keep the correct height.

Contributes to issue CURA-5876.
2018-11-27 14:41:48 +01:00
Ghostkeeper
609f07399e
Show extruder as disabled if either material or core is missing
It basically just means you can't print with it.

Contributes to issue CURA-5876.
2018-11-27 14:20:47 +01:00
Ghostkeeper
b0e9f23eee
Correct line colour when hovered
A detail that I almost missed in the design examples.

Contributes to issue CURA-5876.
2018-11-27 14:06:07 +01:00
Ghostkeeper
1555a1ab17
Make manufacturer and extruder labels lighter
The proper colour would've been 'detail' but that seems to not be used much at all, and it's too light. In other places, 'inactive' is used in this place more often.

Contributes to issue CURA-5876.
2018-11-27 14:03:05 +01:00
Ghostkeeper
bb9598afd1
Redesign layout of configuration item contents
This is the new design.

Contributes to issue CURA-5876.
2018-11-27 13:55:54 +01:00
Ghostkeeper
cf8d88054d
Use proper colour for material in configuration item
No idea this would be so easy.

Contributes to issue CURA-5876.
2018-11-27 13:29:57 +01:00
Ghostkeeper
b15c272d23
Fix applying configuration when clicking
Also no longer use that signal for it. It was completely unnecessary.

Contributes to issue CURA-5876.
2018-11-27 13:24:13 +01:00
Ghostkeeper
89126c7323
Use background instead of contentItem
This way the padding and such doesn't matter any more. And the original background disappears, which was unthemed and still behind the original contentItem.

Contributes to issue CURA-5876.
2018-11-27 13:08:41 +01:00
Ghostkeeper
c6a9aca346
Switch checked and hovered themes
I misunderstood the theme as it was in the screenshots.

Contributes to issue CURA-5876.
2018-11-27 13:05:32 +01:00
Ghostkeeper
81cadf702c
Give configuration items a rounded radius
Contributes to issue CURA-5876.
2018-11-27 13:00:51 +01:00
Ghostkeeper
0be2453daf
Update style of border of configuration items
Contributes to issue CURA-5876.
2018-11-27 12:55:07 +01:00
Ghostkeeper
e58409b1ef
Correct colours for the selected configuration
This should always be the same as the ExpandableComponent's background, so white when it's not active and light blue when it's active, regardless of theme.
The naming of this theme entry is a bit weird because the ActionButton theme is used for ExpandableComponent and now for ConfigurationItem as well, but that's why we should NEVER name these theme entries to something specific to one item. Oh well, I'm not about to refactor that now with all the branches going on everywhere.

Contributes to issue CURA-5876.
2018-11-27 12:51:52 +01:00
Ghostkeeper
a2b1f53979
Use normal text colour instead of specialised configuration item text
They were the same anyway, and they should always be the same.

Contributes to issue CURA-5876.
2018-11-27 11:53:17 +01:00
Ghostkeeper
6876c12106
Remove weird padding from button
I don't know why the default Button has padding everywhere, but I don't want it.

Contributes to issue CURA-5876.
2018-11-27 11:43:32 +01:00
Ghostkeeper
e05566865a
Use ExtruderIcon component to display extruder icon
Since we already have that component pre-designed, let's use it.

Contributes to issue CURA-5876.
2018-11-27 11:19:03 +01:00
Ghostkeeper
c489f911fb
Use QtQuick 2.0 and simplify ConfigurationItem
It now uses a ButtonGroup (from QtQuick2). Also, all the mess with when the border and background colours are updated and force-updated and such is now cleaned up.

Contributes to issue CURA-5876.
2018-11-27 11:04:41 +01:00
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
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
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
Ghostkeeper
4b897ffd67
Fix width of content in tabbed content
Contributes to issue CURA-5876.
2018-11-26 16:03:40 +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
Ghostkeeper
90a73f351d
Fix positioning of tabs in custom menu
The label's bottom side is at its top, so we must add its height so that it gets positioned correctly.

Contributes to issue CURA-5876.
2018-11-26 14:12:34 +01:00
Ghostkeeper
4c26262054
Use re-usable TabRow component
Contributes to issue CURA-5876.
2018-11-22 17:06:56 +01:00
Ghostkeeper
7f11142d50
Fix height and vertical layout of popup
Many things were made simpler. This took some time to fix...

Contributes to issue CURA-5876.
2018-11-22 14:57:55 +01:00
Diego Prado Gesto
9720512f50 Add a new printer selector button that is connected to the output
devices and shows labels containing the type of printers that are in the
same group.

Contributes to CURA-5942.
2018-11-22 13:54:10 +01:00
Ghostkeeper
a826dfb156
Fix binding loop in height of view selection bar
Since these were part of the childrenRect of the bar, and attached to the bottom of the bar, the childrenRect depended on the position of the children and that depends on the childrenRect again. So just attach it to the top, it's logical.

Contributes to issue CURA-5876.
2018-11-21 16:12:00 +01:00
Ghostkeeper
a052b8ec69
Use Theme.getIcon instead of Theme.icons
This is better for performance, according to the deprecation warning I got.

Contributes to issue CURA-5876.
2018-11-21 16:08:29 +01:00
Ghostkeeper
eb056ee17b
Fix display of custom configuration
Since it had no width, everything was resized to 0.

Contributes to issue CURA-5876.
2018-11-21 16:06:26 +01:00
Jaime van Kessel
a9672458fd Update extruderIcon to be more in line with the design
CURA-5785
2018-11-21 13:46:50 +01:00
Jaime van Kessel
c7dbaa3a00 Add rendertype for labels in quickConfigurationSelector
CURA-5785
2018-11-21 13:22:03 +01:00
Ghostkeeper
d42ddad606
Add icons on left and right side of text
For this I had to implement functionality in ActionButton to be able to display the icon on either side.

Contributes to issue CURA-5876.
2018-11-20 14:47:41 +01:00
Ghostkeeper
dca286cea5
Give action button a sane default height
We don't want to give it a default width since that should just adjust to its contents by default, which is fine.

Contributes to issue CURA-5876.
2018-11-20 14:34:06 +01:00
Ghostkeeper
a1068a3ef2
Rename action_panel_button theme entry to action_button
Because it's not just used in the save panel.

Contributes to issue CURA-5876.
2018-11-20 14:24:09 +01:00
Ghostkeeper
42d73836f4
Move default margin by default to Cura's action buttons
So we don't have to repeat that every time you create a new button.

Contributes to issue CURA-5876.
2018-11-20 14:19:55 +01:00
Ghostkeeper
cbd5238738
Don't show custom/auto toggle buttons when not connected
In order to prevent suddenly switching to the other side when the connection is lost or restored, we only evaluate this upon opening the popup. This way you might be surprised that closing and then opening it can show something else, but it will never surprise you while working on the popup itself as a user.

Contributes to issue CURA-5876.
2018-11-20 13:55:28 +01:00
Ghostkeeper
a04db164e6
Make it possible to swap between auto and custom configuration
We're going to need to make this disappear when the printer is not connected. But that is for later.

Contributes to issue CURA-5876.
2018-11-19 17:11:51 +01:00
Ghostkeeper
00a49fff26
Rename QuickConfigurationSelector to ConfigurationMenu
This is going to function as our main item for the configuration menu. It contains the part in the top bar and the glue item for the part in the popup.

Contributes to issue CURA-5876.
2018-11-19 14:39:19 +01:00
Ghostkeeper
7a210087ff
Add header for configuration selector
It currently always says 'Custom', but we will want to make that dynamic at some point.

Contributes to issue CURA-5876.
2018-11-19 14:35:34 +01:00
Lipu Fei
b0f3fedc94 Fix import QtQuick versions to suit Qt 5.10
CURA-5785
2018-11-19 13:42:22 +01:00
Jaime van Kessel
52b2f4579a Fix a number of QML warnings
CURA-5785
2018-11-16 16:13:09 +01:00
Jaime van Kessel
7f99ed1af3 ExtruderIcon will now display that it's disabled correctly
CURA-5785
2018-11-16 16:04:11 +01:00
Ghostkeeper
816d844258
Use textwidth instead of round
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 15:14:08 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable
CURA-5785
2018-11-16 14:58:11 +01:00
Jaime van Kessel
c08aa2205c Fix enabled checkbox for extruder selection
CURA-5785
2018-11-15 09:37:54 +01:00