push
This commit is contained in:
parent
21cb632dce
commit
50a9a62a2d
8 changed files with 34 additions and 15 deletions
|
|
@ -10,8 +10,8 @@ Singleton {
|
||||||
readonly property color accent: base0D
|
readonly property color accent: base0D
|
||||||
readonly property color rootBarColor: base01
|
readonly property color rootBarColor: base01
|
||||||
readonly property color barBg: Qt.rgba(rootBarColor.r,rootBarColor.g,rootBarColor.b,Config.opacity)
|
readonly property color barBg: Qt.rgba(rootBarColor.r,rootBarColor.g,rootBarColor.b,Config.opacity)
|
||||||
readonly property color moduleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.2, Config.opacity)
|
readonly property color moduleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.15, Config.opacity)
|
||||||
readonly property color activeModuleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.4, Config.opacity)
|
readonly property color activeModuleBg: Qt.hsla(base01.hslHue, base01.hslSaturation, base01.hslLightness + 0.2, Config.opacity)
|
||||||
readonly property color text: Qt.lighter(base00, 7)
|
readonly property color text: Qt.lighter(base00, 7)
|
||||||
readonly property color base00: Colors.colors.base00
|
readonly property color base00: Colors.colors.base00
|
||||||
readonly property color base01: Colors.colors.base01
|
readonly property color base01: Colors.colors.base01
|
||||||
|
|
|
||||||
|
|
@ -13,7 +13,7 @@ Singleton {
|
||||||
function getWiredIcon() {
|
function getWiredIcon() {
|
||||||
if (wiredDev?.hasLink ?? false) {
|
if (wiredDev?.hasLink ?? false) {
|
||||||
if (wiredDev.connected ?? false) {
|
if (wiredDev.connected ?? false) {
|
||||||
return "network-wired-activated";
|
return "network-wired";
|
||||||
} else
|
} else
|
||||||
return "network-wired-unavailable";
|
return "network-wired-unavailable";
|
||||||
} else
|
} else
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,18 @@ PopupWindow {
|
||||||
anchor.margins.top: 40
|
anchor.margins.top: 40
|
||||||
color: 'transparent'
|
color: 'transparent'
|
||||||
grabFocus: true
|
grabFocus: true
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
id: root
|
id: root
|
||||||
|
Keys.onEscapePressed: {
|
||||||
|
parent.visible = false;
|
||||||
|
}
|
||||||
|
onVisibleChanged: {
|
||||||
|
if (parent.visible)
|
||||||
|
forceActiveFocus();
|
||||||
|
}
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
|
anchors.centerIn: parent
|
||||||
color: Colors.barBg
|
color: Colors.barBg
|
||||||
radius: Config.cfg.appearance.rounding
|
radius: Config.cfg.appearance.rounding
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ BarComponent {
|
||||||
id: clockLayout
|
id: clockLayout
|
||||||
anchors.centerIn: parent
|
anchors.centerIn: parent
|
||||||
StyledIcon {
|
StyledIcon {
|
||||||
iconName: "clock-alt-symbolic"
|
iconName: "clock-large"
|
||||||
}
|
}
|
||||||
StyledText {
|
StyledText {
|
||||||
id: clockText
|
id: clockText
|
||||||
|
|
|
||||||
|
|
@ -13,8 +13,7 @@ BarComponent {
|
||||||
StyledIcon {
|
StyledIcon {
|
||||||
iconName: Network.getWifiIcon()
|
iconName: Network.getWifiIcon()
|
||||||
}
|
}
|
||||||
StyledIcon {
|
StyledIcon {
|
||||||
Layout.topMargin: 2
|
|
||||||
iconName: Network.getWiredIcon()
|
iconName: Network.getWiredIcon()
|
||||||
visible: Network.wiredDev != null
|
visible: Network.wiredDev != null
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ BarComponent {
|
||||||
id: wsContainer
|
id: wsContainer
|
||||||
required property var modelData
|
required property var modelData
|
||||||
visible: modelData.shouldDisplay
|
visible: modelData.shouldDisplay
|
||||||
implicitWidth: modelData.active ? 50 : 20
|
implicitWidth: modelData.active ? root.implicitHeight * 2.2 : root.implicitHeight
|
||||||
color: modelData.active ? Colors.base0D : Colors.moduleBg
|
color: modelData.active ? Colors.base0D : Colors.moduleBg
|
||||||
Behavior on implicitWidth {
|
Behavior on implicitWidth {
|
||||||
PropertyAnimation {
|
PropertyAnimation {
|
||||||
|
|
|
||||||
|
|
@ -2,16 +2,16 @@
|
||||||
"appearance": {
|
"appearance": {
|
||||||
"font": "Iosevka",
|
"font": "Iosevka",
|
||||||
"fontSize": 14,
|
"fontSize": 14,
|
||||||
"iconSize": 14,
|
"iconSize": 22,
|
||||||
"rounding": 16
|
"rounding": 16
|
||||||
},
|
},
|
||||||
"bar": {
|
"bar": {
|
||||||
"floating": true,
|
"floating": true,
|
||||||
"height": 30,
|
"height": 34,
|
||||||
"opacity": 1
|
"opacity": 1
|
||||||
},
|
},
|
||||||
"wallpaper": {
|
"wallpaper": {
|
||||||
"wallDir": "/home/lucy/.walls/",
|
"wallDir": "/home/lucy/.walls/",
|
||||||
"wallpaper": "/home/lucy/.walls/lain_blue.png"
|
"wallpaper": "/home/lucy/.walls/frierensuff.png"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,18 +1,29 @@
|
||||||
import Quickshell
|
import Quickshell
|
||||||
import Quickshell.Widgets
|
import Quickshell.Widgets
|
||||||
|
import QtQuick
|
||||||
import QtQuick.Effects
|
import QtQuick.Effects
|
||||||
import qs
|
import qs
|
||||||
import qs.settings
|
import qs.settings
|
||||||
|
|
||||||
IconImage {
|
|
||||||
|
Image {
|
||||||
|
id: root
|
||||||
required property string iconName
|
required property string iconName
|
||||||
implicitSize: Config.cfg.appearance.iconSize
|
|
||||||
source: Quickshell.iconPath(iconName)
|
source: Quickshell.iconPath(iconName)
|
||||||
|
width: Config.cfg.appearance.iconSize
|
||||||
|
height: Config.cfg.appearance.iconSize
|
||||||
|
sourceSize.width: Config.cfg.appearance.iconSize
|
||||||
|
sourceSize.height: Config.cfg.appearance.iconSize
|
||||||
|
fillMode: Image.PreserveAspectFit
|
||||||
|
smooth: true
|
||||||
mipmap: true
|
mipmap: true
|
||||||
|
|
||||||
layer.enabled: true
|
layer.enabled: true
|
||||||
|
layer.smooth: true
|
||||||
|
layer.textureSize: Qt.size(width * 4, height * 4)
|
||||||
layer.effect: MultiEffect {
|
layer.effect: MultiEffect {
|
||||||
colorization: 1.0
|
colorization: 1.0
|
||||||
colorizationColor: Colors.text
|
colorizationColor: Colors.text
|
||||||
brightness: 1.0
|
brightness: 1.0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue