internal: format
This commit is contained in:
parent
6c1765c2e1
commit
9d7f0c48ce
74 changed files with 1635 additions and 1517 deletions
|
|
@ -29,4 +29,3 @@ ColumnLayout {
|
||||||
font.bold: true
|
font.bold: true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -57,4 +57,3 @@ ColumnLayout {
|
||||||
Layout.maximumWidth: parent.width
|
Layout.maximumWidth: parent.width
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -24,4 +24,3 @@ ColumnLayout {
|
||||||
font.pointSize: Appearance.font.size.small
|
font.pointSize: Appearance.font.size.small
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,9 +16,7 @@ StyledRect {
|
||||||
implicitHeight: contentColumn.implicitHeight + Appearance.padding.large * 2
|
implicitHeight: contentColumn.implicitHeight + Appearance.padding.large * 2
|
||||||
|
|
||||||
radius: Appearance.rounding.normal
|
radius: Appearance.rounding.normal
|
||||||
color: Colours.transparency.enabled
|
color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, 2) : Colours.palette.m3surfaceContainerHigh
|
||||||
? Colours.layer(Colours.palette.m3surfaceContainer, 2)
|
|
||||||
: Colours.palette.m3surfaceContainerHigh
|
|
||||||
|
|
||||||
ColumnLayout {
|
ColumnLayout {
|
||||||
id: contentColumn
|
id: contentColumn
|
||||||
|
|
@ -32,4 +30,3 @@ StyledRect {
|
||||||
spacing: root.contentSpacing
|
spacing: root.contentSpacing
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -25,4 +25,3 @@ ColumnLayout {
|
||||||
color: Colours.palette.m3outline
|
color: Colours.palette.m3outline
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -88,9 +88,7 @@ ColumnLayout {
|
||||||
id: backgroundRect
|
id: backgroundRect
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
radius: Appearance.rounding.normal
|
radius: Appearance.rounding.normal
|
||||||
color: Colours.transparency.enabled
|
color: Colours.transparency.enabled ? Colours.layer(Colours.palette.m3surfaceContainer, root.nested ? 3 : 2) : (root.nested ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3surfaceContainer)
|
||||||
? Colours.layer(Colours.palette.m3surfaceContainer, root.nested ? 3 : 2)
|
|
||||||
: (root.nested ? Colours.palette.m3surfaceContainerHigh : Colours.palette.m3surfaceContainer)
|
|
||||||
opacity: root.showBackground && root.expanded ? 1.0 : 0.0
|
opacity: root.showBackground && root.expanded ? 1.0 : 0.0
|
||||||
visible: root.showBackground
|
visible: root.showBackground
|
||||||
|
|
||||||
|
|
@ -132,4 +130,3 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -50,4 +50,3 @@ StyledRect {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -51,10 +51,10 @@ StyledRect {
|
||||||
menu.z: 1
|
menu.z: 1
|
||||||
|
|
||||||
stateLayer.onClicked: {
|
stateLayer.onClicked: {
|
||||||
splitButton.expanded = !splitButton.expanded
|
splitButton.expanded = !splitButton.expanded;
|
||||||
}
|
}
|
||||||
|
|
||||||
menu.onItemSelected: (item) => {
|
menu.onItemSelected: item => {
|
||||||
root.selected(item);
|
root.selected(item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -20,7 +20,7 @@ Item {
|
||||||
readonly property alias hasFocus: inputField.activeFocus
|
readonly property alias hasFocus: inputField.activeFocus
|
||||||
|
|
||||||
signal textEdited(string text)
|
signal textEdited(string text)
|
||||||
signal editingFinished()
|
signal editingFinished
|
||||||
|
|
||||||
implicitHeight: inputField.implicitHeight + Appearance.padding.small * 2
|
implicitHeight: inputField.implicitHeight + Appearance.padding.small * 2
|
||||||
|
|
||||||
|
|
@ -28,18 +28,18 @@ Item {
|
||||||
id: container
|
id: container
|
||||||
|
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
color: inputHover.containsMouse || inputField.activeFocus
|
color: inputHover.containsMouse || inputField.activeFocus ? Colours.layer(Colours.palette.m3surfaceContainer, 3) : Colours.layer(Colours.palette.m3surfaceContainer, 2)
|
||||||
? Colours.layer(Colours.palette.m3surfaceContainer, 3)
|
|
||||||
: Colours.layer(Colours.palette.m3surfaceContainer, 2)
|
|
||||||
radius: Appearance.rounding.small
|
radius: Appearance.rounding.small
|
||||||
border.width: 1
|
border.width: 1
|
||||||
border.color: inputField.activeFocus
|
border.color: inputField.activeFocus ? Colours.palette.m3primary : Qt.alpha(Colours.palette.m3outline, 0.3)
|
||||||
? Colours.palette.m3primary
|
|
||||||
: Qt.alpha(Colours.palette.m3outline, 0.3)
|
|
||||||
opacity: root.enabled ? 1 : 0.5
|
opacity: root.enabled ? 1 : 0.5
|
||||||
|
|
||||||
Behavior on color { CAnim {} }
|
Behavior on color {
|
||||||
Behavior on border.color { CAnim {} }
|
CAnim {}
|
||||||
|
}
|
||||||
|
Behavior on border.color {
|
||||||
|
CAnim {}
|
||||||
|
}
|
||||||
|
|
||||||
MouseArea {
|
MouseArea {
|
||||||
id: inputHover
|
id: inputHover
|
||||||
|
|
@ -77,4 +77,3 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -46,4 +46,3 @@ StyledRect {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -122,4 +122,3 @@ StyledRect {
|
||||||
Layout.minimumHeight: 0
|
Layout.minimumHeight: 0
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,4 +26,3 @@ RowLayout {
|
||||||
cLayer: 2
|
cLayer: 2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -55,18 +55,32 @@ Popup {
|
||||||
}
|
}
|
||||||
Connections {
|
Connections {
|
||||||
target: root.target
|
target: root.target
|
||||||
function onXChanged() { if (root.tooltipVisible) root.updatePosition(); }
|
function onXChanged() {
|
||||||
function onYChanged() { if (root.tooltipVisible) root.updatePosition(); }
|
if (root.tooltipVisible)
|
||||||
function onWidthChanged() { if (root.tooltipVisible) root.updatePosition(); }
|
root.updatePosition();
|
||||||
function onHeightChanged() { if (root.tooltipVisible) root.updatePosition(); }
|
}
|
||||||
|
function onYChanged() {
|
||||||
|
if (root.tooltipVisible)
|
||||||
|
root.updatePosition();
|
||||||
|
}
|
||||||
|
function onWidthChanged() {
|
||||||
|
if (root.tooltipVisible)
|
||||||
|
root.updatePosition();
|
||||||
|
}
|
||||||
|
function onHeightChanged() {
|
||||||
|
if (root.tooltipVisible)
|
||||||
|
root.updatePosition();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function updatePosition() {
|
function updatePosition() {
|
||||||
if (!target || !parent) return;
|
if (!target || !parent)
|
||||||
|
return;
|
||||||
|
|
||||||
// Wait for tooltipRect to have its size calculated
|
// Wait for tooltipRect to have its size calculated
|
||||||
Qt.callLater(() => {
|
Qt.callLater(() => {
|
||||||
if (!target || !parent || !tooltipRect) return;
|
if (!target || !parent || !tooltipRect)
|
||||||
|
return;
|
||||||
|
|
||||||
// Get target position in parent's coordinate system
|
// Get target position in parent's coordinate system
|
||||||
const targetPos = target.mapToItem(parent, 0, 0);
|
const targetPos = target.mapToItem(parent, 0, 0);
|
||||||
|
|
@ -169,4 +183,3 @@ Popup {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -101,9 +101,15 @@ Singleton {
|
||||||
|
|
||||||
function serializeAppearance(): var {
|
function serializeAppearance(): var {
|
||||||
return {
|
return {
|
||||||
rounding: { scale: appearance.rounding.scale },
|
rounding: {
|
||||||
spacing: { scale: appearance.spacing.scale },
|
scale: appearance.rounding.scale
|
||||||
padding: { scale: appearance.padding.scale },
|
},
|
||||||
|
spacing: {
|
||||||
|
scale: appearance.spacing.scale
|
||||||
|
},
|
||||||
|
padding: {
|
||||||
|
scale: appearance.padding.scale
|
||||||
|
},
|
||||||
font: {
|
font: {
|
||||||
family: {
|
family: {
|
||||||
sans: appearance.font.family.sans,
|
sans: appearance.font.family.sans,
|
||||||
|
|
@ -111,10 +117,14 @@ Singleton {
|
||||||
material: appearance.font.family.material,
|
material: appearance.font.family.material,
|
||||||
clock: appearance.font.family.clock
|
clock: appearance.font.family.clock
|
||||||
},
|
},
|
||||||
size: { scale: appearance.font.size.scale }
|
size: {
|
||||||
|
scale: appearance.font.size.scale
|
||||||
|
}
|
||||||
},
|
},
|
||||||
anim: {
|
anim: {
|
||||||
durations: { scale: appearance.anim.durations.scale }
|
durations: {
|
||||||
|
scale: appearance.anim.durations.scale
|
||||||
|
}
|
||||||
},
|
},
|
||||||
transparency: {
|
transparency: {
|
||||||
enabled: appearance.transparency.enabled,
|
enabled: appearance.transparency.enabled,
|
||||||
|
|
|
||||||
|
|
@ -46,7 +46,6 @@ Loader {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Loader {
|
Loader {
|
||||||
id: clockLoader
|
id: clockLoader
|
||||||
active: Config.background.desktopClock.enabled
|
active: Config.background.desktopClock.enabled
|
||||||
|
|
@ -77,7 +76,8 @@ Loader {
|
||||||
AnchorChanges {
|
AnchorChanges {
|
||||||
target: clockLoader
|
target: clockLoader
|
||||||
anchors.top: parent.top
|
anchors.top: parent.top
|
||||||
anchors.right: parent.right }
|
anchors.right: parent.right
|
||||||
|
}
|
||||||
},
|
},
|
||||||
State {
|
State {
|
||||||
name: "middle-left"
|
name: "middle-left"
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,3 @@ Item {
|
||||||
font.pointSize: Appearance.font.size.normal
|
font.pointSize: Appearance.font.size.normal
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -39,6 +39,3 @@ Item {
|
||||||
font.pointSize: Appearance.font.size.normal
|
font.pointSize: Appearance.font.size.normal
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,8 @@ Item {
|
||||||
property list<var> pills: []
|
property list<var> pills: []
|
||||||
|
|
||||||
onOccupiedChanged: {
|
onOccupiedChanged: {
|
||||||
if (!occupied) return;
|
if (!occupied)
|
||||||
|
return;
|
||||||
let count = 0;
|
let count = 0;
|
||||||
const start = groupOffset;
|
const start = groupOffset;
|
||||||
const end = start + Config.bar.workspaces.shown;
|
const end = start + Config.bar.workspaces.shown;
|
||||||
|
|
|
||||||
|
|
@ -121,7 +121,6 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Popout {
|
Popout {
|
||||||
name: "lockstatus"
|
name: "lockstatus"
|
||||||
sourceComponent: LockStatus {}
|
sourceComponent: LockStatus {}
|
||||||
|
|
|
||||||
|
|
@ -603,4 +603,3 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -19,9 +19,13 @@ ColumnLayout {
|
||||||
spacing: Appearance.spacing.small
|
spacing: Appearance.spacing.small
|
||||||
width: Config.bar.sizes.kbLayoutWidth
|
width: Config.bar.sizes.kbLayoutWidth
|
||||||
|
|
||||||
KbLayoutModel { id: kb }
|
KbLayoutModel {
|
||||||
|
id: kb
|
||||||
|
}
|
||||||
|
|
||||||
function refresh() { kb.refresh() }
|
function refresh() {
|
||||||
|
kb.refresh();
|
||||||
|
}
|
||||||
Component.onCompleted: kb.start()
|
Component.onCompleted: kb.start()
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
|
|
@ -46,12 +50,39 @@ ColumnLayout {
|
||||||
spacing: Appearance.spacing.small
|
spacing: Appearance.spacing.small
|
||||||
|
|
||||||
add: Transition {
|
add: Transition {
|
||||||
NumberAnimation { properties: "opacity"; from: 0; to: 1; duration: 140 }
|
NumberAnimation {
|
||||||
NumberAnimation { properties: "y"; duration: 180; easing.type: Easing.OutCubic }
|
properties: "opacity"
|
||||||
|
from: 0
|
||||||
|
to: 1
|
||||||
|
duration: 140
|
||||||
|
}
|
||||||
|
NumberAnimation {
|
||||||
|
properties: "y"
|
||||||
|
duration: 180
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
remove: Transition {
|
||||||
|
NumberAnimation {
|
||||||
|
properties: "opacity"
|
||||||
|
to: 0
|
||||||
|
duration: 100
|
||||||
|
}
|
||||||
|
}
|
||||||
|
move: Transition {
|
||||||
|
NumberAnimation {
|
||||||
|
properties: "y"
|
||||||
|
duration: 180
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
}
|
||||||
|
displaced: Transition {
|
||||||
|
NumberAnimation {
|
||||||
|
properties: "y"
|
||||||
|
duration: 180
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
}
|
}
|
||||||
remove: Transition { NumberAnimation { properties: "opacity"; to: 0; duration: 100 } }
|
|
||||||
move: Transition { NumberAnimation { properties: "y"; duration: 180; easing.type: Easing.OutCubic } }
|
|
||||||
displaced: Transition { NumberAnimation { properties: "y"; duration: 180; easing.type: Easing.OutCubic } }
|
|
||||||
|
|
||||||
delegate: Item {
|
delegate: Item {
|
||||||
required property int layoutIndex
|
required property int layoutIndex
|
||||||
|
|
@ -145,13 +176,35 @@ ColumnLayout {
|
||||||
running: false
|
running: false
|
||||||
|
|
||||||
ParallelAnimation {
|
ParallelAnimation {
|
||||||
NumberAnimation { target: activeRow; property: "opacity"; to: 0.0; duration: 70 }
|
NumberAnimation {
|
||||||
NumberAnimation { target: activeRow; property: "scale"; to: 0.92; duration: 70 }
|
target: activeRow
|
||||||
|
property: "opacity"
|
||||||
|
to: 0.0
|
||||||
|
duration: 70
|
||||||
|
}
|
||||||
|
NumberAnimation {
|
||||||
|
target: activeRow
|
||||||
|
property: "scale"
|
||||||
|
to: 0.92
|
||||||
|
duration: 70
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
ParallelAnimation {
|
ParallelAnimation {
|
||||||
NumberAnimation { target: activeRow; property: "opacity"; to: 1.0; duration: 160; easing.type: Easing.OutCubic }
|
NumberAnimation {
|
||||||
NumberAnimation { target: activeRow; property: "scale"; to: 1.0; duration: 220; easing.type: Easing.OutBack }
|
target: activeRow
|
||||||
|
property: "opacity"
|
||||||
|
to: 1.0
|
||||||
|
duration: 160
|
||||||
|
easing.type: Easing.OutCubic
|
||||||
|
}
|
||||||
|
NumberAnimation {
|
||||||
|
target: activeRow
|
||||||
|
property: "scale"
|
||||||
|
to: 1.0
|
||||||
|
duration: 220
|
||||||
|
easing.type: Easing.OutBack
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,9 @@ Item {
|
||||||
id: model
|
id: model
|
||||||
visible: false
|
visible: false
|
||||||
|
|
||||||
ListModel { id: _visibleModel }
|
ListModel {
|
||||||
|
id: _visibleModel
|
||||||
|
}
|
||||||
property alias visibleModel: _visibleModel
|
property alias visibleModel: _visibleModel
|
||||||
|
|
||||||
property string activeLabel: ""
|
property string activeLabel: ""
|
||||||
|
|
@ -33,7 +35,9 @@ Item {
|
||||||
_switchProc.running = true;
|
_switchProc.running = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
ListModel { id: _layoutsModel }
|
ListModel {
|
||||||
|
id: _layoutsModel
|
||||||
|
}
|
||||||
|
|
||||||
property var _xkbMap: ({})
|
property var _xkbMap: ({})
|
||||||
property bool _notifiedLimit: false
|
property bool _notifiedLimit: false
|
||||||
|
|
@ -41,14 +45,19 @@ Item {
|
||||||
Process {
|
Process {
|
||||||
id: _xkbXmlBase
|
id: _xkbXmlBase
|
||||||
command: ["xmllint", "--xpath", "//layout/configItem[name and description]", "/usr/share/X11/xkb/rules/base.xml"]
|
command: ["xmllint", "--xpath", "//layout/configItem[name and description]", "/usr/share/X11/xkb/rules/base.xml"]
|
||||||
stdout: StdioCollector { onStreamFinished: _buildXmlMap(text) }
|
stdout: StdioCollector {
|
||||||
onRunningChanged: if (!running && (typeof exitCode !== "undefined") && exitCode !== 0) _xkbXmlEvdev.running = true
|
onStreamFinished: _buildXmlMap(text)
|
||||||
|
}
|
||||||
|
onRunningChanged: if (!running && (typeof exitCode !== "undefined") && exitCode !== 0)
|
||||||
|
_xkbXmlEvdev.running = true
|
||||||
}
|
}
|
||||||
|
|
||||||
Process {
|
Process {
|
||||||
id: _xkbXmlEvdev
|
id: _xkbXmlEvdev
|
||||||
command: ["xmllint", "--xpath", "//layout/configItem[name and description]", "/usr/share/X11/xkb/rules/evdev.xml"]
|
command: ["xmllint", "--xpath", "//layout/configItem[name and description]", "/usr/share/X11/xkb/rules/evdev.xml"]
|
||||||
stdout: StdioCollector { onStreamFinished: _buildXmlMap(text) }
|
stdout: StdioCollector {
|
||||||
|
onStreamFinished: _buildXmlMap(text)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function _buildXmlMap(xml) {
|
function _buildXmlMap(xml) {
|
||||||
|
|
@ -60,7 +69,8 @@ Item {
|
||||||
while ((m = re.exec(xml)) !== null) {
|
while ((m = re.exec(xml)) !== null) {
|
||||||
const code = (m[1] || "").trim();
|
const code = (m[1] || "").trim();
|
||||||
const desc = (m[2] || "").trim();
|
const desc = (m[2] || "").trim();
|
||||||
if (!code || !desc) continue;
|
if (!code || !desc)
|
||||||
|
continue;
|
||||||
map[code] = _short(desc);
|
map[code] = _short(desc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -73,7 +83,11 @@ Item {
|
||||||
const tmp = [];
|
const tmp = [];
|
||||||
for (let i = 0; i < _layoutsModel.count; i++) {
|
for (let i = 0; i < _layoutsModel.count; i++) {
|
||||||
const it = _layoutsModel.get(i);
|
const it = _layoutsModel.get(i);
|
||||||
tmp.push({ layoutIndex: it.layoutIndex, token: it.token, label: _pretty(it.token) });
|
tmp.push({
|
||||||
|
layoutIndex: it.layoutIndex,
|
||||||
|
token: it.token,
|
||||||
|
label: _pretty(it.token)
|
||||||
|
});
|
||||||
}
|
}
|
||||||
_layoutsModel.clear();
|
_layoutsModel.clear();
|
||||||
tmp.forEach(t => _layoutsModel.append(t));
|
tmp.forEach(t => _layoutsModel.append(t));
|
||||||
|
|
@ -83,7 +97,8 @@ Item {
|
||||||
|
|
||||||
function _short(desc) {
|
function _short(desc) {
|
||||||
const m = desc.match(/^(.*)\((.*)\)$/);
|
const m = desc.match(/^(.*)\((.*)\)$/);
|
||||||
if (!m) return desc;
|
if (!m)
|
||||||
|
return desc;
|
||||||
const lang = m[1].trim();
|
const lang = m[1].trim();
|
||||||
const region = m[2].trim();
|
const region = m[2].trim();
|
||||||
const code = (region.split(/[,\s-]/)[0] || region).slice(0, 2).toUpperCase();
|
const code = (region.split(/[,\s-]/)[0] || region).slice(0, 2).toUpperCase();
|
||||||
|
|
@ -118,7 +133,8 @@ Item {
|
||||||
const dev = JSON.parse(text);
|
const dev = JSON.parse(text);
|
||||||
const kb = dev?.keyboards?.find(k => k.main) || dev?.keyboards?.[0];
|
const kb = dev?.keyboards?.find(k => k.main) || dev?.keyboards?.[0];
|
||||||
const raw = (kb?.layout || "").trim();
|
const raw = (kb?.layout || "").trim();
|
||||||
if (raw.length) _setLayouts(raw);
|
if (raw.length)
|
||||||
|
_setLayouts(raw);
|
||||||
} catch (e) {}
|
} catch (e) {}
|
||||||
_fetchActiveLayouts.running = true;
|
_fetchActiveLayouts.running = true;
|
||||||
}
|
}
|
||||||
|
|
@ -136,10 +152,7 @@ Item {
|
||||||
const idx = kb?.active_layout_index ?? -1;
|
const idx = kb?.active_layout_index ?? -1;
|
||||||
|
|
||||||
activeIndex = idx >= 0 ? idx : -1;
|
activeIndex = idx >= 0 ? idx : -1;
|
||||||
activeLabel =
|
activeLabel = (idx >= 0 && idx < _layoutsModel.count) ? _layoutsModel.get(idx).label : "";
|
||||||
(idx >= 0 && idx < _layoutsModel.count)
|
|
||||||
? _layoutsModel.get(idx).label
|
|
||||||
: "";
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
activeIndex = -1;
|
activeIndex = -1;
|
||||||
activeLabel = "";
|
activeLabel = "";
|
||||||
|
|
@ -152,7 +165,8 @@ Item {
|
||||||
|
|
||||||
Process {
|
Process {
|
||||||
id: _switchProc
|
id: _switchProc
|
||||||
onRunningChanged: if (!running) _fetchActiveLayouts.running = true
|
onRunningChanged: if (!running)
|
||||||
|
_fetchActiveLayouts.running = true
|
||||||
}
|
}
|
||||||
|
|
||||||
function _setLayouts(raw) {
|
function _setLayouts(raw) {
|
||||||
|
|
@ -163,9 +177,14 @@ Item {
|
||||||
let idx = 0;
|
let idx = 0;
|
||||||
|
|
||||||
for (const p of parts) {
|
for (const p of parts) {
|
||||||
if (seen.has(p)) continue;
|
if (seen.has(p))
|
||||||
|
continue;
|
||||||
seen.add(p);
|
seen.add(p);
|
||||||
_layoutsModel.append({ layoutIndex: idx, token: p, label: _pretty(p) });
|
_layoutsModel.append({
|
||||||
|
layoutIndex: idx,
|
||||||
|
token: p,
|
||||||
|
label: _pretty(p)
|
||||||
|
});
|
||||||
idx++;
|
idx++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -184,17 +203,14 @@ Item {
|
||||||
return;
|
return;
|
||||||
|
|
||||||
if (_layoutsModel.count > 4) {
|
if (_layoutsModel.count > 4) {
|
||||||
Toaster.toast(
|
Toaster.toast(qsTr("Keyboard layout limit"), qsTr("XKB supports only 4 layouts at a time"), "warning");
|
||||||
qsTr("Keyboard layout limit"),
|
|
||||||
qsTr("XKB supports only 4 layouts at a time"),
|
|
||||||
"warning"
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function _pretty(token) {
|
function _pretty(token) {
|
||||||
const code = token.replace(/\(.*\)$/, "").trim();
|
const code = token.replace(/\(.*\)$/, "").trim();
|
||||||
if (_xkbMap[code]) return code.toUpperCase() + " - " + _xkbMap[code];
|
if (_xkbMap[code])
|
||||||
|
return code.toUpperCase() + " - " + _xkbMap[code];
|
||||||
return code.toUpperCase() + " - " + code;
|
return code.toUpperCase() + " - " + code;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -84,4 +84,3 @@ QtObject {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -18,5 +18,6 @@ QtObject {
|
||||||
readonly property VpnState vpn: VpnState {}
|
readonly property VpnState vpn: VpnState {}
|
||||||
|
|
||||||
onActiveChanged: activeIndex = Math.max(0, panes.indexOf(active))
|
onActiveChanged: activeIndex = Math.max(0, panes.indexOf(active))
|
||||||
onActiveIndexChanged: if (panes[activeIndex]) active = panes[activeIndex]
|
onActiveIndexChanged: if (panes[activeIndex])
|
||||||
|
active = panes[activeIndex]
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,15 +73,15 @@ Item {
|
||||||
|
|
||||||
Config.background.desktopClock.enabled = root.desktopClockEnabled;
|
Config.background.desktopClock.enabled = root.desktopClockEnabled;
|
||||||
Config.background.enabled = root.backgroundEnabled;
|
Config.background.enabled = root.backgroundEnabled;
|
||||||
Config.background.desktopClock.scale = root.desktopClockScale
|
Config.background.desktopClock.scale = root.desktopClockScale;
|
||||||
Config.background.desktopClock.position = root.desktopClockPosition
|
Config.background.desktopClock.position = root.desktopClockPosition;
|
||||||
Config.background.desktopClock.shadow.enabled = root.desktopClockShadowEnabled
|
Config.background.desktopClock.shadow.enabled = root.desktopClockShadowEnabled;
|
||||||
Config.background.desktopClock.shadow.opacity = root.desktopClockShadowOpacity
|
Config.background.desktopClock.shadow.opacity = root.desktopClockShadowOpacity;
|
||||||
Config.background.desktopClock.shadow.blur = root.desktopClockShadowBlur
|
Config.background.desktopClock.shadow.blur = root.desktopClockShadowBlur;
|
||||||
Config.background.desktopClock.background.enabled = root.desktopClockBackgroundEnabled
|
Config.background.desktopClock.background.enabled = root.desktopClockBackgroundEnabled;
|
||||||
Config.background.desktopClock.background.opacity = root.desktopClockBackgroundOpacity
|
Config.background.desktopClock.background.opacity = root.desktopClockBackgroundOpacity;
|
||||||
Config.background.desktopClock.background.blur = root.desktopClockBackgroundBlur
|
Config.background.desktopClock.background.blur = root.desktopClockBackgroundBlur;
|
||||||
Config.background.desktopClock.invertColors = root.desktopClockInvertColors
|
Config.background.desktopClock.invertColors = root.desktopClockInvertColors;
|
||||||
|
|
||||||
Config.background.visualiser.enabled = root.visualiserEnabled;
|
Config.background.visualiser.enabled = root.visualiserEnabled;
|
||||||
Config.background.visualiser.autoHide = root.visualiserAutoHide;
|
Config.background.visualiser.autoHide = root.visualiserAutoHide;
|
||||||
|
|
@ -155,7 +155,6 @@ Item {
|
||||||
flickableDirection: Flickable.VerticalFlick
|
flickableDirection: Flickable.VerticalFlick
|
||||||
contentHeight: sidebarLayout.height
|
contentHeight: sidebarLayout.height
|
||||||
|
|
||||||
|
|
||||||
StyledScrollBar.vertical: StyledScrollBar {
|
StyledScrollBar.vertical: StyledScrollBar {
|
||||||
flickable: sidebarFlickable
|
flickable: sidebarFlickable
|
||||||
}
|
}
|
||||||
|
|
@ -168,16 +167,7 @@ Item {
|
||||||
|
|
||||||
readonly property var rootPane: sidebarFlickable.rootPane
|
readonly property var rootPane: sidebarFlickable.rootPane
|
||||||
|
|
||||||
readonly property bool allSectionsExpanded:
|
readonly property bool allSectionsExpanded: themeModeSection.expanded && colorVariantSection.expanded && colorSchemeSection.expanded && animationsSection.expanded && fontsSection.expanded && scalesSection.expanded && transparencySection.expanded && borderSection.expanded && backgroundSection.expanded
|
||||||
themeModeSection.expanded &&
|
|
||||||
colorVariantSection.expanded &&
|
|
||||||
colorSchemeSection.expanded &&
|
|
||||||
animationsSection.expanded &&
|
|
||||||
fontsSection.expanded &&
|
|
||||||
scalesSection.expanded &&
|
|
||||||
transparencySection.expanded &&
|
|
||||||
borderSection.expanded &&
|
|
||||||
backgroundSection.expanded
|
|
||||||
|
|
||||||
RowLayout {
|
RowLayout {
|
||||||
spacing: Appearance.spacing.smaller
|
spacing: Appearance.spacing.smaller
|
||||||
|
|
|
||||||
|
|
@ -30,13 +30,15 @@ CollapsibleSection {
|
||||||
to: 5.0
|
to: 5.0
|
||||||
decimals: 1
|
decimals: 1
|
||||||
suffix: "×"
|
suffix: "×"
|
||||||
validator: DoubleValidator { bottom: 0.1; top: 5.0 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0.1
|
||||||
|
top: 5.0
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.animDurationsScale = newValue;
|
rootPane.animDurationsScale = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,14 +69,27 @@ CollapsibleSection {
|
||||||
enabled: rootPane.desktopClockEnabled
|
enabled: rootPane.desktopClockEnabled
|
||||||
|
|
||||||
menuItems: [
|
menuItems: [
|
||||||
MenuItem { text: qsTr("Top"); icon: "vertical_align_top"; property string val: "top" },
|
MenuItem {
|
||||||
MenuItem { text: qsTr("Middle"); icon: "vertical_align_center"; property string val: "middle" },
|
text: qsTr("Top")
|
||||||
MenuItem { text: qsTr("Bottom"); icon: "vertical_align_bottom"; property string val: "bottom" }
|
icon: "vertical_align_top"
|
||||||
|
property string val: "top"
|
||||||
|
},
|
||||||
|
MenuItem {
|
||||||
|
text: qsTr("Middle")
|
||||||
|
icon: "vertical_align_center"
|
||||||
|
property string val: "middle"
|
||||||
|
},
|
||||||
|
MenuItem {
|
||||||
|
text: qsTr("Bottom")
|
||||||
|
icon: "vertical_align_bottom"
|
||||||
|
property string val: "bottom"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
for (let i = 0; i < menuItems.length; i++) {
|
for (let i = 0; i < menuItems.length; i++) {
|
||||||
if(menuItems[i].val === posContainer.currentV) active = menuItems[i];
|
if (menuItems[i].val === posContainer.currentV)
|
||||||
|
active = menuItems[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -90,14 +103,27 @@ CollapsibleSection {
|
||||||
expandedZ: 99
|
expandedZ: 99
|
||||||
|
|
||||||
menuItems: [
|
menuItems: [
|
||||||
MenuItem { text: qsTr("Left"); icon: "align_horizontal_left"; property string val: "left" },
|
MenuItem {
|
||||||
MenuItem { text: qsTr("Center"); icon: "align_horizontal_center"; property string val: "center" },
|
text: qsTr("Left")
|
||||||
MenuItem { text: qsTr("Right"); icon: "align_horizontal_right"; property string val: "right" }
|
icon: "align_horizontal_left"
|
||||||
|
property string val: "left"
|
||||||
|
},
|
||||||
|
MenuItem {
|
||||||
|
text: qsTr("Center")
|
||||||
|
icon: "align_horizontal_center"
|
||||||
|
property string val: "center"
|
||||||
|
},
|
||||||
|
MenuItem {
|
||||||
|
text: qsTr("Right")
|
||||||
|
icon: "align_horizontal_right"
|
||||||
|
property string val: "right"
|
||||||
|
}
|
||||||
]
|
]
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
for (let i = 0; i < menuItems.length; i++) {
|
for (let i = 0; i < menuItems.length; i++) {
|
||||||
if(menuItems[i].val === posContainer.currentH) active = menuItems[i];
|
if (menuItems[i].val === posContainer.currentH)
|
||||||
|
active = menuItems[i];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -143,11 +169,14 @@ CollapsibleSection {
|
||||||
from: 0
|
from: 0
|
||||||
to: 100
|
to: 100
|
||||||
suffix: "%"
|
suffix: "%"
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
formatValueFunction: (val) => Math.round(val).toString()
|
bottom: 0
|
||||||
parseValueFunction: (text) => parseInt(text)
|
top: 100
|
||||||
|
}
|
||||||
|
formatValueFunction: val => Math.round(val).toString()
|
||||||
|
parseValueFunction: text => parseInt(text)
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.desktopClockShadowOpacity = newValue / 100;
|
rootPane.desktopClockShadowOpacity = newValue / 100;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -165,11 +194,14 @@ CollapsibleSection {
|
||||||
from: 0
|
from: 0
|
||||||
to: 100
|
to: 100
|
||||||
suffix: "%"
|
suffix: "%"
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
formatValueFunction: (val) => Math.round(val).toString()
|
bottom: 0
|
||||||
parseValueFunction: (text) => parseInt(text)
|
top: 100
|
||||||
|
}
|
||||||
|
formatValueFunction: val => Math.round(val).toString()
|
||||||
|
parseValueFunction: text => parseInt(text)
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.desktopClockShadowBlur = newValue / 100;
|
rootPane.desktopClockShadowBlur = newValue / 100;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -215,11 +247,14 @@ CollapsibleSection {
|
||||||
from: 0
|
from: 0
|
||||||
to: 100
|
to: 100
|
||||||
suffix: "%"
|
suffix: "%"
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
formatValueFunction: (val) => Math.round(val).toString()
|
bottom: 0
|
||||||
parseValueFunction: (text) => parseInt(text)
|
top: 100
|
||||||
|
}
|
||||||
|
formatValueFunction: val => Math.round(val).toString()
|
||||||
|
parseValueFunction: text => parseInt(text)
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.desktopClockBackgroundOpacity = newValue / 100;
|
rootPane.desktopClockBackgroundOpacity = newValue / 100;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -227,7 +262,6 @@ CollapsibleSection {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
StyledText {
|
StyledText {
|
||||||
Layout.topMargin: Appearance.spacing.normal
|
Layout.topMargin: Appearance.spacing.normal
|
||||||
text: qsTr("Visualiser")
|
text: qsTr("Visualiser")
|
||||||
|
|
@ -264,11 +298,14 @@ CollapsibleSection {
|
||||||
from: 0
|
from: 0
|
||||||
to: 10
|
to: 10
|
||||||
stepSize: 1
|
stepSize: 1
|
||||||
validator: IntValidator { bottom: 0; top: 10 }
|
validator: IntValidator {
|
||||||
formatValueFunction: (val) => Math.round(val).toString()
|
bottom: 0
|
||||||
parseValueFunction: (text) => parseInt(text)
|
top: 10
|
||||||
|
}
|
||||||
|
formatValueFunction: val => Math.round(val).toString()
|
||||||
|
parseValueFunction: text => parseInt(text)
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.visualiserRounding = Math.round(newValue);
|
rootPane.visualiserRounding = Math.round(newValue);
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -285,13 +322,15 @@ CollapsibleSection {
|
||||||
value: rootPane.visualiserSpacing
|
value: rootPane.visualiserSpacing
|
||||||
from: 0
|
from: 0
|
||||||
to: 2
|
to: 2
|
||||||
validator: DoubleValidator { bottom: 0; top: 2 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0
|
||||||
|
top: 2
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.visualiserSpacing = newValue;
|
rootPane.visualiserSpacing = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,12 @@ CollapsibleSection {
|
||||||
to: 100
|
to: 100
|
||||||
decimals: 1
|
decimals: 1
|
||||||
suffix: "px"
|
suffix: "px"
|
||||||
validator: DoubleValidator { bottom: 0.1; top: 100 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0.1
|
||||||
|
top: 100
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.borderRounding = newValue;
|
rootPane.borderRounding = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -51,13 +54,15 @@ CollapsibleSection {
|
||||||
to: 100
|
to: 100
|
||||||
decimals: 1
|
decimals: 1
|
||||||
suffix: "px"
|
suffix: "px"
|
||||||
validator: DoubleValidator { bottom: 0.1; top: 100 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0.1
|
||||||
|
top: 100
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.borderThickness = newValue;
|
rootPane.borderThickness = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -143,4 +143,3 @@ CollapsibleSection {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -89,4 +89,3 @@ CollapsibleSection {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -268,13 +268,15 @@ CollapsibleSection {
|
||||||
to: 1.5
|
to: 1.5
|
||||||
decimals: 2
|
decimals: 2
|
||||||
suffix: "×"
|
suffix: "×"
|
||||||
validator: DoubleValidator { bottom: 0.7; top: 1.5 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0.7
|
||||||
|
top: 1.5
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.fontSizeScale = newValue;
|
rootPane.fontSizeScale = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -30,9 +30,12 @@ CollapsibleSection {
|
||||||
to: 2.0
|
to: 2.0
|
||||||
decimals: 1
|
decimals: 1
|
||||||
suffix: "×"
|
suffix: "×"
|
||||||
validator: DoubleValidator { bottom: 0.5; top: 2.0 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0.5
|
||||||
|
top: 2.0
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.paddingScale = newValue;
|
rootPane.paddingScale = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -51,9 +54,12 @@ CollapsibleSection {
|
||||||
to: 5.0
|
to: 5.0
|
||||||
decimals: 1
|
decimals: 1
|
||||||
suffix: "×"
|
suffix: "×"
|
||||||
validator: DoubleValidator { bottom: 0.1; top: 5.0 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0.1
|
||||||
|
top: 5.0
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.roundingScale = newValue;
|
rootPane.roundingScale = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -72,13 +78,15 @@ CollapsibleSection {
|
||||||
to: 2.0
|
to: 2.0
|
||||||
decimals: 1
|
decimals: 1
|
||||||
suffix: "×"
|
suffix: "×"
|
||||||
validator: DoubleValidator { bottom: 0.1; top: 2.0 }
|
validator: DoubleValidator {
|
||||||
|
bottom: 0.1
|
||||||
|
top: 2.0
|
||||||
|
}
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.spacingScale = newValue;
|
rootPane.spacingScale = newValue;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -21,4 +21,3 @@ CollapsibleSection {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -38,11 +38,14 @@ CollapsibleSection {
|
||||||
from: 0
|
from: 0
|
||||||
to: 100
|
to: 100
|
||||||
suffix: "%"
|
suffix: "%"
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
formatValueFunction: (val) => Math.round(val).toString()
|
bottom: 0
|
||||||
parseValueFunction: (text) => parseInt(text)
|
top: 100
|
||||||
|
}
|
||||||
|
formatValueFunction: val => Math.round(val).toString()
|
||||||
|
parseValueFunction: text => parseInt(text)
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.transparencyBase = newValue / 100;
|
rootPane.transparencyBase = newValue / 100;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -60,15 +63,17 @@ CollapsibleSection {
|
||||||
from: 0
|
from: 0
|
||||||
to: 100
|
to: 100
|
||||||
suffix: "%"
|
suffix: "%"
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
formatValueFunction: (val) => Math.round(val).toString()
|
bottom: 0
|
||||||
parseValueFunction: (text) => parseInt(text)
|
top: 100
|
||||||
|
}
|
||||||
|
formatValueFunction: val => Math.round(val).toString()
|
||||||
|
parseValueFunction: text => parseInt(text)
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
rootPane.transparencyLayers = newValue / 100;
|
rootPane.transparencyLayers = newValue / 100;
|
||||||
rootPane.saveConfig();
|
rootPane.saveConfig();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -266,7 +266,10 @@ Item {
|
||||||
StyledInputField {
|
StyledInputField {
|
||||||
id: outputVolumeInput
|
id: outputVolumeInput
|
||||||
Layout.preferredWidth: 70
|
Layout.preferredWidth: 70
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
|
bottom: 0
|
||||||
|
top: 100
|
||||||
|
}
|
||||||
enabled: !Audio.muted
|
enabled: !Audio.muted
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
|
@ -282,7 +285,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onTextEdited: (text) => {
|
onTextEdited: text => {
|
||||||
if (hasFocus) {
|
if (hasFocus) {
|
||||||
const val = parseInt(text);
|
const val = parseInt(text);
|
||||||
if (!isNaN(val) && val >= 0 && val <= 100) {
|
if (!isNaN(val) && val >= 0 && val <= 100) {
|
||||||
|
|
@ -378,7 +381,10 @@ Item {
|
||||||
StyledInputField {
|
StyledInputField {
|
||||||
id: inputVolumeInput
|
id: inputVolumeInput
|
||||||
Layout.preferredWidth: 70
|
Layout.preferredWidth: 70
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
|
bottom: 0
|
||||||
|
top: 100
|
||||||
|
}
|
||||||
enabled: !Audio.sourceMuted
|
enabled: !Audio.sourceMuted
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
|
@ -394,7 +400,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onTextEdited: (text) => {
|
onTextEdited: text => {
|
||||||
if (hasFocus) {
|
if (hasFocus) {
|
||||||
const val = parseInt(text);
|
const val = parseInt(text);
|
||||||
if (!isNaN(val) && val >= 0 && val <= 100) {
|
if (!isNaN(val) && val >= 0 && val <= 100) {
|
||||||
|
|
@ -506,7 +512,10 @@ Item {
|
||||||
StyledInputField {
|
StyledInputField {
|
||||||
id: streamVolumeInput
|
id: streamVolumeInput
|
||||||
Layout.preferredWidth: 70
|
Layout.preferredWidth: 70
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
|
bottom: 0
|
||||||
|
top: 100
|
||||||
|
}
|
||||||
enabled: !Audio.getStreamMuted(modelData)
|
enabled: !Audio.getStreamMuted(modelData)
|
||||||
|
|
||||||
Component.onCompleted: {
|
Component.onCompleted: {
|
||||||
|
|
@ -522,7 +531,7 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
onTextEdited: (text) => {
|
onTextEdited: text => {
|
||||||
if (hasFocus) {
|
if (hasFocus) {
|
||||||
const val = parseInt(text);
|
const val = parseInt(text);
|
||||||
if (!isNaN(val) && val >= 0 && val <= 100) {
|
if (!isNaN(val) && val >= 0 && val <= 100) {
|
||||||
|
|
|
||||||
|
|
@ -68,4 +68,3 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -82,4 +82,3 @@ ColumnLayout {
|
||||||
clip: false
|
clip: false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -69,4 +69,3 @@ SequentialAnimation {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -35,4 +35,3 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -86,7 +86,7 @@ ColumnLayout {
|
||||||
text = root.formatValue(root.value);
|
text = root.formatValue(root.value);
|
||||||
}
|
}
|
||||||
|
|
||||||
onTextEdited: (text) => {
|
onTextEdited: text => {
|
||||||
if (hasFocus) {
|
if (hasFocus) {
|
||||||
const val = root.parseValue(text);
|
const val = root.parseValue(text);
|
||||||
if (!isNaN(val)) {
|
if (!isNaN(val)) {
|
||||||
|
|
@ -178,4 +178,3 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -107,4 +107,3 @@ RowLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -17,7 +17,9 @@ Item {
|
||||||
required property Component rightSettingsComponent
|
required property Component rightSettingsComponent
|
||||||
|
|
||||||
property var activeItem: null
|
property var activeItem: null
|
||||||
property var paneIdGenerator: function(item) { return item ? String(item) : ""; }
|
property var paneIdGenerator: function (item) {
|
||||||
|
return item ? String(item) : "";
|
||||||
|
}
|
||||||
|
|
||||||
property Component overlayComponent: null
|
property Component overlayComponent: null
|
||||||
|
|
||||||
|
|
@ -89,4 +91,3 @@ Item {
|
||||||
active: root.overlayComponent !== null
|
active: root.overlayComponent !== null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -136,27 +136,19 @@ GridView {
|
||||||
gradient: Gradient {
|
gradient: Gradient {
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 0.0
|
position: 0.0
|
||||||
color: Qt.rgba(Colours.palette.m3surface.r,
|
color: Qt.rgba(Colours.palette.m3surface.r, Colours.palette.m3surface.g, Colours.palette.m3surface.b, 0)
|
||||||
Colours.palette.m3surface.g,
|
|
||||||
Colours.palette.m3surface.b, 0)
|
|
||||||
}
|
}
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 0.3
|
position: 0.3
|
||||||
color: Qt.rgba(Colours.palette.m3surface.r,
|
color: Qt.rgba(Colours.palette.m3surface.r, Colours.palette.m3surface.g, Colours.palette.m3surface.b, 0.7)
|
||||||
Colours.palette.m3surface.g,
|
|
||||||
Colours.palette.m3surface.b, 0.7)
|
|
||||||
}
|
}
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 0.6
|
position: 0.6
|
||||||
color: Qt.rgba(Colours.palette.m3surface.r,
|
color: Qt.rgba(Colours.palette.m3surface.r, Colours.palette.m3surface.g, Colours.palette.m3surface.b, 0.9)
|
||||||
Colours.palette.m3surface.g,
|
|
||||||
Colours.palette.m3surface.b, 0.9)
|
|
||||||
}
|
}
|
||||||
GradientStop {
|
GradientStop {
|
||||||
position: 1.0
|
position: 1.0
|
||||||
color: Qt.rgba(Colours.palette.m3surface.r,
|
color: Qt.rgba(Colours.palette.m3surface.r, Colours.palette.m3surface.g, Colours.palette.m3surface.b, 0.95)
|
||||||
Colours.palette.m3surface.g,
|
|
||||||
Colours.palette.m3surface.b, 0.95)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -79,7 +79,6 @@ Item {
|
||||||
Config.save();
|
Config.save();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
AppDb {
|
AppDb {
|
||||||
id: allAppsDb
|
id: allAppsDb
|
||||||
|
|
||||||
|
|
@ -118,9 +117,7 @@ Item {
|
||||||
scoreFn: r => r[0].score
|
scoreFn: r => r[0].score
|
||||||
});
|
});
|
||||||
|
|
||||||
return results
|
return results.sort((a, b) => b._score - a._score).map(r => r.obj._item);
|
||||||
.sort((a, b) => b._score - a._score)
|
|
||||||
.map(r => r.obj._item);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
property list<var> filteredApps: []
|
property list<var> filteredApps: []
|
||||||
|
|
@ -518,7 +515,8 @@ Item {
|
||||||
implicitSize: Appearance.font.size.extraLarge * 3 * 2
|
implicitSize: Appearance.font.size.extraLarge * 3 * 2
|
||||||
source: {
|
source: {
|
||||||
const app = appDetailsLayout.displayedApp;
|
const app = appDetailsLayout.displayedApp;
|
||||||
if (!app) return "image-missing";
|
if (!app)
|
||||||
|
return "image-missing";
|
||||||
const entry = app.entry;
|
const entry = app.entry;
|
||||||
if (entry && entry.icon) {
|
if (entry && entry.icon) {
|
||||||
return Quickshell.iconPath(entry.icon, "image-missing");
|
return Quickshell.iconPath(entry.icon, "image-missing");
|
||||||
|
|
@ -588,7 +586,6 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -215,4 +215,3 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -169,4 +169,3 @@ ColumnLayout {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -181,9 +181,12 @@ Item {
|
||||||
property Component nextComponent: settingsComponent
|
property Component nextComponent: settingsComponent
|
||||||
|
|
||||||
function getComponentForPane() {
|
function getComponentForPane() {
|
||||||
if (vpnPane) return vpnDetailsComponent;
|
if (vpnPane)
|
||||||
if (ethernetPane) return ethernetDetailsComponent;
|
return vpnDetailsComponent;
|
||||||
if (wirelessPane) return wirelessDetailsComponent;
|
if (ethernetPane)
|
||||||
|
return ethernetDetailsComponent;
|
||||||
|
if (wirelessPane)
|
||||||
|
return wirelessDetailsComponent;
|
||||||
return settingsComponent;
|
return settingsComponent;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -199,8 +202,10 @@ Item {
|
||||||
function onActiveChanged() {
|
function onActiveChanged() {
|
||||||
// Clear others when VPN is selected
|
// Clear others when VPN is selected
|
||||||
if (root.session && root.session.vpn && root.session.vpn.active) {
|
if (root.session && root.session.vpn && root.session.vpn.active) {
|
||||||
if (root.session.ethernet && root.session.ethernet.active) root.session.ethernet.active = null;
|
if (root.session.ethernet && root.session.ethernet.active)
|
||||||
if (root.session.network && root.session.network.active) root.session.network.active = null;
|
root.session.ethernet.active = null;
|
||||||
|
if (root.session.network && root.session.network.active)
|
||||||
|
root.session.network.active = null;
|
||||||
}
|
}
|
||||||
rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
|
rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
|
||||||
}
|
}
|
||||||
|
|
@ -213,8 +218,10 @@ Item {
|
||||||
function onActiveChanged() {
|
function onActiveChanged() {
|
||||||
// Clear others when ethernet is selected
|
// Clear others when ethernet is selected
|
||||||
if (root.session && root.session.ethernet && root.session.ethernet.active) {
|
if (root.session && root.session.ethernet && root.session.ethernet.active) {
|
||||||
if (root.session.vpn && root.session.vpn.active) root.session.vpn.active = null;
|
if (root.session.vpn && root.session.vpn.active)
|
||||||
if (root.session.network && root.session.network.active) root.session.network.active = null;
|
root.session.vpn.active = null;
|
||||||
|
if (root.session.network && root.session.network.active)
|
||||||
|
root.session.network.active = null;
|
||||||
}
|
}
|
||||||
rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
|
rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
|
||||||
}
|
}
|
||||||
|
|
@ -227,8 +234,10 @@ Item {
|
||||||
function onActiveChanged() {
|
function onActiveChanged() {
|
||||||
// Clear others when wireless is selected
|
// Clear others when wireless is selected
|
||||||
if (root.session && root.session.network && root.session.network.active) {
|
if (root.session && root.session.network && root.session.network.active) {
|
||||||
if (root.session.vpn && root.session.vpn.active) root.session.vpn.active = null;
|
if (root.session.vpn && root.session.vpn.active)
|
||||||
if (root.session.ethernet && root.session.ethernet.active) root.session.ethernet.active = null;
|
root.session.vpn.active = null;
|
||||||
|
if (root.session.ethernet && root.session.ethernet.active)
|
||||||
|
root.session.ethernet.active = null;
|
||||||
}
|
}
|
||||||
rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
|
rightPaneItem.nextComponent = rightPaneItem.getComponentForPane();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -66,8 +66,7 @@ DeviceDetails {
|
||||||
const isActive = network.active || (Nmcli.active && Nmcli.active.ssid === network.ssid);
|
const isActive = network.active || (Nmcli.active && Nmcli.active.ssid === network.ssid);
|
||||||
if (isActive) {
|
if (isActive) {
|
||||||
if (!Nmcli.wirelessDeviceDetails || Nmcli.wirelessDeviceDetails === null) {
|
if (!Nmcli.wirelessDeviceDetails || Nmcli.wirelessDeviceDetails === null) {
|
||||||
Nmcli.getWirelessDeviceDetails("", () => {
|
Nmcli.getWirelessDeviceDetails("", () => {});
|
||||||
});
|
|
||||||
} else {
|
} else {
|
||||||
connectionUpdateTimer.stop();
|
connectionUpdateTimer.stop();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -165,11 +165,13 @@ DeviceList {
|
||||||
StyledText {
|
StyledText {
|
||||||
Layout.fillWidth: true
|
Layout.fillWidth: true
|
||||||
text: {
|
text: {
|
||||||
if (modelData.active) return qsTr("Connected");
|
if (modelData.active)
|
||||||
|
return qsTr("Connected");
|
||||||
if (modelData.isSecure && modelData.security && modelData.security.length > 0) {
|
if (modelData.isSecure && modelData.security && modelData.security.length > 0) {
|
||||||
return modelData.security;
|
return modelData.security;
|
||||||
}
|
}
|
||||||
if (modelData.isSecure) return qsTr("Secured");
|
if (modelData.isSecure)
|
||||||
|
return qsTr("Secured");
|
||||||
return qsTr("Open");
|
return qsTr("Open");
|
||||||
}
|
}
|
||||||
color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline
|
color: modelData.active ? Colours.palette.m3primary : Colours.palette.m3outline
|
||||||
|
|
|
||||||
|
|
@ -384,8 +384,7 @@ Item {
|
||||||
text = qsTr("Connecting...");
|
text = qsTr("Connecting...");
|
||||||
|
|
||||||
NetworkConnection.connectWithPassword(root.network, password, result => {
|
NetworkConnection.connectWithPassword(root.network, password, result => {
|
||||||
if (result && result.success) {
|
if (result && result.success) {} else if (result && result.needsPassword) {
|
||||||
} else if (result && result.needsPassword) {
|
|
||||||
connectionMonitor.stop();
|
connectionMonitor.stop();
|
||||||
connecting = false;
|
connecting = false;
|
||||||
hasError = true;
|
hasError = true;
|
||||||
|
|
|
||||||
|
|
@ -10,4 +10,3 @@ QtObject {
|
||||||
property bool fabMenuOpen: false
|
property bool fabMenuOpen: false
|
||||||
property bool editingDeviceName: false
|
property bool editingDeviceName: false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,4 +5,3 @@ QtObject {
|
||||||
|
|
||||||
property var active: null
|
property var active: null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,4 +5,3 @@ QtObject {
|
||||||
|
|
||||||
property var active: null
|
property var active: null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -7,4 +7,3 @@ QtObject {
|
||||||
property bool showPasswordDialog: false
|
property bool showPasswordDialog: false
|
||||||
property var pendingNetwork: null
|
property var pendingNetwork: null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -106,4 +106,3 @@ StyledRect {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -541,11 +541,14 @@ Item {
|
||||||
from: 0
|
from: 0
|
||||||
to: 100
|
to: 100
|
||||||
suffix: "px"
|
suffix: "px"
|
||||||
validator: IntValidator { bottom: 0; top: 100 }
|
validator: IntValidator {
|
||||||
formatValueFunction: (val) => Math.round(val).toString()
|
bottom: 0
|
||||||
parseValueFunction: (text) => parseInt(text)
|
top: 100
|
||||||
|
}
|
||||||
|
formatValueFunction: val => Math.round(val).toString()
|
||||||
|
parseValueFunction: text => parseInt(text)
|
||||||
|
|
||||||
onValueModified: (newValue) => {
|
onValueModified: newValue => {
|
||||||
root.dragThreshold = Math.round(newValue);
|
root.dragThreshold = Math.round(newValue);
|
||||||
root.saveConfig();
|
root.saveConfig();
|
||||||
}
|
}
|
||||||
|
|
@ -639,7 +642,6 @@ Item {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -142,7 +142,8 @@ Item {
|
||||||
|
|
||||||
Component.onCompleted: active = Qt.binding(() => {
|
Component.onCompleted: active = Qt.binding(() => {
|
||||||
// Always keep current tab loaded
|
// Always keep current tab loaded
|
||||||
if (pane.index === view.currentIndex) return true;
|
if (pane.index === view.currentIndex)
|
||||||
|
return true;
|
||||||
const vx = Math.floor(view.visibleArea.xPosition * view.contentWidth);
|
const vx = Math.floor(view.visibleArea.xPosition * view.contentWidth);
|
||||||
const vex = Math.floor(vx + view.visibleArea.widthRatio * view.contentWidth);
|
const vex = Math.floor(vx + view.visibleArea.widthRatio * view.contentWidth);
|
||||||
return (vx >= x && vx <= x + implicitWidth) || (vex >= x && vex <= x + implicitWidth);
|
return (vx >= x && vx <= x + implicitWidth) || (vex >= x && vex <= x + implicitWidth);
|
||||||
|
|
|
||||||
|
|
@ -91,7 +91,6 @@ StyledRect {
|
||||||
visible: Config.utilities.vpn.provider.some(p => typeof p === "object" ? (p.enabled === true) : false)
|
visible: Config.utilities.vpn.provider.some(p => typeof p === "object" ? (p.enabled === true) : false)
|
||||||
onClicked: VPN.toggle()
|
onClicked: VPN.toggle()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -106,7 +106,8 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getStreamName(stream: PwNode): string {
|
function getStreamName(stream: PwNode): string {
|
||||||
if (!stream) return qsTr("Unknown");
|
if (!stream)
|
||||||
|
return qsTr("Unknown");
|
||||||
// Try application name first, then description, then name
|
// Try application name first, then description, then name
|
||||||
return stream.applicationName || stream.description || stream.name || qsTr("Unknown Application");
|
return stream.applicationName || stream.description || stream.name || qsTr("Unknown Application");
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ Singleton {
|
||||||
root.savedConnectionSsids = Nmcli.savedConnectionSsids;
|
root.savedConnectionSsids = Nmcli.savedConnectionSsids;
|
||||||
});
|
});
|
||||||
// Get initial WiFi status
|
// Get initial WiFi status
|
||||||
Nmcli.getWifiStatus((enabled) => {
|
Nmcli.getWifiStatus(enabled => {
|
||||||
root.wifiEnabled = enabled;
|
root.wifiEnabled = enabled;
|
||||||
});
|
});
|
||||||
// Sync networks from Nmcli on startup
|
// Sync networks from Nmcli on startup
|
||||||
|
|
@ -41,7 +41,7 @@ Singleton {
|
||||||
property var wirelessDeviceDetails: null
|
property var wirelessDeviceDetails: null
|
||||||
|
|
||||||
function enableWifi(enabled: bool): void {
|
function enableWifi(enabled: bool): void {
|
||||||
Nmcli.enableWifi(enabled, (result) => {
|
Nmcli.enableWifi(enabled, result => {
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
root.getWifiStatus();
|
root.getWifiStatus();
|
||||||
Nmcli.getNetworks(() => {
|
Nmcli.getNetworks(() => {
|
||||||
|
|
@ -52,7 +52,7 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
function toggleWifi(): void {
|
function toggleWifi(): void {
|
||||||
Nmcli.toggleWifi((result) => {
|
Nmcli.toggleWifi(result => {
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
root.getWifiStatus();
|
root.getWifiStatus();
|
||||||
Nmcli.getNetworks(() => {
|
Nmcli.getNetworks(() => {
|
||||||
|
|
@ -73,23 +73,30 @@ Singleton {
|
||||||
// Set up pending connection tracking if callback provided
|
// Set up pending connection tracking if callback provided
|
||||||
if (callback) {
|
if (callback) {
|
||||||
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
||||||
root.pendingConnection = { ssid: ssid, bssid: hasBssid ? bssid : "", callback: callback };
|
root.pendingConnection = {
|
||||||
|
ssid: ssid,
|
||||||
|
bssid: hasBssid ? bssid : "",
|
||||||
|
callback: callback
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
Nmcli.connectToNetwork(ssid, password, bssid, (result) => {
|
Nmcli.connectToNetwork(ssid, password, bssid, result => {
|
||||||
if (result && result.success) {
|
if (result && result.success) {
|
||||||
// Connection successful
|
// Connection successful
|
||||||
if (callback) callback(result);
|
if (callback)
|
||||||
|
callback(result);
|
||||||
root.pendingConnection = null;
|
root.pendingConnection = null;
|
||||||
} else if (result && result.needsPassword) {
|
} else if (result && result.needsPassword) {
|
||||||
// Password needed - callback will handle showing dialog
|
// Password needed - callback will handle showing dialog
|
||||||
if (callback) callback(result);
|
if (callback)
|
||||||
|
callback(result);
|
||||||
} else {
|
} else {
|
||||||
// Connection failed
|
// Connection failed
|
||||||
if (result && result.error) {
|
if (result && result.error) {
|
||||||
root.connectionFailed(ssid);
|
root.connectionFailed(ssid);
|
||||||
}
|
}
|
||||||
if (callback) callback(result);
|
if (callback)
|
||||||
|
callback(result);
|
||||||
root.pendingConnection = null;
|
root.pendingConnection = null;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
@ -98,22 +105,29 @@ Singleton {
|
||||||
function connectToNetworkWithPasswordCheck(ssid: string, isSecure: bool, callback: var, bssid: string): void {
|
function connectToNetworkWithPasswordCheck(ssid: string, isSecure: bool, callback: var, bssid: string): void {
|
||||||
// Set up pending connection tracking
|
// Set up pending connection tracking
|
||||||
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
const hasBssid = bssid !== undefined && bssid !== null && bssid.length > 0;
|
||||||
root.pendingConnection = { ssid: ssid, bssid: hasBssid ? bssid : "", callback: callback };
|
root.pendingConnection = {
|
||||||
|
ssid: ssid,
|
||||||
|
bssid: hasBssid ? bssid : "",
|
||||||
|
callback: callback
|
||||||
|
};
|
||||||
|
|
||||||
Nmcli.connectToNetworkWithPasswordCheck(ssid, isSecure, (result) => {
|
Nmcli.connectToNetworkWithPasswordCheck(ssid, isSecure, result => {
|
||||||
if (result && result.success) {
|
if (result && result.success) {
|
||||||
// Connection successful
|
// Connection successful
|
||||||
if (callback) callback(result);
|
if (callback)
|
||||||
|
callback(result);
|
||||||
root.pendingConnection = null;
|
root.pendingConnection = null;
|
||||||
} else if (result && result.needsPassword) {
|
} else if (result && result.needsPassword) {
|
||||||
// Password needed - callback will handle showing dialog
|
// Password needed - callback will handle showing dialog
|
||||||
if (callback) callback(result);
|
if (callback)
|
||||||
|
callback(result);
|
||||||
} else {
|
} else {
|
||||||
// Connection failed
|
// Connection failed
|
||||||
if (result && result.error) {
|
if (result && result.error) {
|
||||||
root.connectionFailed(ssid);
|
root.connectionFailed(ssid);
|
||||||
}
|
}
|
||||||
if (callback) callback(result);
|
if (callback)
|
||||||
|
callback(result);
|
||||||
root.pendingConnection = null;
|
root.pendingConnection = null;
|
||||||
}
|
}
|
||||||
}, bssid);
|
}, bssid);
|
||||||
|
|
@ -133,7 +147,7 @@ Singleton {
|
||||||
function forgetNetwork(ssid: string): void {
|
function forgetNetwork(ssid: string): void {
|
||||||
// Delete the connection profile for this network
|
// Delete the connection profile for this network
|
||||||
// This will remove the saved password and connection settings
|
// This will remove the saved password and connection settings
|
||||||
Nmcli.forgetNetwork(ssid, (result) => {
|
Nmcli.forgetNetwork(ssid, result => {
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
// Refresh network list after deletion
|
// Refresh network list after deletion
|
||||||
Qt.callLater(() => {
|
Qt.callLater(() => {
|
||||||
|
|
@ -145,7 +159,6 @@ Singleton {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
property list<string> savedConnections: []
|
property list<string> savedConnections: []
|
||||||
property list<string> savedConnectionSsids: []
|
property list<string> savedConnectionSsids: []
|
||||||
|
|
||||||
|
|
@ -226,28 +239,29 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
function getWifiStatus(): void {
|
function getWifiStatus(): void {
|
||||||
Nmcli.getWifiStatus((enabled) => {
|
Nmcli.getWifiStatus(enabled => {
|
||||||
root.wifiEnabled = enabled;
|
root.wifiEnabled = enabled;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
function getEthernetDevices(): void {
|
function getEthernetDevices(): void {
|
||||||
root.ethernetProcessRunning = true;
|
root.ethernetProcessRunning = true;
|
||||||
Nmcli.getEthernetInterfaces((interfaces) => {
|
Nmcli.getEthernetInterfaces(interfaces => {
|
||||||
root.ethernetDevices = Nmcli.ethernetDevices;
|
root.ethernetDevices = Nmcli.ethernetDevices;
|
||||||
root.ethernetDeviceCount = Nmcli.ethernetDevices.length;
|
root.ethernetDeviceCount = Nmcli.ethernetDevices.length;
|
||||||
root.ethernetProcessRunning = false;
|
root.ethernetProcessRunning = false;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function connectEthernet(connectionName: string, interfaceName: string): void {
|
function connectEthernet(connectionName: string, interfaceName: string): void {
|
||||||
Nmcli.connectEthernet(connectionName, interfaceName, (result) => {
|
Nmcli.connectEthernet(connectionName, interfaceName, result => {
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
getEthernetDevices();
|
getEthernetDevices();
|
||||||
// Refresh device details after connection
|
// Refresh device details after connection
|
||||||
Qt.callLater(() => {
|
Qt.callLater(() => {
|
||||||
const activeDevice = root.ethernetDevices.find(function(d) { return d.connected; });
|
const activeDevice = root.ethernetDevices.find(function (d) {
|
||||||
|
return d.connected;
|
||||||
|
});
|
||||||
if (activeDevice && activeDevice.interface) {
|
if (activeDevice && activeDevice.interface) {
|
||||||
updateEthernetDeviceDetails(activeDevice.interface);
|
updateEthernetDeviceDetails(activeDevice.interface);
|
||||||
}
|
}
|
||||||
|
|
@ -257,7 +271,7 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
function disconnectEthernet(connectionName: string): void {
|
function disconnectEthernet(connectionName: string): void {
|
||||||
Nmcli.disconnectEthernet(connectionName, (result) => {
|
Nmcli.disconnectEthernet(connectionName, result => {
|
||||||
if (result.success) {
|
if (result.success) {
|
||||||
getEthernetDevices();
|
getEthernetDevices();
|
||||||
// Clear device details after disconnection
|
// Clear device details after disconnection
|
||||||
|
|
@ -269,7 +283,7 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
function updateEthernetDeviceDetails(interfaceName: string): void {
|
function updateEthernetDeviceDetails(interfaceName: string): void {
|
||||||
Nmcli.getEthernetDeviceDetails(interfaceName, (details) => {
|
Nmcli.getEthernetDeviceDetails(interfaceName, details => {
|
||||||
root.ethernetDeviceDetails = details;
|
root.ethernetDeviceDetails = details;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -277,7 +291,7 @@ Singleton {
|
||||||
function updateWirelessDeviceDetails(): void {
|
function updateWirelessDeviceDetails(): void {
|
||||||
// Find the wireless interface by looking for wifi devices
|
// Find the wireless interface by looking for wifi devices
|
||||||
// Pass empty string to let Nmcli find the active interface automatically
|
// Pass empty string to let Nmcli find the active interface automatically
|
||||||
Nmcli.getWirelessDeviceDetails("", (details) => {
|
Nmcli.getWirelessDeviceDetails("", details => {
|
||||||
root.wirelessDeviceDetails = details;
|
root.wirelessDeviceDetails = details;
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
@ -290,12 +304,7 @@ Singleton {
|
||||||
}
|
}
|
||||||
|
|
||||||
const mask = (0xffffffff << (32 - cidrNum)) >>> 0;
|
const mask = (0xffffffff << (32 - cidrNum)) >>> 0;
|
||||||
const octets = [
|
const octets = [(mask >>> 24) & 0xff, (mask >>> 16) & 0xff, (mask >>> 8) & 0xff, mask & 0xff];
|
||||||
(mask >>> 24) & 0xff,
|
|
||||||
(mask >>> 16) & 0xff,
|
|
||||||
(mask >>> 8) & 0xff,
|
|
||||||
mask & 0xff
|
|
||||||
];
|
|
||||||
|
|
||||||
return octets.join(".");
|
return octets.join(".");
|
||||||
}
|
}
|
||||||
|
|
@ -312,5 +321,4 @@ Singleton {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -73,10 +73,7 @@ QtObject {
|
||||||
Nmcli.connectToNetwork(network.ssid, "", network.bssid, null);
|
Nmcli.connectToNetwork(network.ssid, "", network.bssid, null);
|
||||||
} else {
|
} else {
|
||||||
// Use password check with callback
|
// Use password check with callback
|
||||||
Nmcli.connectToNetworkWithPasswordCheck(
|
Nmcli.connectToNetworkWithPasswordCheck(network.ssid, network.isSecure, result => {
|
||||||
network.ssid,
|
|
||||||
network.isSecure,
|
|
||||||
(result) => {
|
|
||||||
if (result.needsPassword) {
|
if (result.needsPassword) {
|
||||||
// Clear pending connection if exists
|
// Clear pending connection if exists
|
||||||
if (Nmcli.pendingConnection) {
|
if (Nmcli.pendingConnection) {
|
||||||
|
|
@ -94,9 +91,7 @@ QtObject {
|
||||||
onPasswordNeeded(network);
|
onPasswordNeeded(network);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
},
|
}, network.bssid);
|
||||||
network.bssid
|
|
||||||
);
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
Nmcli.connectToNetwork(network.ssid, "", network.bssid, null);
|
Nmcli.connectToNetwork(network.ssid, "", network.bssid, null);
|
||||||
|
|
@ -119,4 +114,3 @@ QtObject {
|
||||||
Nmcli.connectToNetwork(network.ssid, password || "", network.bssid || "", onResult || null);
|
Nmcli.connectToNetwork(network.ssid, password || "", network.bssid || "", onResult || null);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue