Commit graph

16778 commits

Author SHA1 Message Date
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
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
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
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
6fe89e3d54 Fix width of simulationView component not being set correctly
CURA-5785
2018-11-19 10:33:19 +01:00
Jaime van Kessel
e3ebf89092 Ensure that width of popup does not get set to 0
CURA-5785
2018-11-16 17:26:10 +01:00
Jaime van Kessel
6b55490af8 Fix final QML warnings
CURA-5785
2018-11-16 16:30:47 +01:00
Jaime van Kessel
bc5a2ce5b0 Make ViewSelector panel close upon selecting different view
CURA-5785
2018-11-16 16:16:15 +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
Jaime van Kessel
d661a8e626 Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 15:23:38 +01:00
Jaime van Kessel
42399ecb24 Let headerItem fill entire component if no icon is set
CURA-5785
2018-11-16 15:17:34 +01:00
Jaime van Kessel
b72f1bb314 Add missing screenScaleFactor for implicit sizes
CURA-5785
2018-11-16 15:15:44 +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
fe15a0a513 Made width of machineSelector popup depend on size of the element
CURA-5785
2018-11-16 15:09:47 +01:00
Jaime van Kessel
5972bfaf03 Add round to minContentWidth
This prevents text from getting a weird width

CURA-5785
2018-11-16 15:06:21 +01:00
Jaime van Kessel
320efa443e Merge branch 'CURA-5785-Restyle_stage_menu' of github.com:Ultimaker/Cura into CURA-5785-Restyle_stage_menu 2018-11-16 14:58:47 +01:00
Jaime van Kessel
3fd1cc0e8c Ensure that the added labels are also themable
CURA-5785
2018-11-16 14:58:11 +01:00
Ghostkeeper
3ef6d0544a
Fix spelling and indents
Ant-fuckery, as they say in the low lands.

Contributes to issue CURA-5785.
2018-11-16 14:11:23 +01:00
Ghostkeeper
e087db7c2e
Code style and fixes to comments
Contributes to issue CURA-5785.
2018-11-16 14:11:22 +01:00
Ghostkeeper
514fc13045
Remove redundant documentation
CURA-5875

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:04:33 +01:00
Ghostkeeper
81b6f3ab11
Update unclear qml ID's
CURA-5785

Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:03:39 +01:00
Ghostkeeper
de020b4c75
Remove commented out code
Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 14:02:00 +01:00
Ghostkeeper
e3dd5f1c39
Add documentation about qml z fix
Co-Authored-By: nallath <nallath@gmail.com>
2018-11-16 13:59:51 +01:00
Ghostkeeper
bee563f01b
Merge branch 'ui_rework_4_0' into CURA-5785-Restyle_stage_menu 2018-11-16 13:02:24 +01:00
Ghostkeeper
d732a2f953
Merge branch 'master' into ui_rework_4_0 2018-11-15 15:55:08 +01:00
Ghostkeeper
e9216936d7
Compare SDK version as Version instances
This allows it to compare versions that are remote as integer and local as string, or vice-versa. Much more robust.

Contributes to issue CURA-5940.
2018-11-15 15:20:21 +01:00
Ghostkeeper
78e6494430
Read SDK version from new semver field
The sdk_version field should stay the ordinary plain number (the major version number of the semver field) so that older Cura versions don't break. Newly built packages will get built with both sdk_version_semver and the normal sdk_version, so that the packages can be read with any Cura version from 3.6 onwards.

Contributes to issue CURA-5940.
2018-11-15 15:13:36 +01:00
Jaime van Kessel
6dd6f5ecc7 Made the hardcoded values of ExpandableComponent themable
CURA-5785
2018-11-15 14:11:46 +01:00
Jaime van Kessel
3629e3b604 Added highlight to ExpandableComponent
CURA-5785
2018-11-15 14:04:52 +01:00
Jaime van Kessel
eca9820fc4 Add toggle function to expandable popup
Also ensures that the machineSelector closes the popup on making a choice

CURA-5785
2018-11-15 13:55:33 +01:00
Jaime van Kessel
f0b8c1e611 Fix some minor display issues
CURA-5785
2018-11-15 09:45:46 +01:00
Ghostkeeper
163f102dda
Make extension menu items translatable
If these extension plug-ins don't set their menu names, the plug-in name is used as the menu name. The plug-in names are not translated, so this appears as an untranslated string then.
2018-11-15 09:38:14 +01:00
Jaime van Kessel
c08aa2205c Fix enabled checkbox for extruder selection
CURA-5785
2018-11-15 09:37:54 +01:00
Jaime van Kessel
21d7619a45 Added a hover effect to the expandableComponent
CURA-5785
2018-11-14 16:57:05 +01:00
Jaime van Kessel
20b7a925a0 Remove unused code & outdated todo comment
CURA-5785
2018-11-14 16:49:01 +01:00
Jaime van Kessel
9aa5b6fe3f Hide one spacer if there is no viewPanel
CURA-5785
2018-11-14 16:47:53 +01:00
Jaime van Kessel
c27f51d944 Make the view selector also use the expandableComponent
CURA-5785
2018-11-14 16:44:36 +01:00
Jaime van Kessel
429a49aa2e Make the default size of the expandableComponent icon depend on the height of the element
This is a way more sensible default.

CURA-5785
2018-11-14 14:06:55 +01:00
Jaime van Kessel
7ca3490097 Make the collapse arrows consistent with the rest of the UI
CURA-5785
2018-11-14 14:00:19 +01:00