mirror of
https://github.com/zoriya/noctalia-shell.git
synced 2026-06-04 11:16:03 +00:00
Icons: color picker + better tab alignment in settings
+ autoformatting
This commit is contained in:
@@ -134,7 +134,7 @@ RowLayout {
|
||||
|
||||
NIcon {
|
||||
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
|
||||
verticalAlignment: Text.AlignVCenter
|
||||
Layout.alignment: Qt.AlignVCenter
|
||||
@@ -154,7 +154,7 @@ RowLayout {
|
||||
id: trackArt
|
||||
anchors.fill: parent
|
||||
imagePath: MediaService.trackArtUrl
|
||||
fallbackIcon: MediaService.isPlaying ? FontService.icons["pause"]: FontService.icons["play"]
|
||||
fallbackIcon: MediaService.isPlaying ? FontService.icons["pause"] : FontService.icons["play"]
|
||||
fallbackIconSize: 10 * scaling
|
||||
borderWidth: 0
|
||||
border.color: Color.transparent
|
||||
|
||||
@@ -108,7 +108,7 @@ Popup {
|
||||
Layout.fillWidth: true
|
||||
Layout.topMargin: Style.marginM * scaling
|
||||
spacing: Style.marginM * scaling
|
||||
|
||||
|
||||
Item {
|
||||
Layout.fillWidth: true
|
||||
}
|
||||
|
||||
@@ -403,10 +403,17 @@ NPanel {
|
||||
spacing: Style.marginS * scaling
|
||||
|
||||
// Tab icon
|
||||
NIcon {
|
||||
text: FontService.icons[modelData.icon]
|
||||
color: tabTextColor
|
||||
font.pointSize: Style.fontSizeL * scaling
|
||||
Rectangle {
|
||||
color: Color.transparent
|
||||
width: 20 * scaling
|
||||
height: 20 * scaling
|
||||
|
||||
NIcon {
|
||||
text: FontService.icons[modelData.icon]
|
||||
color: tabTextColor
|
||||
font.pointSize: Style.fontSizeL * scaling
|
||||
anchors.fill: parent
|
||||
}
|
||||
}
|
||||
|
||||
// Tab label
|
||||
|
||||
@@ -70,12 +70,14 @@ Singleton {
|
||||
"link": "\uF0C1",
|
||||
"plus": "\uF067",
|
||||
"minus": "\uF068",
|
||||
"eyedropper": "\uF342",
|
||||
"bell": "\uF189",
|
||||
"bell_striked": "\uEE15", // FIXME
|
||||
"drive": "\uEE15", // FIXME
|
||||
"person": "\uEE15", // FIXME
|
||||
|
||||
|
||||
"bell_striked": "\uEE15",
|
||||
"drive"// FIXME
|
||||
: "\uEE15",
|
||||
"person"// FIXME
|
||||
: "\uEE15"
|
||||
// FIXME
|
||||
}
|
||||
|
||||
// -------------------------------------------
|
||||
|
||||
@@ -2,6 +2,7 @@ import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import qs.Commons
|
||||
import qs.Services
|
||||
import qs.Widgets
|
||||
|
||||
Rectangle {
|
||||
@@ -58,7 +59,7 @@ Rectangle {
|
||||
}
|
||||
|
||||
NIcon {
|
||||
text: "palette"
|
||||
text: FontService.icons["eyedropper"]
|
||||
color: Color.mOnSurfaceVariant
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ import QtQuick
|
||||
import QtQuick.Controls
|
||||
import QtQuick.Layouts
|
||||
import qs.Commons
|
||||
import qs.Services
|
||||
import qs.Widgets
|
||||
|
||||
Popup {
|
||||
@@ -129,7 +130,7 @@ Popup {
|
||||
spacing: Style.marginS * scaling
|
||||
|
||||
NIcon {
|
||||
text: "palette"
|
||||
text: FontService.icons["eyedropper"]
|
||||
font.pointSize: Style.fontSizeXXL * scaling
|
||||
color: Color.mPrimary
|
||||
}
|
||||
|
||||
@@ -95,7 +95,7 @@ RowLayout {
|
||||
|
||||
NIcon {
|
||||
anchors.centerIn: parent
|
||||
text: FontService.icons["minus"]
|
||||
text: FontService.icons["minus"]
|
||||
font.pointSize: Style.fontSizeS * scaling
|
||||
color: decreaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
|
||||
}
|
||||
@@ -130,7 +130,7 @@ RowLayout {
|
||||
|
||||
NIcon {
|
||||
anchors.centerIn: parent
|
||||
text: FontService.icons["plus"]
|
||||
text: FontService.icons["plus"]
|
||||
font.pointSize: Style.fontSizeS * scaling
|
||||
color: increaseArea.containsMouse ? Color.mOnPrimary : Color.mPrimary
|
||||
}
|
||||
|
||||
+1
-1
@@ -118,7 +118,7 @@ Item {
|
||||
// Icon
|
||||
NIcon {
|
||||
id: icon
|
||||
text: (root.type == "warning") ? FontService.icons["warning"] : FontService.icons["info"]
|
||||
text: (root.type == "warning") ? FontService.icons["warning"] : FontService.icons["info"]
|
||||
color: {
|
||||
switch (root.type) {
|
||||
case "warning":
|
||||
|
||||
Reference in New Issue
Block a user