3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 22:13:58 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge branch 'CURA-8421_Introduce_app_switcher' into CURA-8422_add_platform_links

Browse source
This commit is contained in:
Konstantinos Karmas 2021-09-21 11:35:02 +02:00
commit cd505d575d
7 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

14
resources/qml/ApplicationSwitcher/ApplicationButton.qml
View file

@ -36,14 +36,13 @@ Button
{
id: applicationButtonContent
anchors.centerIn: parent
spacing: UM.Theme.getSize("default_margin").width
UM.RecolorImage
{
id: applicationIcon
anchors.horizontalCenter: parent.horizontalCenter
color: UM.Theme.getColor("monitor_icon_primary")
color: UM.Theme.getColor("icon")
width: UM.Theme.getSize("application_switcher_icon").width
height: width
@ -65,7 +64,7 @@ Button
{
id: externalLinkIndicatorBackground
anchors.centerIn: parent
width: UM.Theme.getSize("small_button_icon").width
width: UM.Theme.getSize("icon_indicator_background").width
height: width
color: base.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
radius: 0.5 * width
@ -76,9 +75,9 @@ Button
id: externalLinkIndicatorIcon
anchors.centerIn: parent
width: UM.Theme.getSize("printer_status_icon").width
width: UM.Theme.getSize("icon_indicator").width
height: width
color: UM.Theme.getColor("monitor_icon_primary")
color: UM.Theme.getColor("icon")
source: UM.Theme.getIcon("LinkExternal")
}
}
@ -91,10 +90,11 @@ Button
anchors.horizontalCenter: parent.horizontalCenter
width: base.width - UM.Theme.getSize("default_margin").width
height: base.height - applicationIcon.height - 2 * UM.Theme.getSize("default_margin").width // Account for the top and bottom margins
horizontalAlignment: Text.AlignHCenter
maximumLineCount: 2
verticalAlignment: Text.AlignVCenter
wrapMode: Text.Wrap
elide: Text.ElideRight
}
}
}
}

34
resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
View file

@ -11,13 +11,12 @@ import Cura 1.1 as Cura
Item
{
id: applicationSwitcherWidget
width: appSwitcherButton.width
width: applicationSwitcherButton.width
height: width
Button
{
id: appSwitcherButton
id: applicationSwitcherButton
anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter
@ -26,29 +25,29 @@ Item
background: UM.RecolorImage
{
width: UM.Theme.getSize("small_button_icon").width
width: parent.width
height: width
anchors.verticalCenter: appSwitcherButton.verticalCenter
anchors.horizontalCenter: appSwitcherButton.horizontalCenter
anchors.verticalCenter: applicationSwitcherButton.verticalCenter
anchors.horizontalCenter: applicationSwitcherButton.horizontalCenter
color: UM.Theme.getColor("main_background")
source: UM.Theme.getIcon("ApplicationSwitcher")
source: UM.Theme.getIcon("BlockGrid")
}
onClicked:
{
if (popup.opened)
if (applicationSwitcherPopup.opened)
{
popup.close()
applicationSwitcherPopup.close()
} else {
popup.open()
applicationSwitcherPopup.open()
}
}
}
Popup
{
id: popup
id: applicationSwitcherPopup
y: parent.height + UM.Theme.getSize("default_arrow").height
x: parent.width - width
@ -63,7 +62,7 @@ Item
contentItem: Item
{
id: projectListContainer
id: applicationsContainer
anchors.fill: parent
anchors.margins: UM.Theme.getSize("wide_margin").width
@ -73,17 +72,16 @@ Item
anchors.top: parent.top
anchors.left: parent.left
width: gridLayout.width
width: ultimakerPlatformLinksGrid.width
Grid
{
id: gridLayout
id: ultimakerPlatformLinksGrid
columns: 3
spacing: UM.Theme.getSize("default_margin").width
Repeater
{
id:gridgenerate
model:
[
{
@ -147,7 +145,7 @@ Item
displayName: modelData.displayName
iconSource: modelData.thumbnail
tooltipText: modelData.description
isExternalLink: (index % 2 == 0)
isExternalLink: true
onClicked: Qt.openUrlExternally(modelData.link)
}
@ -163,7 +161,7 @@ Item
borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width
target: Qt.point(width - (appSwitcherButton.width / 2), -10)
target: Qt.point(width - (applicationSwitcherButton.width / 2), -10)
arrowSize: UM.Theme.getSize("default_arrow").width
}