Diego Prado Gesto
990c653af4
Refactor the code a bit more to better align the components in the
...
recommended mode.
Contributes to CURA-5941.
2018-11-28 17:29:25 +01:00
Aleksei S
0fdaebaaf8
Updated action button
...
CURA-5941
2018-11-28 13:51:54 +01:00
Diego Prado Gesto
56f20648f5
Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown
2018-11-28 11:58:55 +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
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
af1ee53578
Fix the hover effect of action button
...
CURA-5959
2018-11-23 17:41:58 +01:00
Jaime van Kessel
3f4d379908
Added shadow to slice button
...
CURA-5959
2018-11-22 15:35:40 +01:00
Jaime van Kessel
a1613c7f81
Set the variable types of the Action button to the right kind.
...
Because of boyscouting; these must be colors (and not generic vars)
2018-11-22 13:53:27 +01:00
Aleksei S
4bccd2b7b5
Restyle printer settings dropdown
...
CURA-5941
2018-11-20 23:46:03 +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
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
Remco Burema
aef5c67652
Merge branch 'cura4.0_action_panel' into cura4.0_header
2018-11-08 11:50:14 +01:00
Diego Prado Gesto
5dddcbd666
Add a new property to the ActionButton to indicate whether the button
...
has a fixed width or the width will be dependant on the content.
Contributes to CURA-5786.
2018-11-06 15:14:27 +01:00
Jaime van Kessel
11a3da3068
Removed color animation from stage buttons
...
This caused laggy updates and it didn't add that much anyway
CURA-5772
2018-11-06 11:06:20 +01:00
Diego Prado Gesto
ec0d9f09b7
Create a component for selecting the output device before output the
...
file.
Contributes to CURA-5786.
2018-10-31 17:03:09 +01:00
Diego Prado Gesto
a277bd9f3b
Don't use the hand cursor in the action buttons by default.
...
Contributes to CURA-5784.
2018-10-26 11:29:05 +02:00
Diego Prado Gesto
bf1c23243e
Modify the styles to match the requirements.
...
Contributes to CURA-5784.
2018-10-24 09:55:51 +02:00
Diego Prado Gesto
fdfa81b2b8
Make some items' size dependent on parent's. Also make the ActionButton
...
more themable.
Contributes to CURA-5784.
2018-10-18 16:06:21 +02:00
Jaime van Kessel
8cac5e1de2
Removed the components qml dir
...
We can consider putting components into their own folder, but we first should have a clear definition of what they are / should be.
CURA-5772
2018-10-15 10:34:19 +02:00
