GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-04-30 07:44:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename the qml elements and the theme entries used in AppSwitcher

Browse Source 
To some more sensible names (hopefully).

CURA-8421
This commit is contained in:
Konstantinos Karmas 2021-09-20 17:19:37 +02:00
parent d844c5f70a
commit fea8ecd55f
3 changed files with 20 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
resources/qml/ApplicationSwitcher/ApplicationButton.qml
View File

@ -42,7 +42,7 @@ Button
id: applicationIcon id: applicationIcon
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
color: UM.Theme.getColor("monitor_icon_primary") color: UM.Theme.getColor("icon")
width: UM.Theme.getSize("application_switcher_icon").width width: UM.Theme.getSize("application_switcher_icon").width
height: width height: width
@ -64,7 +64,7 @@ Button
{ {
id: externalLinkIndicatorBackground id: externalLinkIndicatorBackground
anchors.centerIn: parent anchors.centerIn: parent
width: UM.Theme.getSize("small_button_icon").width width: UM.Theme.getSize("icon_indicator_background").width
height: width height: width
color: base.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button") color: base.hovered ? UM.Theme.getColor("action_button_hovered") : UM.Theme.getColor("action_button")
radius: 0.5 * width radius: 0.5 * width
@ -75,9 +75,9 @@ Button
id: externalLinkIndicatorIcon id: externalLinkIndicatorIcon
anchors.centerIn: parent anchors.centerIn: parent
width: UM.Theme.getSize("printer_status_icon").width width: UM.Theme.getSize("icon_indicator").width
height: width height: width
color: UM.Theme.getColor("monitor_icon_primary") color: UM.Theme.getColor("icon")
source: UM.Theme.getIcon("LinkExternal") source: UM.Theme.getIcon("LinkExternal")
} }
} }

28
resources/qml/ApplicationSwitcher/ApplicationSwitcher.qml
View File

@ -11,13 +11,12 @@ import Cura 1.1 as Cura
Item Item
{ {
id: applicationSwitcherWidget id: applicationSwitcherWidget
width: appSwitcherButton.width width: applicationSwitcherButton.width
height: width height: width
Button Button
{ {
id: appSwitcherButton id: applicationSwitcherButton
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
@ -28,8 +27,8 @@ Item
{ {
width: parent.width width: parent.width
height: width height: width
anchors.verticalCenter: appSwitcherButton.verticalCenter anchors.verticalCenter: applicationSwitcherButton.verticalCenter
anchors.horizontalCenter: appSwitcherButton.horizontalCenter anchors.horizontalCenter: applicationSwitcherButton.horizontalCenter
color: UM.Theme.getColor("main_background") color: UM.Theme.getColor("main_background")
source: UM.Theme.getIcon("ApplicationSwitcher") source: UM.Theme.getIcon("ApplicationSwitcher")
@ -37,18 +36,18 @@ Item
onClicked: onClicked:
{ {
if (popup.opened) if (applicationSwitcherPopup.opened)
{ {
popup.close() applicationSwitcherPopup.close()
} else { } else {
popup.open() applicationSwitcherPopup.open()
} }
} }
} }
Popup Popup
{ {
id: popup id: applicationSwitcherPopup
y: parent.height + UM.Theme.getSize("default_arrow").height y: parent.height + UM.Theme.getSize("default_arrow").height
x: parent.width - width x: parent.width - width
@ -63,7 +62,7 @@ Item
contentItem: Item contentItem: Item
{ {
id: projectListContainer id: applicationsContainer
anchors.fill: parent anchors.fill: parent
anchors.margins: UM.Theme.getSize("wide_margin").width anchors.margins: UM.Theme.getSize("wide_margin").width
@ -73,17 +72,16 @@ Item
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
width: gridLayout.width width: ultimakerPlatformLinksGrid.width
Grid Grid
{ {
id: gridLayout id: ultimakerPlatformLinksGrid
columns: 3 columns: 3
spacing: UM.Theme.getSize("default_margin").width spacing: UM.Theme.getSize("default_margin").width
Repeater Repeater
{ {
id:gridgenerate
model: model:
[ [
{ displayName: "Report issue1", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description1", link: "https://github.com/Ultimaker/Cura/issues/1" }, { displayName: "Report issue1", thumbnail: UM.Theme.getIcon("Bug"), description: "This is the description1", link: "https://github.com/Ultimaker/Cura/issues/1" },
@ -114,7 +112,7 @@ Item
borderColor: UM.Theme.getColor("lining") borderColor: UM.Theme.getColor("lining")
borderWidth: UM.Theme.getSize("default_lining").width 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 arrowSize: UM.Theme.getSize("default_arrow").width
} }

3
resources/themes/cura-light/theme.json
View File

@ -574,6 +574,9 @@
"favorites_button": [2, 2], "favorites_button": [2, 2],
"favorites_button_icon": [1.2, 1.2], "favorites_button_icon": [1.2, 1.2],
"icon_indicator_background": [1.5, 1.5],
"icon_indicator": [1, 1],
"printer_status_icon": [1.0, 1.0], "printer_status_icon": [1.0, 1.0],
"printer_sync_icon": [1.2, 1.2], "printer_sync_icon": [1.2, 1.2],