Commit graph

3676 commits

Author SHA1 Message Date
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
dbb62f2490 Add default icons for the avatar.
Contributes to CURA-5784.
2018-10-22 11:31:19 +02:00
Diego Prado Gesto
69fc1e5bfb Reuse ActionButton component to create the toolbox shortcut.
Contributes to CURA-5784.
2018-10-22 10:30:06 +02:00
Diego Prado Gesto
17732b1169 Make the spacing between the orientation controls be dependent on the
theme.

Contributes to CURA-5772.
2018-10-19 17:04:40 +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
6f12197cea Don't use an image to create a mask but a circle.
Contributes to CURA-5772.
2018-10-19 13:41:32 +02:00
Diego Prado Gesto
54f32a1d82 Merge branch 'ui_rework_4_0' into cura4.0_header 2018-10-18 19:33:39 +02:00
Diego Prado Gesto
405e4c5bbd Correct year, we live now in 2018 (keep it in mind)
Contributes to CURA-5772.
2018-10-18 17:52:42 +02:00
Diego Prado Gesto
176c7bfc22 Small fixes in the CustomConfigurationSelector file
Contributes to CURA-5772.
2018-10-18 17:48:03 +02:00
Diego Prado Gesto
bf6817ce7a Reduce the size of the ApplicationMenu.qml file by moving some
components out to different files.

Contributes to CURA-5772.
2018-10-18 17:38:23 +02:00
Diego Prado Gesto
84adfa14ee Add license to the top of a file
Contributes to CURA-5772.
2018-10-18 17:26:10 +02:00
Diego Prado Gesto
93b04190f8 Change name of some components to make them more indicative of what they
do.

Contributes to CURA-5772.
2018-10-18 17:13:15 +02:00
Diego Prado Gesto
8df3eb33d4 Minor changes: remove empty lines, small changes in the anchors, ...
Contributes to CURA-5772.
2018-10-18 16:51:32 +02:00
Diego Prado Gesto
1cc7e0e586 Set the height of the stage menu in the theme instead of hardcoded.
I also adjusted a bit the design to fulfill the requirments from UX/UI
team.

Contributes to CURA-5772.
2018-10-18 16:33:13 +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
Diego Prado Gesto
0a07f48375 Fix typo in a theme's key.
Contributes to CURA-5784.
2018-10-18 15:38:24 +02:00
Diego Prado Gesto
b82dacbe19 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-18 15:19:07 +02:00
Diego Prado Gesto
237c360a88 The size of the avatar image is now themed.
Some other small fixes in the AccountDetails componenent were done.

Contributes to CURA-5784.
2018-10-18 15:18:00 +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
a4c609d514 Remove email label from the account widget.
It's not needed and it's not currently public data that is published
with the user token.

Contributes to CURA-5784.
2018-10-18 14:28:00 +02:00
Diego Prado Gesto
11693aad36 Change the behaviour of the Popup, that now closes when clicking the
widget if it is open.

Contributes to CURA-5784.
2018-10-18 09:51:42 +02:00
Diego Prado Gesto
54554bff89 Adjust colors to work with dark theme.
Contributes to CURA-5784.
2018-10-18 09:51:04 +02:00
Diego Prado Gesto
7fb72a1a58 Change Skeleton folder name to MainWindow.
This folder is intended to store the files that construct the main
window. All the parts. The rest of the components are stored in more
specific folders.

Contributes to CURA-5784.
2018-10-17 16:13:43 +02:00
Diego Prado Gesto
b670cd82c4 Merge branch 'master' into cura4.0_header 2018-10-17 16:10:45 +02:00
Jaime van Kessel
4c5bf3297c Merge branch 'master' of github.com:Ultimaker/Cura into CURA-5734-rework-and-unit-test-setting-visibility-preset 2018-10-17 10:49:29 +02:00
Jaime van Kessel
d086e6fa86 Fix review comments
CURA-5734
2018-10-17 10:47:34 +02:00
Jaime van Kessel
304a9e11f3 Moved view selection back into Cura QML
It didn't make a whole lot of sense for it to be a seperate component, since it's probably going to change in the future

CURA-5772
2018-10-17 09:50:24 +02:00
Diego Prado Gesto
4a0808378b Allow whitespaces in the job name.
Fixes #4530.
2018-10-16 13:23:35 +02:00
Jaime van Kessel
553e29b9b8 Fix QML warnings
CURA-5772
2018-10-15 15:42:17 +02:00
Jaime van Kessel
2455961ac7 Vertically allign the toolbar
CURA-5772
2018-10-15 15:16:28 +02:00
Jaime van Kessel
1c70a62df6 Fix typo
Derp. CURA-5772
2018-10-15 15:10:50 +02:00
Jaime van Kessel
a7edd893d7 Change the order in which ViewOrientationControls and ProgressAndSaveWidget are drawn.
This will ensure that if a stage sets a mainComponent that it won't have any other items drawn over it.

CURA-5772
2018-10-15 15:08:58 +02:00
Jaime van Kessel
a473a46a35 Add a bit more documentation to explain what the elements do
CURA-5772
2018-10-15 15:07:46 +02:00
Jaime van Kessel
1e3a9ff57c Removed the expandSidebar action
Since we don't even have a sidebar anymore, there is no point in expanding it.
2018-10-15 14:23:42 +02:00
Jaime van Kessel
4e432a5f06 Remove SidebarHeader
It has been replaced by others, so we don't need it anymore

CURA-5772
2018-10-15 14:21:03 +02:00
Jaime van Kessel
f6ae19003b The AccountDetails Panel is now an actual popup
This ensures that it's always visible (previously it was ocluded by the StageMenu)

CURA-5772
2018-10-15 14:07:30 +02:00
Jaime van Kessel
62c9980438 Move SidebarTooltip so that it's no longer ocluded by other objects
CURA-5772
2018-10-15 14:07:01 +02:00
Jaime van Kessel
0a1dad92ea Change AvatarImage so it uses aliases instead of properties
I've changed this because it makes for much cleaner QML

CURA-5772
2018-10-15 13:41:44 +02:00
Jaime van Kessel
d2baef97c4 Fix tooltips for settings
CURA-5772
2018-10-15 11:07:03 +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
Jaime van Kessel
fc1faf79f5 Cleanup unused code
CURA-5772
2018-10-15 09:52:48 +02:00
Jaime van Kessel
2fce1e433a Fix the tooltips for time estimations
CURA-5772
2018-10-15 09:49:08 +02:00
Ghostkeeper
9e4fcd820e
Update outputDevice when the global container changed
And directly link the active printer name to it, so that that also gets updated. With the property var it just gets evaluated upon creating the rectangle.

Contributes to issue CURA-5749.
2018-10-12 14:56:27 +02:00
Jaime van Kessel
11a08d0e47 Move whole bunch of QML components to their new locations
The tooltips are still not working correctly, it might be that it needs rework

CURA-5772
2018-10-12 13:32:23 +02:00
Jaime van Kessel
10de312647 Added QMLDIR so we can specify cura specific QML components for plugins
This ensures that we can be way more explicit with what QML components we see as re-usable

CURA-5772
2018-10-12 13:28:08 +02:00
Jaime van Kessel
6ea03d27a4 Merge branch 'cura4.0_header' of github.com:Ultimaker/Cura into cura4.0_header 2018-10-12 13:26:53 +02:00
Ghostkeeper
bb75821599
Fix some code style
Contributes to issue CURA-5784.
2018-10-11 15:29:28 +02:00
Jaime van Kessel
9ab0fdfb68 Move most of the sidebarHeader items to materialAndVariantSelector
CURA-5772
2018-10-11 15:05:40 +02:00
Jaime van Kessel
a861b88de1 Move most of the sidebarHeader items to materialAndVariantSelector
CURA-5772
2018-10-11 15:03:37 +02:00
Jaime van Kessel
f18d490ca1 Move extruderIcon to it's own location
This also simplifies the qml that actually handles the display

CURA-5772
2018-10-11 13:08:57 +02:00