Settings: fully cleanup and aligned
This commit is contained in:
parent
c108e7707a
commit
a61b2edd07
6 changed files with 25 additions and 26 deletions
|
|
@ -63,7 +63,7 @@ NPanel {
|
||||||
|
|
||||||
NIconButton {
|
NIconButton {
|
||||||
icon: "close"
|
icon: "close"
|
||||||
tooltipText: "Close"
|
tooltipText: "Close."
|
||||||
sizeRatio: 0.8
|
sizeRatio: 0.8
|
||||||
onClicked: {
|
onClicked: {
|
||||||
root.close()
|
root.close()
|
||||||
|
|
|
||||||
|
|
@ -325,7 +325,7 @@ Variants {
|
||||||
// Close button positioned absolutely
|
// Close button positioned absolutely
|
||||||
NIconButton {
|
NIconButton {
|
||||||
icon: "close"
|
icon: "close"
|
||||||
tooltipText: "Close"
|
tooltipText: "Close."
|
||||||
sizeRatio: 0.6
|
sizeRatio: 0.6
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.topMargin: Style.marginM * scaling
|
anchors.topMargin: Style.marginM * scaling
|
||||||
|
|
|
||||||
|
|
@ -65,7 +65,7 @@ NPanel {
|
||||||
|
|
||||||
NIconButton {
|
NIconButton {
|
||||||
icon: "close"
|
icon: "close"
|
||||||
tooltipText: "Close"
|
tooltipText: "Close."
|
||||||
sizeRatio: 0.8
|
sizeRatio: 0.8
|
||||||
onClicked: {
|
onClicked: {
|
||||||
root.close()
|
root.close()
|
||||||
|
|
|
||||||
|
|
@ -474,7 +474,7 @@ NPanel {
|
||||||
// Main title
|
// Main title
|
||||||
NText {
|
NText {
|
||||||
text: root.tabsModel[currentTabIndex]?.label || ""
|
text: root.tabsModel[currentTabIndex]?.label || ""
|
||||||
font.pointSize: Style.fontSizeXXL * scaling
|
font.pointSize: Style.fontSizeXL * scaling
|
||||||
font.weight: Style.fontWeightBold
|
font.weight: Style.fontWeightBold
|
||||||
color: Color.mPrimary
|
color: Color.mPrimary
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
|
|
@ -484,7 +484,7 @@ NPanel {
|
||||||
// Close button
|
// Close button
|
||||||
NIconButton {
|
NIconButton {
|
||||||
icon: "close"
|
icon: "close"
|
||||||
tooltipText: "Close"
|
tooltipText: "Close."
|
||||||
Layout.alignment: Qt.AlignVCenter
|
Layout.alignment: Qt.AlignVCenter
|
||||||
onClicked: root.close()
|
onClicked: root.close()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -10,23 +10,23 @@ import qs.Widgets
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: root
|
id: root
|
||||||
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
property string latestVersion: GitHubService.latestVersion
|
property string latestVersion: GitHubService.latestVersion
|
||||||
property string currentVersion: UpdateService.currentVersion
|
property string currentVersion: UpdateService.currentVersion
|
||||||
property var contributors: GitHubService.contributors
|
property var contributors: GitHubService.contributors
|
||||||
|
|
||||||
NText {
|
NHeader {
|
||||||
text: "Noctalia Shell"
|
label: "Noctalia Shell"
|
||||||
font.pointSize: Style.fontSizeXXXL * scaling
|
description: "A sleek and minimal desktop shell thoughtfully crafted for Wayland, built with Quickshell."
|
||||||
font.weight: Style.fontWeightBold
|
|
||||||
color: Color.mOnSurface
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
Layout.bottomMargin: Style.marginS * scaling
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
RowLayout {
|
||||||
|
spacing: Style.marginL * scaling
|
||||||
|
|
||||||
|
|
||||||
// Versions
|
// Versions
|
||||||
GridLayout {
|
GridLayout {
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
columns: 2
|
columns: 2
|
||||||
rowSpacing: Style.marginXS * scaling
|
rowSpacing: Style.marginXS * scaling
|
||||||
columnSpacing: Style.marginS * scaling
|
columnSpacing: Style.marginS * scaling
|
||||||
|
|
@ -34,7 +34,6 @@ ColumnLayout {
|
||||||
NText {
|
NText {
|
||||||
text: "Latest Version:"
|
text: "Latest Version:"
|
||||||
color: Color.mOnSurface
|
color: Color.mOnSurface
|
||||||
Layout.alignment: Qt.AlignRight
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NText {
|
NText {
|
||||||
|
|
@ -46,7 +45,6 @@ ColumnLayout {
|
||||||
NText {
|
NText {
|
||||||
text: "Installed Version:"
|
text: "Installed Version:"
|
||||||
color: Color.mOnSurface
|
color: Color.mOnSurface
|
||||||
Layout.alignment: Qt.AlignRight
|
|
||||||
}
|
}
|
||||||
|
|
||||||
NText {
|
NText {
|
||||||
|
|
@ -56,10 +54,13 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Updater
|
Item {
|
||||||
|
Layout.fillWidth: true
|
||||||
|
}
|
||||||
|
|
||||||
|
// Update button
|
||||||
Rectangle {
|
Rectangle {
|
||||||
Layout.alignment: Qt.AlignCenter
|
Layout.alignment: Qt.alignmentRight
|
||||||
Layout.topMargin: Style.marginS * scaling
|
|
||||||
Layout.preferredWidth: Math.round(updateRow.implicitWidth + (Style.marginL * scaling * 2))
|
Layout.preferredWidth: Math.round(updateRow.implicitWidth + (Style.marginL * scaling * 2))
|
||||||
Layout.preferredHeight: Math.round(Style.barHeight * scaling)
|
Layout.preferredHeight: Math.round(Style.barHeight * scaling)
|
||||||
radius: Style.radiusL * scaling
|
radius: Style.radiusL * scaling
|
||||||
|
|
@ -115,23 +116,21 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
NDivider {
|
NDivider {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
Layout.topMargin: Style.marginXL * scaling
|
Layout.topMargin: Style.marginXL * scaling
|
||||||
Layout.bottomMargin: Style.marginXL * scaling
|
Layout.bottomMargin: Style.marginXL * scaling
|
||||||
}
|
}
|
||||||
|
|
||||||
NText {
|
NHeader {
|
||||||
text: `Shout-out to our ${root.contributors.length} <b>awesome</b> contributors!`
|
label: "Contributors"
|
||||||
font.pointSize: Style.fontSizeL * scaling
|
description: `Shout-out to our ${root.contributors.length} <b>awesome</b> contributors!`
|
||||||
color: Color.mOnSurface
|
|
||||||
Layout.alignment: Qt.AlignCenter
|
|
||||||
}
|
}
|
||||||
|
|
||||||
GridView {
|
GridView {
|
||||||
id: contributorsGrid
|
id: contributorsGrid
|
||||||
|
|
||||||
Layout.topMargin: Style.marginL * scaling
|
|
||||||
Layout.alignment: Qt.AlignHCenter
|
Layout.alignment: Qt.AlignHCenter
|
||||||
Layout.preferredWidth: cellWidth * 3 // Fixed 3 columns
|
Layout.preferredWidth: cellWidth * 3 // Fixed 3 columns
|
||||||
Layout.preferredHeight: {
|
Layout.preferredHeight: {
|
||||||
|
|
|
||||||
|
|
@ -64,7 +64,7 @@ NPanel {
|
||||||
|
|
||||||
NIconButton {
|
NIconButton {
|
||||||
icon: "close"
|
icon: "close"
|
||||||
tooltipText: "Close"
|
tooltipText: "Close."
|
||||||
sizeRatio: 0.8
|
sizeRatio: 0.8
|
||||||
onClicked: root.close()
|
onClicked: root.close()
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue