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

Icons: color picker + better tab alignment in settings

Browse source 
+ autoformatting
This commit is contained in:
LemmyCook 2025-09-08 16:08:36 -04:00
parent b91112fc7a
commit 08d2747f1e
8 changed files with 28 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Modules/Bar/Widgets/MediaMini.qml
View file

@ -134,7 +134,7 @@ RowLayout {
NIcon { NIcon {
id: windowIcon id: windowIcon
text: MediaService.isPlaying ? FontService.icons["pause"]: FontService.icons["play"] text: MediaService.isPlaying ? FontService.icons["pause"] : FontService.icons["play"]
font.pointSize: Style.fontSizeL * scaling font.pointSize: Style.fontSizeL * scaling
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
Layout.alignment: Qt.AlignVCenter Layout.alignment: Qt.AlignVCenter
@ -154,7 +154,7 @@ RowLayout {
id: trackArt id: trackArt
anchors.fill: parent anchors.fill: parent
imagePath: MediaService.trackArtUrl imagePath: MediaService.trackArtUrl
fallbackIcon: MediaService.isPlaying ? FontService.icons["pause"]: FontService.icons["play"] fallbackIcon: MediaService.isPlaying ? FontService.icons["pause"] : FontService.icons["play"]
fallbackIconSize: 10 * scaling fallbackIconSize: 10 * scaling
borderWidth: 0 borderWidth: 0
border.color: Color.transparent border.color: Color.transparent

2
Modules/SettingsPanel/Bar/BarWidgetSettingsDialog.qml
View file

@ -108,7 +108,7 @@ Popup {
Layout.fillWidth: true Layout.fillWidth: true
Layout.topMargin: Style.marginM * scaling Layout.topMargin: Style.marginM * scaling
spacing: Style.marginM * scaling spacing: Style.marginM * scaling
Item { Item {
Layout.fillWidth: true Layout.fillWidth: true
} }

15
Modules/SettingsPanel/SettingsPanel.qml
View file

@ -403,10 +403,17 @@ NPanel {
spacing: Style.marginS * scaling spacing: Style.marginS * scaling
// Tab icon // Tab icon
NIcon { Rectangle {
text: FontService.icons[modelData.icon] color: Color.transparent
color: tabTextColor width: 20 * scaling
font.pointSize: Style.fontSizeL * scaling height: 20 * scaling
NIcon {
text: FontService.icons[modelData.icon]
color: tabTextColor
font.pointSize: Style.fontSizeL * scaling
anchors.fill: parent
}
} }
// Tab label // Tab label

12
Services/FontService.qml
View file

@ -70,12 +70,14 @@ Singleton {
"link": "\uF0C1", "link": "\uF0C1",
"plus": "\uF067", "plus": "\uF067",
"minus": "\uF068", "minus": "\uF068",
"eyedropper": "\uF342",
"bell": "\uF189", "bell": "\uF189",
"bell_striked": "\uEE15", // FIXME "bell_striked": "\uEE15",
"drive": "\uEE15", // FIXME "drive"// FIXME
"person": "\uEE15", // FIXME : "\uEE15",
"person"// FIXME
: "\uEE15"
// FIXME
} }
// ------------------------------------------- // -------------------------------------------

3
Widgets/NColorPicker.qml
View file

@ -2,6 +2,7 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import qs.Commons import qs.Commons
import qs.Services
import qs.Widgets import qs.Widgets
Rectangle { Rectangle {
@ -58,7 +59,7 @@ Rectangle {
} }
NIcon { NIcon {
text: "palette" text: FontService.icons["eyedropper"]
color: Color.mOnSurfaceVariant color: Color.mOnSurfaceVariant
} }
} }

3
Widgets/NColorPickerDialog.qml
View file

@ -2,6 +2,7 @@ import QtQuick
import QtQuick.Controls import QtQuick.Controls
import QtQuick.Layouts import QtQuick.Layouts
import qs.Commons import qs.Commons
import qs.Services
import qs.Widgets import qs.Widgets
Popup { Popup {
@ -129,7 +130,7 @@ Popup {
spacing: Style.marginS * scaling spacing: Style.marginS * scaling
NIcon { NIcon {
text: "palette" text: FontService.icons["eyedropper"]
font.pointSize: Style.fontSizeXXL * scaling font.pointSize: Style.fontSizeXXL * scaling
color: Color.mPrimary color: Color.mPrimary
} }

4
Widgets/NSpinBox.qml
View file

@ -95,7 +95,7 @@ RowLayout {
NIcon { NIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: FontService.icons["minus"] text: FontService.icons["minus"]
font.pointSize: Style.fontSizeS * scaling font.pointSize: Style.fontSizeS * scaling
color: decreaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary color: decreaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
} }
@ -130,7 +130,7 @@ RowLayout {
NIcon { NIcon {
anchors.centerIn: parent anchors.centerIn: parent
text: FontService.icons["plus"] text: FontService.icons["plus"]
font.pointSize: Style.fontSizeS * scaling font.pointSize: Style.fontSizeS * scaling
color: increaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary color: increaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
} }

2
Widgets/NToast.qml
View file

@ -118,7 +118,7 @@ Item {
// Icon // Icon
NIcon { NIcon {
id: icon id: icon
text: (root.type == "warning") ? FontService.icons["warning"] : FontService.icons["info"] text: (root.type == "warning") ? FontService.icons["warning"] : FontService.icons["info"]
color: { color: {
switch (root.type) { switch (root.type) {
case "warning": case "warning":