changes to config plugin, reduce file amount + code, fix greeter
This commit is contained in:
@@ -171,10 +171,11 @@ ListView {
|
||||
item.held = true;
|
||||
|
||||
itemContent.x = Qt.binding(() => {
|
||||
if (!root)
|
||||
if (!root) {
|
||||
return 0;
|
||||
}
|
||||
|
||||
const maxOvershoot = Tokens.padding.extraExtraLarge;
|
||||
const maxOvershoot = Tokens.padding.extraLargeIncreased;
|
||||
const x = mouse.mouseX - item.pressPos.x;
|
||||
return root.dampOvershoot(Math.abs(x), maxOvershoot) * Math.sign(x);
|
||||
});
|
||||
|
||||
@@ -1,5 +1,3 @@
|
||||
pragma ComponentBehavior: Bound
|
||||
|
||||
import QtQuick.Layouts
|
||||
import ZShell.Config
|
||||
import qs.Modules.Settings.Common
|
||||
@@ -42,42 +40,24 @@ PageBase {
|
||||
}
|
||||
|
||||
first: true
|
||||
values: Config.bar.tray.statusIcons
|
||||
values: Config.bar.tray.statusIcons.values
|
||||
z: 1
|
||||
|
||||
onItemMoved: (from, to) => {
|
||||
const icons = Config.bar.tray.statusIcons.slice();
|
||||
const [moved] = icons.splice(from, 1);
|
||||
icons.splice(to, 0, moved);
|
||||
Config.bar.tray.statusIcons = icons;
|
||||
}
|
||||
onItemRemoved: index => {
|
||||
const icons = Config.bar.tray.statusIcons.slice();
|
||||
icons.splice(index, 1);
|
||||
Config.bar.tray.statusIcons = icons;
|
||||
}
|
||||
onItemToggled: (index, checked) => {
|
||||
const icons = Config.bar.tray.statusIcons.slice();
|
||||
icons[index] = Object.assign({}, icons[index], {
|
||||
enabled: checked
|
||||
});
|
||||
Config.bar.tray.statusIcons = icons;
|
||||
}
|
||||
onItemMoved: (from, to) => Config.bar.tray.statusIcons.move(from, to)
|
||||
onItemRemoved: index => Config.bar.tray.statusIcons.remove(index)
|
||||
onItemToggled: (index, checked) => Config.bar.tray.statusIcons.at(index).enabled = checked
|
||||
}
|
||||
|
||||
DialogSelectButton {
|
||||
id: addItemContainer
|
||||
|
||||
acceptLabel: qsTr("Add")
|
||||
enabled: {
|
||||
console.log(Object.keys(model).length);
|
||||
return Object.keys(model).length > 0;
|
||||
}
|
||||
enabled: Object.keys(model).length > 0
|
||||
header: qsTr("Add new entry")
|
||||
icon: "add"
|
||||
label: qsTr("Add entry")
|
||||
model: {
|
||||
const present = new Set(Config.bar.tray.statusIcons.map(item => item.id));
|
||||
const present = new Set(Config.bar.tray.statusIcons.values.map(item => item.id));
|
||||
return Object.keys(root.builtinIcons).filter(id => !present.has(id)).map(id => ({
|
||||
id: id,
|
||||
label: root.builtinIcons[id]
|
||||
@@ -89,12 +69,10 @@ PageBase {
|
||||
if (!selectedItem)
|
||||
return;
|
||||
|
||||
const icons = Config.bar.tray.statusIcons.slice();
|
||||
icons.push({
|
||||
Config.bar.tray.statusIcons.insert({
|
||||
id: selectedItem,
|
||||
enabled: true
|
||||
});
|
||||
Config.bar.tray.statusIcons = icons;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -106,6 +84,7 @@ PageBase {
|
||||
ToggleRow {
|
||||
checked: Config.bar.popouts.statusIcons
|
||||
first: true
|
||||
last: true
|
||||
settingAnchor: "bar-status-popout-on-hover"
|
||||
subtext: qsTr("Show a details popout when hovering the status icons")
|
||||
text: qsTr("Popout on hover")
|
||||
|
||||
Reference in New Issue
Block a user