Commit graph

74 commits

Author SHA1 Message Date
Jaime van Kessel
a0031853d3 Fix button color in toolpanel for dark theme 2019-01-02 11:32:49 +01:00
Diego Prado Gesto
0d780e61ff
Merge branch '4.0' into CURA-5876_fixes 2018-12-13 14:39:11 +01:00
Diego Prado Gesto
a1d7fa893d Change the style for the toolbuttons that appear in the popup panel of some tools
Contributes to CURA-6024
2018-12-12 17:26:13 +01:00
Diego Prado Gesto
f99c788eb6 Change some colors for the arrows in some setting selectors
Contributes to CURA-5876.
2018-12-11 16:35:59 +01:00
Diego Prado Gesto
1d33fe081f Clean up the code
Remove all the references to the sidebar and use the term print_setup instead.

Contributes to CURA-5941.
2018-12-07 12:07:41 +01:00
Diego Prado Gesto
3b8b70bddf Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-06 16:35:07 +01:00
Diego Prado Gesto
4b79770d58 Align the buttons in the output process widget
The menu in the output device selector has now a rounded corner.
2018-12-06 13:42:29 +01:00
Diego Prado Gesto
07d58c3aef Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-05 13:56:21 +01:00
Ghostkeeper
4d87c46423
Remove sourceSize.width: width from all RecolorImages
It is now the default in Uranium.

Contributes to issue CURA-5876.
2018-12-04 15:04:51 +01:00
Diego Prado Gesto
ca3c639069 Merge branch 'ui_rework_4_0' into CURA-5941_restyle_setting_dropdown 2018-12-04 09:03:13 +01:00
Diego Prado Gesto
004405e5f9 Change the colors to match the designs.
Contributes to CURA-5941.
2018-12-03 17:25:07 +01:00
Diego Prado Gesto
ce6a0676dd Add a rectangle surrounding the settings listview
Contributes to CURA-5941.
2018-12-03 14:43:35 +01:00
Diego Prado Gesto
4c468831f0 Add tabs for select the extruder in the custom print setup.
Align some elements beneath the tabs.

Contributes to CURA-5941.
2018-12-03 13:58:13 +01:00
Ghostkeeper
7df4c01814
Merge branch 'ui_rework_4_0' into CURA-5876-Configuration_dropdown
Conflicts:
	cura/Settings/MachineManager.py -> rowCount vs. count
	resources/qml/ExtruderIcon.qml -> Someone changed stuff that I had overwritten.
	resources/qml/Menus/ConfigurationMenu/PrintCoreConfiguration.qml -> Someone changed stuff that I had removed.
	resources/qml/Toolbar.qml -> Git was wrong, not a conflict.
	resources/themes/cura-light/theme.json -> Git was wrong, not a conflict.
2018-12-03 11:45:05 +01:00
Diego Prado Gesto
90281c455b Add global profile selector to the custom print setup panel
Also modify some styles to adjust to the designs.

Contributes to CURA-5941.
2018-12-03 09:45:49 +01:00
Diego Prado Gesto
1cea36b08a Add the row for the support selection in the recommended mode
Contributes to CURA-5941.
2018-12-02 19:01:54 +01:00
Diego Prado Gesto
1caccfb577 Add a binding to react when the infill density changes in the custom panel
Also make the icon dinamic, that will change when the infill density changes.

Contributes to CURA-5941.
2018-12-02 13:40:41 +01:00
Ghostkeeper
f4950cf92b
Give checkboxes a style if they're disabled
Contributes to issue CURA-5876.
2018-11-30 17:04:50 +01:00
Lipu Fei
6db52dde46 Fix merge conflicts from ui_rework_40
CURA-5943
2018-11-29 15:27:06 +01:00
Diego Prado Gesto
14b460a626 Remove unused styles 2018-11-27 17:25:10 +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
a825daea95 Cleanup the Theme.json
There were a lot of sizes that weren't used
2018-11-26 17:10:48 +01:00
Lipu Fei
6bed1c1390 Move monitor_checkable_button_style out to styles.qml
CURA-5943
2018-11-26 13:21:55 +01:00
Lipu Fei
d6614941dc Update QtQuick import versions in styles.qml
CURA-5943
2018-11-26 13:15:25 +01:00
Lipu Fei
6bb010e74a Move MonitorButtonStyle to styles.qml
CURA-5943
2018-11-26 13:14:26 +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
Diego Prado Gesto
895590c3d0 Change the size of the progress bar control. Also add the rounded
rectangle.

Contributes to the new Cura UI-Flow.
2018-11-20 14:28:54 +01:00
Diego Prado Gesto
f534885e34 Modify the color behavior of the toolbar buttons. 2018-11-12 09:35:32 +01:00
Diego Prado Gesto
9bf18031ce Apply restyle of the toolbar according to the new designs. 2018-11-11 19:15:02 +01:00
Diego Prado Gesto
38a80ecae5 Make some tweaks in the UI for the preview stage.
Clean up the default theme a bit by removing unused entries.

Contributes to CURA-5829.
2018-11-11 14:06:52 +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
90e8a05aab Remove all the entries in the theme that make reference to the sidebar,
because there is no sidebar anymore.

Several different margins and linings were created depending on the
side, not depending on where it belongs.

Contributes to CURA-5784.
2018-10-26 17:51:28 +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
15b35da612 Change the TopHeader name to MainWindowHeader, since there is nothing
more on the top than the header.

Contributes to CURA-5784.
2018-10-19 16:40:21 +02:00
Diego Prado Gesto
66147f4172 Remove unused style button.
Contributes to CURA-5772.
2018-10-18 17:49:56 +02:00
Ghostkeeper
1bcd134f85
Fix code style
Most stuff here was recently changed. Some of it was where I found a pattern in something that was likely copy-pasted from somewhere else, so I did a global search and replace on that.

Contributes to issue CURA-5784.
2018-10-18 14:30:33 +02:00
Diego Prado Gesto
5befc0b256 Restyle the dropdown of the accounts, with information about the user
and available operations that can be done when the user is logged in or
not.

Contributes to CURA-5784.
2018-10-10 16:34:55 +02:00
Diego Prado Gesto
b89c220a4d Add linings between tabs in the top header.
Contributes to CURA-5784.
2018-10-10 11:17:09 +02:00
Diego Prado Gesto
0df7fa1a6c Add style to the top header tabs.
Contributes to CURA-5784.
2018-10-10 11:04:08 +02:00
Diego Prado Gesto
075a9a161f Create a component for the Views selector. This component contains the
list of the views and also the shortcuts for the camera position.

The theme colors, sizes and the styles have been updated.

Contributes to CURA-5784.
2018-10-08 12:57:16 +02:00
Aleksei S
6a3eec07e2 Message stack shows properly messages
CURA-4952
2018-05-28 16:03:05 +02:00
fieldOfView
89322b9db6 Move toolbox button style into theme 2018-05-04 10:41:45 +02:00
Mark
b531c0550d Change Math.floor to Math.round as a last try to fix garbled fonts
CURA-4941
2018-02-14 09:28:47 +01:00
Mark
7ea654df3d Fix to make sure margins cant have partial values
CURA-4941
2018-02-13 07:31:02 +01:00
Mark
461da709ff Checked all divisions (again..) and multiplications on rounding errors
CURA-4941
2018-02-10 12:45:36 +01:00
Mark
b52bf6decf resolve conflict 2018-02-09 13:01:56 +01:00
Ghostkeeper
064a8e6f6c
Elide labels next to checkboxes
To the available width, if there is a width.
This won't work for right-to-left languages though...

Contributes to issue CURA-4692.
2018-01-15 16:41:33 +01:00
Ghostkeeper
10f9ae4082
Resolve binding loop
Let's align the icons to the text instead of the text to the icons. This makes it all align from left to right and allows the button to take the width of the childrenRect properly.
2017-12-28 16:21:29 +01:00
Diego Prado Gesto
fa00a17c78 Make UI changes in the Simulation View for adapting the color gradient
in the Feedrate color scheme. Due to the travel speed is normally very
high compared with the other speeds in the model, the gradient is now
gradual instead of linear in order to show more changes in the low
values and less changes in the high values.
Adapt also the button styles and themes' colors.
Set the play/pause button to the left and reduce the size.
2017-11-26 21:21:18 +01:00
Mark
3477b902ab
Merge pull request #2834 from Ultimaker/CURA-4527_view_orientation
Cura 4527 view orientation
2017-11-23 09:56:26 +01:00