arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-04-24 23:47:20 +00:00
Code Issues Projects Releases Wiki Activity

massive qml edit

Browse Source
This commit is contained in:
Evgenii Alekseev 2024-03-27 01:28:14 +02:00
parent 4fcea42e8e
commit 3f20aa8878
31 changed files with 175 additions and 519 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

284
sensors
View File

@ -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

5
sources/awesome-widget/package/contents/ui/about.qml
View File

@ -24,6 +24,11 @@ import org.kde.plasma.private.awesomewidget 1.0
KCM.SimpleKCM {
id: aboutPage
// backend
AWActions {
id: awActions
}
AboutTab {
textProvider: awActions
}

28
sources/awesome-widget/package/contents/ui/advanced.qml
View File

@ -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")

1
sources/awesome-widget/package/contents/ui/appearance.qml
View File

@ -41,7 +41,6 @@ KCM.SimpleKCM {
property alias cfg_textStyleColor: selectStyleColor.value
property string cfg_textStyle: textStyle.value
Column {
id: pageColumn
anchors.fill: parent

50
sources/awesome-widget/package/contents/ui/dataengine.qml
View File

@ -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")

7
sources/awesome-widget/plugin/awactions.cpp
View File

@ -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;

1
sources/awesome-widget/plugin/awactions.h
View File

@ -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();

13
sources/desktop-panel/package/contents/ui/about.qml
View File

@ -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()
}
}

20
sources/desktop-panel/package/contents/ui/activeapp.qml
View File

@ -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()
}
}

75
sources/desktop-panel/package/contents/ui/advanced.qml
View File

@ -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()
}
}

20
sources/desktop-panel/package/contents/ui/inactiveapp.qml
View File

@ -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()
}
}

38
sources/desktop-panel/package/contents/ui/main.qml
View File

@ -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; i<repeater.count; i++) {
for (let i = 0; i < repeater.count; i++) {
if (!repeater.itemAt(i)) {
if (debug) console.info("Nothing to do here yet", i)
timer.start()
return
}
repeater.itemAt(i).text = dpAdds.parsePattern(plasmoid.configuration.text, i)
if (dpAdds.currentDesktop() == i) {
if (dpAdds.currentDesktop() === i) {
repeater.itemAt(i).color = plasmoid.configuration.currentFontColor
repeater.itemAt(i).font.family = plasmoid.configuration.currentFontFamily
repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic"
repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle === "italic"
repeater.itemAt(i).font.pointSize = plasmoid.configuration.currentFontSize
repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.currentFontWeight]
repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.currentTextStyle]
@ -125,7 +118,7 @@ PlasmoidItem {
} else {
repeater.itemAt(i).color = plasmoid.configuration.fontColor
repeater.itemAt(i).font.family = plasmoid.configuration.fontFamily
repeater.itemAt(i).font.italic = plasmoid.configuration.fontStyle == "italic"
repeater.itemAt(i).font.italic = plasmoid.configuration.fontStyle === "italic"
repeater.itemAt(i).font.pointSize = plasmoid.configuration.fontSize
repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.fontWeight]
repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.textStyle]
@ -139,13 +132,11 @@ PlasmoidItem {
}
onNeedTooltipUpdate: {
if (debug) console.debug()
for (var i=0; i<repeater.count; i++) {
for (let i = 0; i < repeater.count; i++) {
repeater.itemAt(i).tooltip.text = dpAdds.toolTipImage(i)
// resize text tooltip to content size
// this hack does not work for images-based tooltips
if (tooltipSettings.tooltipType == "names") {
if (tooltipSettings.tooltipType === "names") {
repeater.itemAt(i).tooltip.height = repeater.itemAt(i).tooltip.implicitHeight
repeater.itemAt(i).tooltip.width = repeater.itemAt(i).tooltip.implicitWidth
}
@ -153,11 +144,9 @@ PlasmoidItem {
}
onSizeUpdate: {
if (debug) console.debug()
if (plasmoid.configuration.height == 0) {
var newHeight = 0
for (var i=0; i<repeater.count; i++)
if (plasmoid.configuration.height === 0) {
let newHeight = 0
for (let i = 0; i < repeater.count; i++)
newHeight += repeater.itemAt(i).contentHeight
Layout.minimumHeight = newHeight
Layout.maximumHeight = -1
@ -165,9 +154,9 @@ PlasmoidItem {
Layout.minimumHeight = plasmoid.configuration.height
Layout.maximumHeight = plasmoid.configuration.height
}
if (plasmoid.configuration.width == 0) {
var newWidth = 0
for (var i=0; i<repeater.count; i++)
if (plasmoid.configuration.width === 0) {
let newWidth = 0
for (let i = 0; i < repeater.count; i++)
newWidth += repeater.itemAt(i).contentWidth
Layout.minimumWidth = newWidth
Layout.maximumWidth = -1
@ -179,7 +168,6 @@ PlasmoidItem {
Plasmoid.onUserConfiguringChanged: {
if (plasmoid.userConfiguring) return
if (debug) console.debug()
dpAdds.setMark(plasmoid.configuration.mark)
dpAdds.setToolTipData(tooltipSettings)
@ -188,8 +176,6 @@ PlasmoidItem {
}
Component.onCompleted: {
if (debug) console.debug()
// init submodule
Plasmoid.userConfiguringChanged(false)
dpAdds.desktopChanged.connect(needUpdate)

16
sources/desktop-panel/package/contents/ui/widget.qml
View File

@ -16,28 +16,21 @@
***************************************************************************/
import QtQuick 2.15
import org.kde.kcmutils as KCM
import org.kde.plasma.private.desktoppanel 1.0
import "."
Item {
KCM.SimpleKCM {
id: widgetPage
// backend
DPAdds {
id: dpAdds
}
width: childrenRect.width
height: childrenRect.height
implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight
property bool debug: dpAdds.isDebugEnabled()
property alias cfg_text: textPattern.text
Column {
id: pageColumn
anchors.fill: parent
@ -60,9 +53,4 @@ Item {
backend: dpAdds
}
}
Component.onCompleted: {
if (debug) console.debug()
}
}

11
sources/desktop-panel/plugin/dpadds.cpp
View File

@ -49,9 +49,7 @@ DPAdds::DPAdds(QObject *_parent)
m_vdi = new TaskManager::VirtualDesktopInfo(this);
m_taskModel = new TaskManager::WindowTasksModel(this);
connect(m_vdi, SIGNAL(currentDesktopChanged()), this, SIGNAL(desktopChanged()));
connect(KWindowSystem::self(), SIGNAL(windowAdded(WId)), this, SIGNAL(windowListChanged()));
connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)), this, SIGNAL(windowListChanged()));
connect(m_vdi, &TaskManager::VirtualDesktopInfo::currentDesktopChanged, this, &DPAdds::desktopChanged);
}
@ -64,13 +62,6 @@ DPAdds::~DPAdds()
}
// HACK: since QML could not use QLoggingCategory I need this hack
bool DPAdds::isDebugEnabled()
{
return LOG_DP().isDebugEnabled();
}
int DPAdds::currentDesktop() const
{
auto current = m_vdi->currentDesktop();

1
sources/desktop-panel/plugin/dpadds.h
View File

@ -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;

38
sources/qml/AWExtensions.qml
View File

@ -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

2
sources/qml/AWInfoLabel.qml
View File

@ -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 <a href=\"https://arcanis.me/projects/awesome-widgets/\">project homepage</a>")
onLinkActivated: Qt.openUrlExternally(link)
}

12
sources/qml/AWTextEditor.qml
View File

@ -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
}
}

24
sources/qml/BugReport.qml
View File

@ -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
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()
}
}

2
sources/qml/ButtonSelector.qml
View File

@ -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

1
sources/qml/CheckBoxSelector.qml
View File

@ -30,6 +30,7 @@ Row {
height: parent.heigth
width: parent.width * 2 / 5
}
CheckBox {
id: checkBox
width: parent.width * 3 / 5

9
sources/qml/ColorSelector.qml
View File

@ -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

10
sources/qml/ComboBoxSelector.qml
View File

@ -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
}

4
sources/qml/ExportDialog.qml
View File

@ -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()
}

1
sources/qml/General.qml
View File

@ -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,

8
sources/qml/HtmlDefaultFunctionsBar.qml
View File

@ -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: "<br>\n"
}
// font properties
HtmlEditorButton {
width: parent.width / 15
@ -53,6 +55,7 @@ Row {
start: "<b>"
end: "</b>"
}
HtmlEditorButton {
width: parent.width / 15
icon.name: "format-text-italic"
@ -60,6 +63,7 @@ Row {
start: "<i>"
end: "</i>"
}
HtmlEditorButton {
width: parent.width / 15
icon.name: "format-text-underline"
@ -67,6 +71,7 @@ Row {
start: "<u>"
end: "</u>"
}
HtmlEditorButton {
width: parent.width / 15
icon.name: "format-text-strikethrough"
@ -83,6 +88,7 @@ Row {
start: "<p align=\"left\">"
end: "</p>"
}
HtmlEditorButton {
width: parent.width / 15
icon.name: "format-justify-center"
@ -90,6 +96,7 @@ Row {
start: "<p align=\"center\">"
end: "</p>"
}
HtmlEditorButton {
width: parent.width / 15
icon.name: "format-justify-right"
@ -97,6 +104,7 @@ Row {
start: "<p align=\"right\">"
end: "</p>"
}
HtmlEditorButton {
width: parent.width / 15
icon.name: "format-justify-fill"

2
sources/qml/HtmlEditorButton.qml
View File

@ -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

4
sources/qml/HtmlEditorFont.qml
View File

@ -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)

3
sources/qml/ImportDialog.qml
View File

@ -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()
}

1
sources/qml/IntegerSelector.qml
View File

@ -39,6 +39,7 @@ Row {
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
}
SpinBox {
id: spinBox
width: parent.width * 3 / 5

1
sources/qml/LineSelector.qml
View File

@ -35,6 +35,7 @@ Row {
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
}
TextField {
id: textField
width: parent.width * 3 / 5