1
0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-08-03 20:18:31 -04:00

qs: large sweep of dead code removals

This commit is contained in:
bbedward
2026-07-26 23:22:22 -04:00
parent bab2078dfd
commit c67b185076
113 changed files with 1467 additions and 3254 deletions
+3 -13
View File
@@ -2,6 +2,7 @@ import QtQuick
import qs.Common
import qs.Services
import qs.Widgets
import "../../Common/QmlUtils.js" as QmlUtils
Column {
id: root
@@ -18,7 +19,7 @@ Column {
property bool isInitialized: false
function loadValue() {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings && settings.pluginService) {
const loadedValue = settings.loadValue(settingKey, defaultValue);
value = loadedValue;
@@ -33,23 +34,12 @@ Column {
onValueChanged: {
if (!isInitialized)
return;
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
settings.saveValue(settingKey, value);
}
}
function findSettings() {
let item = parent;
while (item) {
if (item.saveValue !== undefined && item.loadValue !== undefined) {
return item;
}
item = item.parent;
}
return null;
}
StyledText {
text: root.label
font.pixelSize: Theme.fontSizeMedium
+3 -13
View File
@@ -1,6 +1,7 @@
import QtQuick
import qs.Common
import qs.Widgets
import "../../Common/QmlUtils.js" as QmlUtils
Column {
id: root
@@ -16,30 +17,19 @@ Column {
spacing: Theme.spacingM
Component.onCompleted: {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
items = settings.loadValue(settingKey, defaultValue);
}
}
onItemsChanged: {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
settings.saveValue(settingKey, items);
}
}
function findSettings() {
let item = parent;
while (item) {
if (item.saveValue !== undefined && item.loadValue !== undefined) {
return item;
}
item = item.parent;
}
return null;
}
function addItem(item) {
items = items.concat([item]);
}
@@ -1,6 +1,7 @@
import QtQuick
import qs.Common
import qs.Widgets
import "../../Common/QmlUtils.js" as QmlUtils
Column {
id: root
@@ -22,7 +23,7 @@ Column {
}
function loadValue() {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
isLoading = true;
items = settings.loadValue(settingKey, defaultValue);
@@ -34,23 +35,12 @@ Column {
if (isLoading) {
return;
}
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
settings.saveValue(settingKey, items);
}
}
function findSettings() {
let item = parent;
while (item) {
if (item.saveValue !== undefined && item.loadValue !== undefined) {
return item;
}
item = item.parent;
}
return null;
}
function addItem(item) {
items = items.concat([item]);
}
@@ -1,43 +0,0 @@
import QtQuick
import qs.Common
import qs.Services
import qs.Widgets
Item {
id: root
property string pluginId: ""
property var pluginInstance: null
property bool isCompoundPill: false
property bool isSmallToggle: false
readonly property bool hasDetail: pluginInstance?.ccDetailContent !== null
readonly property string iconName: pluginInstance?.ccWidgetIcon || "extension"
readonly property string primaryText: pluginInstance?.ccWidgetPrimaryText || "Plugin"
readonly property string secondaryText: pluginInstance?.ccWidgetSecondaryText || ""
readonly property bool isActive: pluginInstance?.ccWidgetIsActive || false
readonly property Component detailContent: pluginInstance?.ccDetailContent || null
readonly property real detailHeight: pluginInstance?.ccDetailHeight || 250
signal toggled
signal expanded
Component.onCompleted: {
if (pluginInstance) {
pluginInstance.ccWidgetToggled.connect(toggled);
pluginInstance.ccWidgetExpanded.connect(expanded);
}
}
function invokeToggle() {
if (pluginInstance) {
pluginInstance.ccWidgetToggled();
}
}
function invokeExpand() {
if (pluginInstance) {
pluginInstance.ccWidgetExpanded();
}
}
}
+20 -30
View File
@@ -1,6 +1,7 @@
import QtQuick
import qs.Common
import qs.Widgets
import "../../Common/QmlUtils.js" as QmlUtils
Column {
id: root
@@ -16,68 +17,57 @@ Column {
spacing: Theme.spacingS
function loadValue() {
const settings = findSettings()
const settings = QmlUtils.findSettings(root.parent);
if (settings && settings.pluginService) {
value = settings.loadValue(settingKey, defaultValue)
value = settings.loadValue(settingKey, defaultValue);
}
}
Component.onCompleted: {
loadValue()
loadValue();
}
readonly property var optionLabels: {
const labels = []
const labels = [];
for (let i = 0; i < options.length; i++) {
labels.push(options[i].label || options[i])
labels.push(options[i].label || options[i]);
}
return labels
return labels;
}
readonly property var valueToLabel: {
const map = {}
const map = {};
for (let i = 0; i < options.length; i++) {
const opt = options[i]
const opt = options[i];
if (typeof opt === 'object') {
map[opt.value] = opt.label
map[opt.value] = opt.label;
} else {
map[opt] = opt
map[opt] = opt;
}
}
return map
return map;
}
readonly property var labelToValue: {
const map = {}
const map = {};
for (let i = 0; i < options.length; i++) {
const opt = options[i]
const opt = options[i];
if (typeof opt === 'object') {
map[opt.label] = opt.value
map[opt.label] = opt.value;
} else {
map[opt] = opt
map[opt] = opt;
}
}
return map
return map;
}
onValueChanged: {
const settings = findSettings()
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
settings.saveValue(settingKey, value)
settings.saveValue(settingKey, value);
}
}
function findSettings() {
let item = parent
while (item) {
if (item.saveValue !== undefined && item.loadValue !== undefined) {
return item
}
item = item.parent
}
return null
}
DankDropdown {
width: parent.width
text: root.label
@@ -85,7 +75,7 @@ Column {
currentValue: root.valueToLabel[root.value] || root.value
options: root.optionLabels
onValueChanged: newValue => {
root.value = root.labelToValue[newValue] || newValue
root.value = root.labelToValue[newValue] || newValue;
}
}
}
+3 -13
View File
@@ -1,6 +1,7 @@
import QtQuick
import qs.Common
import qs.Widgets
import "../../Common/QmlUtils.js" as QmlUtils
Column {
id: root
@@ -20,7 +21,7 @@ Column {
spacing: Theme.spacingS
function loadValue() {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings && settings.pluginService) {
value = settings.loadValue(settingKey, defaultValue);
}
@@ -31,23 +32,12 @@ Column {
}
onValueChanged: {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
settings.saveValue(settingKey, value);
}
}
function findSettings() {
let item = parent;
while (item) {
if (item.saveValue !== undefined && item.loadValue !== undefined) {
return item;
}
item = item.parent;
}
return null;
}
StyledText {
text: root.label
font.pixelSize: Theme.fontSizeMedium
+3 -13
View File
@@ -1,6 +1,7 @@
import QtQuick
import qs.Common
import qs.Widgets
import "../../Common/QmlUtils.js" as QmlUtils
Column {
id: root
@@ -18,7 +19,7 @@ Column {
property bool isInitialized: false
function loadValue() {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings && settings.pluginService) {
const loadedValue = settings.loadValue(settingKey, defaultValue);
if (textField.activeFocus && isInitialized)
@@ -39,22 +40,11 @@ Column {
if (textField.text === value)
return;
value = textField.text;
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings)
settings.saveValue(settingKey, value);
}
function findSettings() {
let item = parent;
while (item) {
if (item.saveValue !== undefined && item.loadValue !== undefined) {
return item;
}
item = item.parent;
}
return null;
}
StyledText {
text: root.label
font.pixelSize: Theme.fontSizeMedium
+3 -13
View File
@@ -1,6 +1,7 @@
import QtQuick
import qs.Common
import qs.Widgets
import "../../Common/QmlUtils.js" as QmlUtils
Row {
id: root
@@ -17,7 +18,7 @@ Row {
property bool isInitialized: false
function loadValue() {
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings && settings.pluginService) {
const loadedValue = settings.loadValue(settingKey, defaultValue);
value = loadedValue;
@@ -32,23 +33,12 @@ Row {
onValueChanged: {
if (!isInitialized)
return;
const settings = findSettings();
const settings = QmlUtils.findSettings(root.parent);
if (settings) {
settings.saveValue(settingKey, value);
}
}
function findSettings() {
let item = parent;
while (item) {
if (item.saveValue !== undefined && item.loadValue !== undefined) {
return item;
}
item = item.parent;
}
return null;
}
Column {
width: parent.width - toggle.width - Theme.spacingM
spacing: Theme.spacingXS