never/noctalia-shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Settings window: added separators and renamed Recording to Screen Recorder

Browse source
This commit is contained in:
quadbyte 2025-08-06 19:10:32 -04:00
parent 6ef29ae745
commit 7c2d2b4d66
7 changed files with 1042 additions and 851 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Widgets/SettingsWindow/SettingsWindow.qml
View file

@ -57,7 +57,7 @@ PanelWithOverlay {
"General", "General",
"Bar", "Bar",
"Time & Weather", "Time & Weather",
"Recording", "Screen Recorder",
"Network", "Network",
"Display", "Display",
"Wallpaper", "Wallpaper",
@ -202,7 +202,7 @@ PanelWithOverlay {
text: wallpaperSelector.visible ? "Select Wallpaper" : (activeTabIndex === 0 ? "General" : text: wallpaperSelector.visible ? "Select Wallpaper" : (activeTabIndex === 0 ? "General" :
activeTabIndex === 1 ? "Bar" : activeTabIndex === 1 ? "Bar" :
activeTabIndex === 2 ? "Time & Weather" : activeTabIndex === 2 ? "Time & Weather" :
activeTabIndex === 3 ? "Recording" : activeTabIndex === 3 ? "Screen Recorder" :
activeTabIndex === 4 ? "Network" : activeTabIndex === 4 ? "Network" :
activeTabIndex === 5 ? "Display" : activeTabIndex === 5 ? "Display" :
activeTabIndex === 6 ? "Wallpaper" : activeTabIndex === 6 ? "Wallpaper" :
@ -303,7 +303,7 @@ PanelWithOverlay {
left: parent.left left: parent.left
right: parent.right right: parent.right
bottom: parent.bottom bottom: parent.bottom
margins: 24 margins: 16
topMargin: 32 topMargin: 32
} }
@ -344,7 +344,7 @@ PanelWithOverlay {
{ icon: "tune", text: "General" }, { icon: "tune", text: "General" },
{ icon: "space_dashboard", text: "Bar" }, { icon: "space_dashboard", text: "Bar" },
{ icon: "schedule", text: "Time & Weather" }, { icon: "schedule", text: "Time & Weather" },
{ icon: "photo_camera", text: "Recording" }, { icon: "photo_camera", text: "Screen Recorder" },
{ icon: "wifi", text: "Network" }, { icon: "wifi", text: "Network" },
{ icon: "monitor", text: "Display" }, { icon: "monitor", text: "Display" },
{ icon: "wallpaper", text: "Wallpaper" }, { icon: "wallpaper", text: "Wallpaper" },

2
Widgets/SettingsWindow/Tabs/Bar.qml
View file

@ -21,7 +21,7 @@ ColumnLayout {
Layout.fillWidth: true Layout.fillWidth: true
Text { Text {
text: "Bar Elements" text: "Elements"
font.pixelSize: 18 font.pixelSize: 18
font.bold: true font.bold: true
color: Theme.textPrimary color: Theme.textPrimary

14
Widgets/SettingsWindow/Tabs/General.qml
View file

@ -107,11 +107,23 @@ ColumnLayout {
} }
} }
Rectangle {
Layout.topMargin: 26
Layout.bottomMargin: 18
anchors {
top: headerArea.bottom
left: parent.left
right: parent.right
}
height: 1
color: Theme.outline
opacity: 0.3
}
ColumnLayout { ColumnLayout {
spacing: 4 spacing: 4
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 58
Text { Text {
text: "User Interface" text: "User Interface"

14
Widgets/SettingsWindow/Tabs/Network.qml
View file

@ -97,11 +97,23 @@ ColumnLayout {
} }
} }
Rectangle {
Layout.topMargin: 26
Layout.bottomMargin: 18
anchors {
top: headerArea.bottom
left: parent.left
right: parent.right
}
height: 1
color: Theme.outline
opacity: 0.3
}
ColumnLayout { ColumnLayout {
spacing: 16 spacing: 16
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 58
Text { Text {
text: "Bluetooth" text: "Bluetooth"

1565
Widgets/SettingsWindow/Tabs/Recording.qml
View file

File diff suppressed because it is too large Load diff

14
Widgets/SettingsWindow/Tabs/TimeWeather.qml
View file

@ -168,11 +168,23 @@ ColumnLayout {
} }
} }
Rectangle {
Layout.topMargin: 26
Layout.bottomMargin: 18
anchors {
top: headerArea.bottom
left: parent.left
right: parent.right
}
height: 1
color: Theme.outline
opacity: 0.3
}
ColumnLayout { ColumnLayout {
spacing: 4 spacing: 4
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 58
Text { Text {
text: "Weather" text: "Weather"

276
Widgets/SettingsWindow/Tabs/Wallpaper.qml
View file

@ -1,20 +1,20 @@
import QtQuick import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import qs.Settings
import qs.Components import qs.Components
import qs.Services import qs.Services
import qs.Settings
ColumnLayout { ColumnLayout {
id: root id: root
spacing: 0 spacing: 0
anchors.fill: parent anchors.fill: parent
anchors.margins: 0 anchors.margins: 0
ScrollView { ScrollView {
id: scrollView id: scrollView
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
padding: 0 padding: 0
@ -36,15 +36,13 @@ ColumnLayout {
spacing: 4 spacing: 4
Layout.fillWidth: true Layout.fillWidth: true
Text { Text {
text: "Wallpaper" text: "Wallpaper"
font.pixelSize: 18 font.pixelSize: 18
font.bold: true font.bold: true
color: Theme.textPrimary color: Theme.textPrimary
Layout.bottomMargin: 8 Layout.bottomMargin: 8
} }
// Wallpaper Settings Category // Wallpaper Settings Category
ColumnLayout { ColumnLayout {
@ -93,6 +91,7 @@ ColumnLayout {
TextInput { TextInput {
id: folderInput id: folderInput
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 12 anchors.leftMargin: 12
anchors.rightMargin: 12 anchors.rightMargin: 12
@ -117,25 +116,38 @@ ColumnLayout {
cursorShape: Qt.IBeamCursor cursorShape: Qt.IBeamCursor
onClicked: folderInput.forceActiveFocus() onClicked: folderInput.forceActiveFocus()
} }
} }
} }
} }
}
} Rectangle {
Layout.topMargin: 26
Layout.bottomMargin: 18
anchors {
top: headerArea.bottom
left: parent.left
right: parent.right
}
height: 1
color: Theme.outline
opacity: 0.3
}
ColumnLayout {
ColumnLayout { spacing: 4
spacing: 4 Layout.fillWidth: true
Layout.fillWidth: true
Layout.topMargin: 58
Text { Text {
text: "Automation" text: "Automation"
font.pixelSize: 18 font.pixelSize: 18
font.bold: true font.bold: true
color: Theme.textPrimary color: Theme.textPrimary
Layout.bottomMargin: 8 Layout.bottomMargin: 8
} }
// Random Wallpaper // Random Wallpaper
ColumnLayout { ColumnLayout {
@ -165,10 +177,12 @@ ColumnLayout {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
Rectangle { Rectangle {
id: randomWallpaperSwitch id: randomWallpaperSwitch
width: 52 width: 52
height: 32 height: 32
radius: 16 radius: 16
@ -178,6 +192,7 @@ ColumnLayout {
Rectangle { Rectangle {
id: randomWallpaperThumb id: randomWallpaperThumb
width: 28 width: 28
height: 28 height: 28
radius: 14 radius: 14
@ -192,7 +207,9 @@ ColumnLayout {
duration: 200 duration: 200
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
} }
} }
MouseArea { MouseArea {
@ -202,8 +219,11 @@ ColumnLayout {
Settings.settings.randomWallpaper = !Settings.settings.randomWallpaper; Settings.settings.randomWallpaper = !Settings.settings.randomWallpaper;
} }
} }
} }
} }
} }
// Use Wallpaper Theme // Use Wallpaper Theme
@ -234,10 +254,12 @@ ColumnLayout {
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
Rectangle { Rectangle {
id: wallpaperThemeSwitch id: wallpaperThemeSwitch
width: 52 width: 52
height: 32 height: 32
radius: 16 radius: 16
@ -247,6 +269,7 @@ ColumnLayout {
Rectangle { Rectangle {
id: wallpaperThemeThumb id: wallpaperThemeThumb
width: 28 width: 28
height: 28 height: 28
radius: 14 radius: 14
@ -261,7 +284,9 @@ ColumnLayout {
duration: 200 duration: 200
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
} }
} }
} }
MouseArea { MouseArea {
@ -271,8 +296,11 @@ ColumnLayout {
Settings.settings.useWallpaperTheme = !Settings.settings.useWallpaperTheme; Settings.settings.useWallpaperTheme = !Settings.settings.useWallpaperTheme;
} }
} }
} }
} }
} }
// Wallpaper Interval // Wallpaper Interval
@ -308,10 +336,12 @@ ColumnLayout {
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
Slider { Slider {
id: intervalSlider id: intervalSlider
Layout.fillWidth: true Layout.fillWidth: true
from: 10 from: 10
to: 900 to: 900
@ -338,6 +368,7 @@ ColumnLayout {
color: Theme.accentPrimary color: Theme.accentPrimary
radius: 2 radius: 2
} }
} }
handle: Rectangle { handle: Rectangle {
@ -350,95 +381,117 @@ ColumnLayout {
border.color: Theme.accentPrimary border.color: Theme.accentPrimary
border.width: 2 border.width: 2
} }
} }
} }
} }
} }
Rectangle {
ColumnLayout { Layout.topMargin: 26
spacing: 4 Layout.bottomMargin: 18
Layout.fillWidth: true anchors {
Layout.topMargin: 58 top: headerArea.bottom
left: parent.left
right: parent.right
}
height: 1
color: Theme.outline
opacity: 0.3
}
Text { ColumnLayout {
text: "SWWW" spacing: 4
font.pixelSize: 18 Layout.fillWidth: true
font.bold: true
color: Theme.textPrimary
Layout.bottomMargin: 8
}
// Use SWWW Text {
ColumnLayout { text: "SWWW"
font.pixelSize: 18
font.bold: true
color: Theme.textPrimary
Layout.bottomMargin: 8
}
// Use SWWW
ColumnLayout {
spacing: 8
Layout.fillWidth: true
Layout.topMargin: 8
RowLayout {
spacing: 8 spacing: 8
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: 8
RowLayout { ColumnLayout {
spacing: 8 spacing: 4
Layout.fillWidth: true Layout.fillWidth: true
ColumnLayout { Text {
spacing: 4 text: "Use SWWW"
Layout.fillWidth: true font.pixelSize: 13
font.bold: true
Text { color: Theme.textPrimary
text: "Use SWWW"
font.pixelSize: 13
font.bold: true
color: Theme.textPrimary
}
Text {
text: "Use SWWW daemon for advanced wallpaper management"
font.pixelSize: 12
color: Theme.textSecondary
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
} }
Text {
text: "Use SWWW daemon for advanced wallpaper management"
font.pixelSize: 12
color: Theme.textSecondary
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
}
Rectangle {
id: swwwSwitch
width: 52
height: 32
radius: 16
color: Settings.settings.useSWWW ? Theme.accentPrimary : Theme.surfaceVariant
border.color: Settings.settings.useSWWW ? Theme.accentPrimary : Theme.outline
border.width: 2
Rectangle { Rectangle {
id: swwwSwitch id: swwwThumb
width: 52
height: 32
radius: 16
color: Settings.settings.useSWWW ? Theme.accentPrimary : Theme.surfaceVariant
border.color: Settings.settings.useSWWW ? Theme.accentPrimary : Theme.outline
border.width: 2
Rectangle { width: 28
id: swwwThumb height: 28
width: 28 radius: 14
height: 28 color: Theme.surface
radius: 14 border.color: Theme.outline
color: Theme.surface border.width: 1
border.color: Theme.outline y: 2
border.width: 1 x: Settings.settings.useSWWW ? swwwSwitch.width - width - 2 : 2
y: 2
x: Settings.settings.useSWWW ? swwwSwitch.width - width - 2 : 2
Behavior on x { Behavior on x {
NumberAnimation { NumberAnimation {
duration: 200 duration: 200
easing.type: Easing.OutCubic easing.type: Easing.OutCubic
}
} }
} }
MouseArea { }
anchors.fill: parent
cursorShape: Qt.PointingHandCursor MouseArea {
onClicked: { anchors.fill: parent
Settings.settings.useSWWW = !Settings.settings.useSWWW; cursorShape: Qt.PointingHandCursor
} onClicked: {
Settings.settings.useSWWW = !Settings.settings.useSWWW;
} }
} }
} }
} }
}
// SWWW Settings (only visible when useSWWW is enabled) // SWWW Settings (only visible when useSWWW is enabled)
ColumnLayout { ColumnLayout {
spacing: 8 spacing: 8
@ -476,6 +529,7 @@ ColumnLayout {
ComboBox { ComboBox {
id: resizeComboBox id: resizeComboBox
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 12 anchors.leftMargin: 12
anchors.rightMargin: 12 anchors.rightMargin: 12
@ -511,7 +565,9 @@ ColumnLayout {
model: resizeComboBox.popup.visible ? resizeComboBox.delegateModel : null model: resizeComboBox.popup.visible ? resizeComboBox.delegateModel : null
currentIndex: resizeComboBox.highlightedIndex currentIndex: resizeComboBox.highlightedIndex
ScrollIndicator.vertical: ScrollIndicator { } ScrollIndicator.vertical: ScrollIndicator {
}
} }
background: Rectangle { background: Rectangle {
@ -520,10 +576,13 @@ ColumnLayout {
border.width: 1 border.width: 1
radius: 8 radius: 8
} }
} }
delegate: ItemDelegate { delegate: ItemDelegate {
width: resizeComboBox.width width: resizeComboBox.width
highlighted: resizeComboBox.highlightedIndex === index
contentItem: Text { contentItem: Text {
text: modelData text: modelData
color: Theme.textPrimary color: Theme.textPrimary
@ -531,13 +590,17 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
} }
highlighted: resizeComboBox.highlightedIndex === index
background: Rectangle { background: Rectangle {
color: parent.highlighted ? Theme.accentPrimary : "transparent" color: parent.highlighted ? Theme.accentPrimary : "transparent"
} }
} }
} }
} }
} }
// Transition Type // Transition Type
@ -571,6 +634,7 @@ ColumnLayout {
ComboBox { ComboBox {
id: transitionTypeComboBox id: transitionTypeComboBox
anchors.fill: parent anchors.fill: parent
anchors.leftMargin: 12 anchors.leftMargin: 12
anchors.rightMargin: 12 anchors.rightMargin: 12
@ -606,7 +670,9 @@ ColumnLayout {
model: transitionTypeComboBox.popup.visible ? transitionTypeComboBox.delegateModel : null model: transitionTypeComboBox.popup.visible ? transitionTypeComboBox.delegateModel : null
currentIndex: transitionTypeComboBox.highlightedIndex currentIndex: transitionTypeComboBox.highlightedIndex
ScrollIndicator.vertical: ScrollIndicator { } ScrollIndicator.vertical: ScrollIndicator {
}
} }
background: Rectangle { background: Rectangle {
@ -615,10 +681,13 @@ ColumnLayout {
border.width: 1 border.width: 1
radius: 8 radius: 8
} }
} }
delegate: ItemDelegate { delegate: ItemDelegate {
width: transitionTypeComboBox.width width: transitionTypeComboBox.width
highlighted: transitionTypeComboBox.highlightedIndex === index
contentItem: Text { contentItem: Text {
text: modelData text: modelData
color: Theme.textPrimary color: Theme.textPrimary
@ -626,13 +695,17 @@ ColumnLayout {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
} }
highlighted: transitionTypeComboBox.highlightedIndex === index
background: Rectangle { background: Rectangle {
color: parent.highlighted ? Theme.accentPrimary : "transparent" color: parent.highlighted ? Theme.accentPrimary : "transparent"
} }
} }
} }
} }
} }
// Transition FPS // Transition FPS
@ -668,10 +741,12 @@ ColumnLayout {
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
Slider { Slider {
id: fpsSlider id: fpsSlider
Layout.fillWidth: true Layout.fillWidth: true
from: 30 from: 30
to: 500 to: 500
@ -698,6 +773,7 @@ ColumnLayout {
color: Theme.accentPrimary color: Theme.accentPrimary
radius: 2 radius: 2
} }
} }
handle: Rectangle { handle: Rectangle {
@ -710,7 +786,9 @@ ColumnLayout {
border.color: Theme.accentPrimary border.color: Theme.accentPrimary
border.width: 2 border.width: 2
} }
} }
} }
// Transition Duration // Transition Duration
@ -746,10 +824,12 @@ ColumnLayout {
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }
} }
Slider { Slider {
id: durationSlider id: durationSlider
Layout.fillWidth: true Layout.fillWidth: true
from: 0.25 from: 0.25
to: 10 to: 10
@ -776,6 +856,7 @@ ColumnLayout {
color: Theme.accentPrimary color: Theme.accentPrimary
radius: 2 radius: 2
} }
} }
handle: Rectangle { handle: Rectangle {
@ -788,15 +869,22 @@ ColumnLayout {
border.color: Theme.accentPrimary border.color: Theme.accentPrimary
border.width: 2 border.width: 2
} }
} }
} }
} }
} }
} }
} }
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
Layout.fillHeight: true Layout.fillHeight: true
} }
}
}