From 3f20aa8878ebd99823bb6faea8398bb0a1150034 Mon Sep 17 00:00:00 2001 From: Evgenii Alekseev Date: Wed, 27 Mar 2024 01:28:14 +0200 Subject: [PATCH] massive qml edit --- sensors | 284 ------------------ .../package/contents/ui/about.qml | 5 + .../package/contents/ui/advanced.qml | 28 +- .../package/contents/ui/appearance.qml | 1 - .../package/contents/ui/dataengine.qml | 50 +-- sources/awesome-widget/plugin/awactions.cpp | 7 - sources/awesome-widget/plugin/awactions.h | 1 - .../package/contents/ui/about.qml | 13 +- .../package/contents/ui/activeapp.qml | 20 +- .../package/contents/ui/advanced.qml | 75 ++--- .../package/contents/ui/inactiveapp.qml | 20 +- .../package/contents/ui/main.qml | 38 +-- .../package/contents/ui/widget.qml | 16 +- sources/desktop-panel/plugin/dpadds.cpp | 11 +- sources/desktop-panel/plugin/dpadds.h | 1 - sources/qml/AWExtensions.qml | 38 +-- sources/qml/AWInfoLabel.qml | 2 + sources/qml/AWTextEditor.qml | 12 +- sources/qml/BugReport.qml | 26 +- sources/qml/ButtonSelector.qml | 2 + sources/qml/CheckBoxSelector.qml | 1 + sources/qml/ColorSelector.qml | 9 +- sources/qml/ComboBoxSelector.qml | 10 +- sources/qml/ExportDialog.qml | 4 +- sources/qml/General.qml | 1 + sources/qml/HtmlDefaultFunctionsBar.qml | 8 + sources/qml/HtmlEditorButton.qml | 2 +- sources/qml/HtmlEditorFont.qml | 4 +- sources/qml/ImportDialog.qml | 3 +- sources/qml/IntegerSelector.qml | 1 + sources/qml/LineSelector.qml | 1 + 31 files changed, 175 insertions(+), 519 deletions(-) delete mode 100644 sensors diff --git a/sensors b/sensors deleted file mode 100644 index 095e48b..0000000 --- a/sensors +++ /dev/null @@ -1,284 +0,0 @@ -cpu -cpu/all -cpu/all/averageFrequency -cpu/all/averageTemperature -cpu/all/coreCount -cpu/all/cpuCount -cpu/all/maximumFrequency -cpu/all/maximumTemperature -cpu/all/minimumFrequency -cpu/all/minimumTemperature -cpu/all/name -cpu/all/system -cpu/all/usage -cpu/all/user -cpu/all/wait -cpu/cpu0 -cpu/cpu0/frequency -cpu/cpu0/name -cpu/cpu0/system -cpu/cpu0/temperature -cpu/cpu0/usage -cpu/cpu0/user -cpu/cpu0/wait -cpu/cpu1 -cpu/cpu1/frequency -cpu/cpu1/name -cpu/cpu1/system -cpu/cpu1/temperature -cpu/cpu1/usage -cpu/cpu1/user -cpu/cpu1/wait -cpu/cpu10 -cpu/cpu10/frequency -cpu/cpu10/name -cpu/cpu10/system -cpu/cpu10/temperature -cpu/cpu10/usage -cpu/cpu10/user -cpu/cpu10/wait -cpu/cpu11 -cpu/cpu11/frequency -cpu/cpu11/name -cpu/cpu11/system -cpu/cpu11/temperature -cpu/cpu11/usage -cpu/cpu11/user -cpu/cpu11/wait -cpu/cpu12 -cpu/cpu12/frequency -cpu/cpu12/name -cpu/cpu12/system -cpu/cpu12/temperature -cpu/cpu12/usage -cpu/cpu12/user -cpu/cpu12/wait -cpu/cpu13 -cpu/cpu13/frequency -cpu/cpu13/name -cpu/cpu13/system -cpu/cpu13/temperature -cpu/cpu13/usage -cpu/cpu13/user -cpu/cpu13/wait -cpu/cpu14 -cpu/cpu14/frequency -cpu/cpu14/name -cpu/cpu14/system -cpu/cpu14/temperature -cpu/cpu14/usage -cpu/cpu14/user -cpu/cpu14/wait -cpu/cpu15 -cpu/cpu15/frequency -cpu/cpu15/name -cpu/cpu15/system -cpu/cpu15/temperature -cpu/cpu15/usage -cpu/cpu15/user -cpu/cpu15/wait -cpu/cpu16 -cpu/cpu16/frequency -cpu/cpu16/name -cpu/cpu16/system -cpu/cpu16/temperature -cpu/cpu16/usage -cpu/cpu16/user -cpu/cpu16/wait -cpu/cpu17 -cpu/cpu17/frequency -cpu/cpu17/name -cpu/cpu17/system -cpu/cpu17/temperature -cpu/cpu17/usage -cpu/cpu17/user -cpu/cpu17/wait -cpu/cpu18 -cpu/cpu18/frequency -cpu/cpu18/name -cpu/cpu18/system -cpu/cpu18/temperature -cpu/cpu18/usage -cpu/cpu18/user -cpu/cpu18/wait -cpu/cpu19 -cpu/cpu19/frequency -cpu/cpu19/name -cpu/cpu19/system -cpu/cpu19/temperature -cpu/cpu19/usage -cpu/cpu19/user -cpu/cpu19/wait -cpu/cpu2 -cpu/cpu2/frequency -cpu/cpu2/name -cpu/cpu2/system -cpu/cpu2/temperature -cpu/cpu2/usage -cpu/cpu2/user -cpu/cpu2/wait -cpu/cpu3 -cpu/cpu3/frequency -cpu/cpu3/name -cpu/cpu3/system -cpu/cpu3/temperature -cpu/cpu3/usage -cpu/cpu3/user -cpu/cpu3/wait -cpu/cpu4 -cpu/cpu4/frequency -cpu/cpu4/name -cpu/cpu4/system -cpu/cpu4/temperature -cpu/cpu4/usage -cpu/cpu4/user -cpu/cpu4/wait -cpu/cpu5 -cpu/cpu5/frequency -cpu/cpu5/name -cpu/cpu5/system -cpu/cpu5/temperature -cpu/cpu5/usage -cpu/cpu5/user -cpu/cpu5/wait -cpu/cpu6 -cpu/cpu6/frequency -cpu/cpu6/name -cpu/cpu6/system -cpu/cpu6/temperature -cpu/cpu6/usage -cpu/cpu6/user -cpu/cpu6/wait -cpu/cpu7 -cpu/cpu7/frequency -cpu/cpu7/name -cpu/cpu7/system -cpu/cpu7/temperature -cpu/cpu7/usage -cpu/cpu7/user -cpu/cpu7/wait -cpu/cpu8 -cpu/cpu8/frequency -cpu/cpu8/name -cpu/cpu8/system -cpu/cpu8/temperature -cpu/cpu8/usage -cpu/cpu8/user -cpu/cpu8/wait -cpu/cpu9 -cpu/cpu9/frequency -cpu/cpu9/name -cpu/cpu9/system -cpu/cpu9/temperature -cpu/cpu9/usage -cpu/cpu9/user -cpu/cpu9/wait -cpu/loadaverages -cpu/loadaverages/loadaverage1 -cpu/loadaverages/loadaverage15 -cpu/loadaverages/loadaverage5 -disk -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85 -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/free -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/freePercent -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/name -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/read -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/total -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/used -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/usedPercent -disk/52e29d18-ad4d-47ad-98c4-a09ab0914a85/write -disk/all -disk/all/free -disk/all/freePercent -disk/all/read -disk/all/total -disk/all/used -disk/all/usedPercent -disk/all/write -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258 -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/free -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/freePercent -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/name -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/read -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/total -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/used -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/usedPercent -disk/d10dd7bf-e382-4e44-83d7-9af6c6df7258/write -disk/nvme0n1 -disk/nvme0n1/name -disk/nvme0n1/read -disk/nvme0n1/total -disk/nvme0n1/write -gpu -lmsensors -lmsensors/BAT0-acpi-0 -lmsensors/BAT0-acpi-0/in0 -lmsensors/acpitz-acpi-0 -lmsensors/acpitz-acpi-0/temp1 -lmsensors/iwlwifi_1-virtual-0 -lmsensors/iwlwifi_1-virtual-0/temp1 -lmsensors/nvme-pci-0400 -lmsensors/nvme-pci-0400/temp1 -lmsensors/thinkpad-isa-0000 -lmsensors/thinkpad-isa-0000/fan1 -lmsensors/thinkpad-isa-0000/fan2 -lmsensors/thinkpad-isa-0000/temp1 -lmsensors/thinkpad-isa-0000/temp2 -lmsensors/thinkpad-isa-0000/temp3 -lmsensors/thinkpad-isa-0000/temp4 -lmsensors/thinkpad-isa-0000/temp5 -lmsensors/thinkpad-isa-0000/temp6 -lmsensors/thinkpad-isa-0000/temp7 -lmsensors/thinkpad-isa-0000/temp8 -lmsensors/ucsi_source_psy_USBC000:001-isa-0000 -lmsensors/ucsi_source_psy_USBC000:001-isa-0000/curr1 -lmsensors/ucsi_source_psy_USBC000:001-isa-0000/in0 -lmsensors/ucsi_source_psy_USBC000:002-isa-0000 -lmsensors/ucsi_source_psy_USBC000:002-isa-0000/curr1 -lmsensors/ucsi_source_psy_USBC000:002-isa-0000/in0 -memory -memory/physical -memory/physical/application -memory/physical/applicationPercent -memory/physical/buffer -memory/physical/bufferPercent -memory/physical/cache -memory/physical/cachePercent -memory/physical/free -memory/physical/freePercent -memory/physical/total -memory/physical/used -memory/physical/usedPercent -memory/swap -memory/swap/free -memory/swap/freePercent -memory/swap/total -memory/swap/used -memory/swap/usedPercent -os -os/kernel -os/kernel/name -os/kernel/prettyName -os/kernel/version -os/plasma -os/plasma/kfVersion -os/plasma/plasmaVersion -os/plasma/qtVersion -os/plasma/windowsystem -os/system -os/system/hostname -os/system/logo -os/system/name -os/system/prettyName -os/system/uptime -os/system/url -os/system/version -power -power/4870 -power/4870/capacity -power/4870/charge -power/4870/chargePercentage -power/4870/chargeRate -power/4870/design -power/4870/health -power/4870/name diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml index 071da9b..abbdbd1 100644 --- a/sources/awesome-widget/package/contents/ui/about.qml +++ b/sources/awesome-widget/package/contents/ui/about.qml @@ -24,6 +24,11 @@ import org.kde.plasma.private.awesomewidget 1.0 KCM.SimpleKCM { id: aboutPage + // backend + AWActions { + id: awActions + } + AboutTab { textProvider: awActions } diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml index b3b7010..65af711 100644 --- a/sources/awesome-widget/package/contents/ui/advanced.qml +++ b/sources/awesome-widget/package/contents/ui/advanced.qml @@ -129,32 +129,32 @@ KCM.SimpleKCM { id: tempUnits model: [ { - 'label': i18n("Celsius"), - 'name': "Celsius" + "label": i18n("Celsius"), + "name": "Celsius" }, { - 'label': i18n("Fahrenheit"), - 'name': "Fahrenheit" + "label": i18n("Fahrenheit"), + "name": "Fahrenheit" }, { - 'label': i18n("Kelvin"), - 'name': "Kelvin" + "label": i18n("Kelvin"), + "name": "Kelvin" }, { - 'label': i18n("Reaumur"), - 'name': "Reaumur" + "label": i18n("Reaumur"), + "name": "Reaumur" }, { - 'label': i18n("cm^-1"), - 'name': "cm^-1" + "label": i18n("cm^-1"), + "name": "cm^-1" }, { - 'label': i18n("kJ/mol"), - 'name': "kJ/mol" + "label": i18n("kJ/mol"), + "name": "kJ/mol" }, { - 'label': i18n("kcal/mol"), - 'name': "kcal/mol" + "label": i18n("kcal/mol"), + "name": "kcal/mol" } ] text: i18n("Temperature units") diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml index 189c618..bbc0afd 100644 --- a/sources/awesome-widget/package/contents/ui/appearance.qml +++ b/sources/awesome-widget/package/contents/ui/appearance.qml @@ -41,7 +41,6 @@ KCM.SimpleKCM { property alias cfg_textStyleColor: selectStyleColor.value property string cfg_textStyle: textStyle.value - Column { id: pageColumn anchors.fill: parent diff --git a/sources/awesome-widget/package/contents/ui/dataengine.qml b/sources/awesome-widget/package/contents/ui/dataengine.qml index f0c1ef6..31a180c 100644 --- a/sources/awesome-widget/package/contents/ui/dataengine.qml +++ b/sources/awesome-widget/package/contents/ui/dataengine.qml @@ -38,7 +38,7 @@ KCM.SimpleKCM { Column { id: pageColumn anchors.fill: parent -const + GroupBox { height: implicitHeight width: parent.width @@ -70,16 +70,16 @@ const ComboBoxSelector { model: [ { - 'label': "disable", - 'name': "disable" + "label": "disable", + "name": "disable" }, { - 'label': "mpris", - 'name': "mpris" + "label": "mpris", + "name": "mpris" }, { - 'label': "mpd", - 'name': "mpd" + "label": "mpd", + "name": "mpd" } ] text: i18n("Music player") @@ -92,40 +92,40 @@ const editable: true model: [ { - 'label': 'auto', - 'name': 'auto' + "label": "auto", + "name": "auto" }, { - 'label': 'amarok', - 'name': 'amarok' + "label": "amarok", + "name": "amarok" }, { - 'label': 'audacious', - 'name': 'audacious' + "label": "audacious", + "name": "audacious" }, { - 'label': 'clementine', - 'name': 'clementine' + "label": "clementine", + "name": "clementine" }, { - 'label': 'DeaDBeeF', - 'name': 'DeaDBeeF' + "label": "DeaDBeeF", + "name": "DeaDBeeF" }, { - 'label': 'vlc', - 'name': 'vlc' + "label": "vlc", + "name": "vlc" }, { - 'label': 'qmmp', - 'name': 'qmmp' + "label": "qmmp", + "name": "qmmp" }, { - 'label': 'xmms2', - 'name': 'xmms2' + "label": "xmms2", + "name": "xmms2" }, { - 'label': cfg_dataengine["MPRIS"], - 'name': cfg_dataengine["MPRIS"] + "label": cfg_dataengine["MPRIS"], + "name": cfg_dataengine["MPRIS"] } ] text: i18n("MPRIS player name") diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp index 57dd85e..b3e50fb 100644 --- a/sources/awesome-widget/plugin/awactions.cpp +++ b/sources/awesome-widget/plugin/awactions.cpp @@ -71,13 +71,6 @@ QString AWActions::getFileContent(const QString &_path) } -// HACK: since QML could not use QLoggingCategory I need this hack -bool AWActions::isDebugEnabled() -{ - return LOG_AW().isDebugEnabled(); -} - - bool AWActions::runCmd(const QString &_cmd, const QStringList &_args) { qCDebug(LOG_AW) << "Cmd" << _cmd << "args" << _args; diff --git a/sources/awesome-widget/plugin/awactions.h b/sources/awesome-widget/plugin/awactions.h index cd63371..08c359a 100644 --- a/sources/awesome-widget/plugin/awactions.h +++ b/sources/awesome-widget/plugin/awactions.h @@ -34,7 +34,6 @@ public: ~AWActions() override; Q_INVOKABLE void checkUpdates(bool _showAnyway = false); Q_INVOKABLE static QString getFileContent(const QString &_path); - Q_INVOKABLE static bool isDebugEnabled(); Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args); Q_INVOKABLE static void showLegacyInfo(); Q_INVOKABLE static void showReadme(); diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml index 1df9fd2..2b6c583 100644 --- a/sources/desktop-panel/package/contents/ui/about.qml +++ b/sources/desktop-panel/package/contents/ui/about.qml @@ -16,27 +16,20 @@ ***************************************************************************/ import QtQuick 2.15 +import org.kde.kcmutils as KCM import org.kde.plasma.private.desktoppanel 1.0 -Item { +KCM.SimpleKCM { id: aboutPage + // backend DPAdds { id: dpAdds } - width: childrenRect.width - height: childrenRect.height - - property bool debug: awActions.isDebugEnabled() - AboutTab { textProvider: dpAdds } - - Component.onCompleted: { - if (debug) console.debug() - } } diff --git a/sources/desktop-panel/package/contents/ui/activeapp.qml b/sources/desktop-panel/package/contents/ui/activeapp.qml index 4013442..10f509f 100644 --- a/sources/desktop-panel/package/contents/ui/activeapp.qml +++ b/sources/desktop-panel/package/contents/ui/activeapp.qml @@ -16,24 +16,14 @@ ***************************************************************************/ import QtQuick 2.15 +import org.kde.kcmutils as KCM import org.kde.plasma.private.desktoppanel 1.0 import "." -Item { +KCM.SimpleKCM { id: activeAppearancePage - // backend - DPAdds { - id: dpAdds - } - - width: childrenRect.width - height: childrenRect.height - implicitWidth: pageColumn.implicitWidth - implicitHeight: pageColumn.implicitHeight - - property bool debug: dpAdds.isDebugEnabled() property alias cfg_currentFontFamily: font.value property alias cfg_currentFontSize: fontSize.value @@ -43,7 +33,6 @@ Item { property alias cfg_currentTextStyleColor: selectStyleColor.value property string cfg_currentTextStyle: textStyle.value - Column { id: pageColumn anchors.fill: parent @@ -99,9 +88,4 @@ Item { value: plasmoid.configuration.currentTextStyleColor } } - - - Component.onCompleted: { - if (debug) console.debug() - } } diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml index a3d0a52..783bc1b 100644 --- a/sources/desktop-panel/package/contents/ui/advanced.qml +++ b/sources/desktop-panel/package/contents/ui/advanced.qml @@ -17,23 +17,13 @@ import QtQuick 2.15 import QtQuick.Controls +import org.kde.kcmutils as KCM import org.kde.plasma.private.desktoppanel 1.0 -Item { +KCM.SimpleKCM { id: advancedPage - // backend - DPAdds { - id: dpAdds - } - - width: childrenRect.width - height: childrenRect.height - implicitWidth: pageColumn.implicitWidth - implicitHeight: pageColumn.implicitHeight - - property bool debug: dpAdds.isDebugEnabled() property alias cfg_background: background.checked property alias cfg_verticalLayout: verticalLayout.checked @@ -44,7 +34,6 @@ Item { property alias cfg_tooltipWidth: tooltipWidth.value property alias cfg_tooltipColor: tooltipColor.value - Column { id: pageColumn anchors.fill: parent @@ -82,48 +71,48 @@ Item { editable: true model: [ { - 'label': '#', - 'name': '#' + "label": "#", + "name": "#" }, { - 'label': '$', - 'name': '$' + "label": "$", + "name": "$" }, { - 'label': '%', - 'name': '%' + "label": "%", + "name": "%" }, { - 'label': '&', - 'name': '&' + "label": "&", + "name": "&" }, { - 'label': '*', - 'name': '*' + "label": "*", + "name": "*" }, { - 'label': '@', - 'name': '@' + "label": "@", + "name": "@" }, { - 'label': '¤', - 'name': '¤' + "label": "¤", + "name": "¤" }, { - 'label': '¶', - 'name': '¶' + "label": "¶", + "name": "¶" }, { - 'label': '·', - 'name': '·' + "label": "·", + "name": "·" }, { - 'label': 'º', - 'name': 'º' + "label": "º", + "name": "º" }, { - 'label': plasmoid.configuration.mark, - 'name': plasmoid.configuration.mark + "label": plasmoid.configuration.mark, + "name": plasmoid.configuration.mark } ] text: i18n("Mark") @@ -144,16 +133,16 @@ Item { id: tooltipType model: [ { - 'label': i18n("contours"), - 'name': "contours" + "label": i18n("contours"), + "name": "contours" }, { - 'label': i18n("names"), - 'name': "names" + "label": i18n("names"), + "name": "names" }, { - 'label': i18n("none"), - 'name': "none" + "label": i18n("none"), + "name": "none" } ] text: i18n("Tooltip type") @@ -178,8 +167,4 @@ Item { } } } - - Component.onCompleted: { - if (debug) console.debug() - } } diff --git a/sources/desktop-panel/package/contents/ui/inactiveapp.qml b/sources/desktop-panel/package/contents/ui/inactiveapp.qml index e650dab..d787cee 100644 --- a/sources/desktop-panel/package/contents/ui/inactiveapp.qml +++ b/sources/desktop-panel/package/contents/ui/inactiveapp.qml @@ -16,24 +16,14 @@ ***************************************************************************/ import QtQuick 2.15 +import org.kde.kcmutils as KCM import org.kde.plasma.private.desktoppanel 1.0 import "." -Item { +KCM.SimpleKCM { id: inactiveAppearancePage - // backend - DPAdds { - id: dpAdds - } - - width: childrenRect.width - height: childrenRect.height - implicitWidth: pageColumn.implicitWidth - implicitHeight: pageColumn.implicitHeight - - property bool debug: dpAdds.isDebugEnabled() property alias cfg_fontFamily: font.value property alias cfg_fontSize: fontSize.value @@ -43,7 +33,6 @@ Item { property alias cfg_textStyleColor: selectStyleColor.value property string cfg_textStyle: textStyle.value - Column { id: pageColumn anchors.fill: parent @@ -99,9 +88,4 @@ Item { value: plasmoid.configuration.textStyleColor } } - - - Component.onCompleted: { - if (debug) console.debug() - } } diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml index 4301fbb..6db0ff1 100644 --- a/sources/desktop-panel/package/contents/ui/main.qml +++ b/sources/desktop-panel/package/contents/ui/main.qml @@ -32,7 +32,6 @@ PlasmoidItem { id: dpAdds } - property bool debug: dpAdds.isDebugEnabled() property variant tooltipSettings: { "tooltipColor": plasmoid.configuration.tooltipColor, "tooltipType": plasmoid.configuration.tooltipType, @@ -43,14 +42,12 @@ PlasmoidItem { signal needTooltipUpdate signal sizeUpdate - // init Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Plasmoid.icon: "utilities-system-monitor" Plasmoid.backgroundHints: plasmoid.configuration.background ? "DefaultBackground" : "NoBackground" - // ui GridLayout { anchors.fill: parent @@ -97,7 +94,6 @@ PlasmoidItem { } } - Timer { id: timer interval: 1000 @@ -105,19 +101,16 @@ PlasmoidItem { } onNeedUpdate: { - if (debug) console.debug() - - for (var i=0; icurrentDesktop(); diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h index a2e3be2..c053d5a 100644 --- a/sources/desktop-panel/plugin/dpadds.h +++ b/sources/desktop-panel/plugin/dpadds.h @@ -46,7 +46,6 @@ class DPAdds : public QObject public: explicit DPAdds(QObject *_parent = nullptr); ~DPAdds() override; - Q_INVOKABLE static bool isDebugEnabled(); Q_INVOKABLE [[nodiscard]] int currentDesktop() const; Q_INVOKABLE static QStringList dictKeys(bool _sorted = true, const QString &_regexp = ""); Q_INVOKABLE [[nodiscard]] int numberOfDesktops() const; diff --git a/sources/qml/AWExtensions.qml b/sources/qml/AWExtensions.qml index 8a25574..07eac57 100644 --- a/sources/qml/AWExtensions.qml +++ b/sources/qml/AWExtensions.qml @@ -68,23 +68,27 @@ Row { } } - // TODO migrate history - // Button { - // width: parent.width / 15 - // iconName: "view-history" - // menu: Menu { - // id: historyConfig - // Instantiator { - // model: awTelemetryHandler.get("awwidgetconfig") - // MenuItem { - // text: modelData - // onTriggered: textArea.text = modelData - // } - // onObjectAdded: historyConfig.insertItem(index, object) - // onObjectRemoved: historyConfig.removeItem(object) - // } - // } - // } + Button { + width: parent.width / 15 + icon.name: "view-history" + + onClicked: historyConfig.open() + + Menu { + id: historyConfig + + Instantiator { + model: awTelemetryHandler.get("awwidgetconfig") + delegate: MenuItem { + text: modelData + onTriggered: textArea.text = modelData + } + + onObjectAdded: (index, object) => historyConfig.insertItem(index, object) + onObjectRemoved: (index, object) => historyConfig.removeItem(object) + } + } + } MessageDialog { id: compiledText diff --git a/sources/qml/AWInfoLabel.qml b/sources/qml/AWInfoLabel.qml index a549249..249acd8 100644 --- a/sources/qml/AWInfoLabel.qml +++ b/sources/qml/AWInfoLabel.qml @@ -23,7 +23,9 @@ Label { width: parent.width horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap text: i18n("Detailed information may be found on project homepage") + onLinkActivated: Qt.openUrlExternally(link) } diff --git a/sources/qml/AWTextEditor.qml b/sources/qml/AWTextEditor.qml index 3b577c8..61d7c9e 100644 --- a/sources/qml/AWTextEditor.qml +++ b/sources/qml/AWTextEditor.qml @@ -77,9 +77,9 @@ ScrollView { function getLastTag() { // get substring to analyze - var substring = textArea.getText(0, textArea.cursorPosition) + const substring = textArea.getText(0, textArea.cursorPosition) // find last position of index in the given substring - var signIndex = substring.lastIndexOf('$') + 1 + const signIndex = substring.lastIndexOf("$") + 1 if ((signIndex === 0) || (signIndex === textArea.cursorPosition)) return "" // get current tag text @@ -89,6 +89,14 @@ ScrollView { function insert(text) { textArea.insert(textArea.cursorPosition, text) } + + function removeSelection() { + textArea.remove(textArea.selectionStart, textArea.selectionEnd) + } + + function selectedText() { + return textArea.selectedText + } } diff --git a/sources/qml/BugReport.qml b/sources/qml/BugReport.qml index aebaa95..cb218de 100644 --- a/sources/qml/BugReport.qml +++ b/sources/qml/BugReport.qml @@ -34,8 +34,6 @@ Dialog { width: 640 height: 480 - property bool debug: awActions.isDebugEnabled() - title: i18n("Report a bug") standardButtons: DialogButtonBox.Ok | DialogButtonBox.Cancel | DialogButtonBox.Reset @@ -48,6 +46,7 @@ Dialog { Layout.fillWidth: true placeholderText: i18n("Report subject") } + ColumnLayout { Layout.fillWidth: true @@ -55,41 +54,50 @@ Dialog { Layout.fillWidth: true height: parent.height / 5 title: i18n("Description") + TextArea { id: description anchors.fill: parent textFormat: TextEdit.PlainText } } + GroupBox { Layout.fillWidth: true height: parent.height / 5 title: i18n("Steps to reproduce") + TextArea { id: reproduce anchors.fill: parent textFormat: TextEdit.PlainText } } + GroupBox { Layout.fillWidth: true height: parent.height / 5 title: i18n("Expected result") + TextArea { id: expected anchors.fill: parent textFormat: TextEdit.PlainText } } + GroupBox { Layout.fillWidth: true Layout.alignment: Qt.AlignBottom title: i18n("Logs") + ColumnLayout { anchors.fill: parent Layout.fillWidth: true + Row { - Layout.fillWidth: true + Layout.fillWidth: true + Label { width: parent.width * 2 / 5 horizontalAlignment: Text.AlignJustify @@ -97,17 +105,20 @@ Dialog { wrapMode: Text.WordWrap text: i18n("Use command") } + TextField { width: parent.width * 3 / 5 readOnly: true text: "QT_LOGGING_RULES=*=true plasmawindowed org.kde.plasma.awesomewidget" } } + Button { Layout.fillWidth: true text: i18n("Load log file") onClicked: logPath.open() } + TextArea { id: logBody Layout.fillWidth: true @@ -127,16 +138,11 @@ Dialog { } onAccepted: { - if (debug) console.debug() - - var text = awBugReporter.generateText(description.text, reproduce.text, - expected.text, logBody.text) + const text = awBugReporter.generateText(description.text, reproduce.text, expected.text, logBody.text) awBugReporter.sendBugReport(title.text, text) } onReset: { - if (debug) console.debug() - title.text = "" description.text = "" reproduce.text = "" @@ -144,8 +150,6 @@ Dialog { } Component.onCompleted: { - if (debug) console.debug() - awBugReporter.doConnect() } } diff --git a/sources/qml/ButtonSelector.qml b/sources/qml/ButtonSelector.qml index 8656f8f..9fa33d8 100644 --- a/sources/qml/ButtonSelector.qml +++ b/sources/qml/ButtonSelector.qml @@ -32,9 +32,11 @@ Row { id: label height: parent.height width: parent.width * 2 / 5 + horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter } + Button { id: button width: parent.width * 3 / 5 diff --git a/sources/qml/CheckBoxSelector.qml b/sources/qml/CheckBoxSelector.qml index 64e1dda..a7e23c7 100644 --- a/sources/qml/CheckBoxSelector.qml +++ b/sources/qml/CheckBoxSelector.qml @@ -30,6 +30,7 @@ Row { height: parent.heigth width: parent.width * 2 / 5 } + CheckBox { id: checkBox width: parent.width * 3 / 5 diff --git a/sources/qml/ColorSelector.qml b/sources/qml/ColorSelector.qml index 1c48ed6..6d7ab84 100644 --- a/sources/qml/ColorSelector.qml +++ b/sources/qml/ColorSelector.qml @@ -20,10 +20,11 @@ import QtQuick.Dialogs ButtonSelector { - // TODO somehow doesn't work - // background: Rectangle { - // color: value - // } + background: Rectangle { + implicitWidth: 100 + implicitHeight: 25 + color: value + } onButtonActivated: colorDialog.visible = true diff --git a/sources/qml/ComboBoxSelector.qml b/sources/qml/ComboBoxSelector.qml index 824f89b..849a6d1 100644 --- a/sources/qml/ComboBoxSelector.qml +++ b/sources/qml/ComboBoxSelector.qml @@ -39,14 +39,16 @@ Row { horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter } + ComboBox { id: comboBox width: parent.width * 3 / 5 - textRole: 'label' - onCurrentIndexChanged: valueEdited(comboBox.model[comboBox.currentIndex]['name']) + textRole: "label" + onCurrentIndexChanged: valueEdited(comboBox.model[comboBox.currentIndex]["name"]) + Component.onCompleted: { - var total = comboBox.model.length - for (var i = 0; i < total; i++) { + const total = comboBox.model.length + for (let i = 0; i < total; i++) { if (comboBox.model[i]["name"] === value) comboBox.currentIndex = i } diff --git a/sources/qml/ExportDialog.qml b/sources/qml/ExportDialog.qml index 63a47d0..eba4d7d 100644 --- a/sources/qml/ExportDialog.qml +++ b/sources/qml/ExportDialog.qml @@ -37,8 +37,9 @@ Item { fileMode: FileDialog.SaveFile title: i18n("Export") currentFolder: awConfig.configurationDirectory() + onAccepted: { - var status = awConfig.exportConfiguration( + const status = awConfig.exportConfiguration( configuration, fileDialog.fileUrl.toString().replace("file://", "")) if (status) { @@ -51,7 +52,6 @@ Item { messageDialog.open() } } - function open() { return fileDialog.open() } diff --git a/sources/qml/General.qml b/sources/qml/General.qml index a65ac13..5526c33 100644 --- a/sources/qml/General.qml +++ b/sources/qml/General.qml @@ -21,6 +21,7 @@ import QtQuick 2.15 // required by i18n functions import org.kde.plasma.core as PlasmaCore + QtObject { property variant fontWeight: { "light": Font.Light, diff --git a/sources/qml/HtmlDefaultFunctionsBar.qml b/sources/qml/HtmlDefaultFunctionsBar.qml index 8858779..80c57c2 100644 --- a/sources/qml/HtmlDefaultFunctionsBar.qml +++ b/sources/qml/HtmlDefaultFunctionsBar.qml @@ -30,6 +30,7 @@ Row { text: i18n("Bgcolor") textField: textArea } + HtmlEditorFont { width: parent.width * 3 / 15 textField: textArea @@ -45,6 +46,7 @@ Row { textField: textArea end: "
\n" } + // font properties HtmlEditorButton { width: parent.width / 15 @@ -53,6 +55,7 @@ Row { start: "" end: "" } + HtmlEditorButton { width: parent.width / 15 icon.name: "format-text-italic" @@ -60,6 +63,7 @@ Row { start: "" end: "" } + HtmlEditorButton { width: parent.width / 15 icon.name: "format-text-underline" @@ -67,6 +71,7 @@ Row { start: "" end: "" } + HtmlEditorButton { width: parent.width / 15 icon.name: "format-text-strikethrough" @@ -83,6 +88,7 @@ Row { start: "

" end: "

" } + HtmlEditorButton { width: parent.width / 15 icon.name: "format-justify-center" @@ -90,6 +96,7 @@ Row { start: "

" end: "

" } + HtmlEditorButton { width: parent.width / 15 icon.name: "format-justify-right" @@ -97,6 +104,7 @@ Row { start: "

" end: "

" } + HtmlEditorButton { width: parent.width / 15 icon.name: "format-justify-fill" diff --git a/sources/qml/HtmlEditorButton.qml b/sources/qml/HtmlEditorButton.qml index d338db6..e319ba8 100644 --- a/sources/qml/HtmlEditorButton.qml +++ b/sources/qml/HtmlEditorButton.qml @@ -31,7 +31,7 @@ Button { function updateText() { // get selected text - var selected = textField.selectedText() + const selected = textField.selectedText() // remove it from widget textField.removeSelection() // insert edited text diff --git a/sources/qml/HtmlEditorFont.qml b/sources/qml/HtmlEditorFont.qml index b91c970..dbfcd43 100644 --- a/sources/qml/HtmlEditorFont.qml +++ b/sources/qml/HtmlEditorFont.qml @@ -36,13 +36,13 @@ HtmlEditorButton { clickedEvent: function() { // get new font - var defaultFont = { + const defaultFont = { "color": defaultFontColor, "family": defaultFontFamily, "size": defaultFontSize } // we are using custom selector as soon as we need to select color as well - var font = awActions.getFont(defaultFont) + const font = awActions.getFont(defaultFont) // check status if (!font.applied) diff --git a/sources/qml/ImportDialog.qml b/sources/qml/ImportDialog.qml index 2db79c5..3f61934 100644 --- a/sources/qml/ImportDialog.qml +++ b/sources/qml/ImportDialog.qml @@ -57,14 +57,13 @@ Item { } onAccepted: { - var importConfig = awConfig.importConfiguration( + const importConfig = awConfig.importConfiguration( fileDialog.fileUrl.toString().replace("file://", ""), importPlasmoid.checked, importExtensions.checked, importAdds.checked) configurationReceived(importConfig) } } - function open() { return fileDialog.open() } diff --git a/sources/qml/IntegerSelector.qml b/sources/qml/IntegerSelector.qml index dfad501..b27c690 100644 --- a/sources/qml/IntegerSelector.qml +++ b/sources/qml/IntegerSelector.qml @@ -39,6 +39,7 @@ Row { horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter } + SpinBox { id: spinBox width: parent.width * 3 / 5 diff --git a/sources/qml/LineSelector.qml b/sources/qml/LineSelector.qml index 436bef4..3798804 100644 --- a/sources/qml/LineSelector.qml +++ b/sources/qml/LineSelector.qml @@ -35,6 +35,7 @@ Row { horizontalAlignment: Text.AlignRight verticalAlignment: Text.AlignVCenter } + TextField { id: textField width: parent.width * 3 / 5