3049 Commits

Author SHA1 Message Date
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
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
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
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
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
cbee18597e Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-21 16:59:03 +01:00
Diego Prado Gesto
f866390c7b Fix an issue in the action panel.
When the panel is created while the user is in the preview stage, the
row has no width.

Contributes to CURA-5786.
2018-11-21 16:56:25 +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
Diego Prado Gesto
a1f3ebc25b Fix typo.
Contributes to CURA-5785.
2018-11-21 13:58:21 +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
Jaime van Kessel
bd636e61a0 Minor changes suggested in review
CURA-5785
2018-11-21 13:17:36 +01:00
Jaime van Kessel
eef6ad662d Added enum for the roundedCorner property
This makes it a whole lot easier to read what is being set.

CURA-5785
2018-11-21 11:50:39 +01:00
Jaime van Kessel
b826a42026 Add the RoundedRectangle as background to the ExpandableComponent
This way the expandable components can have rounded corners only on one side,
thus preventing the need to do add backgrounds to the rows that they are in.

CURA-5785
2018-11-21 11:37:58 +01:00
ChrisTerBeke
60ed0ddc24
Revert "Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu""
This reverts commit 791929d6897942e971a112a26839c0fa6f94f847.
2018-11-20 23:49:33 +01:00
ChrisTerBeke
791929d689
Revert "Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu"
This reverts commit 4caf770a62f07b71a646b7f09a08623485b89582, reversing
changes made to 0cdcd61ff2dfe2677e636cc2f1ee993cbd9d641d.
2018-11-20 23:47:46 +01:00
ChrisTerBeke
4caf770a62
Merge branch 'fix-oauth2-client' into CURA-5785-Restyle_stage_menu
* fix-oauth2-client:
  Switch Ultimaker Account OAuth2 client
  Fix the title's top margin size in the add machine dialog.
2018-11-20 20:48:52 +01:00
Diego Prado Gesto
669648d3e1 Improve the toolbar style by modifying the rectangles and the behavior
to get a rounded rectangle on the right-top and right-bottom.

Contributes to CURA-5962.
2018-11-20 16:28:21 +01:00
Ghostkeeper
6de24250ed
Make icon height equal to text height
This seems to be about the same actually as what it was. But now the relation is in there.
I also made the right icon inherit as much as possible from the left icon so that if we change something, we only have to change it in the left icon.

Contributes to issue CURA-5876.
2018-11-20 14:50:12 +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
Diego Prado Gesto
76f2aeb43c Fix the title's top margin size in the add machine dialog. 2018-11-20 11:27:45 +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
16deeb0951
Remove old QuickConfigurationSelector
It doesn't exist any more.

Contributes to issue CURA-5876.
2018-11-19 17:10:29 +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
Ghostkeeper
30b20b4aa5
Add borders to expandable components
This adds a lining to all of the drop-downs from the stage menus.

Contributes to issue CURA-5876.
2018-11-19 13:50:32 +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
a490e420f0 Prevent the setting items from being recreated every stage switch
CURA-5785
2018-11-19 11:42:04 +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