From c7d998eb12ed4364b3abc19c1b9130d5b280f663 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Sun, 19 Jul 2015 00:14:49 +0300 Subject: [PATCH] more correct fix for #57 --- README.md | 4 +- .../package/contents/ui/about.qml | 23 +++++++---- .../package/contents/ui/advanced.qml | 7 +++- .../package/contents/ui/appearance.qml | 7 +++- .../package/contents/ui/dataengine.qml | 24 +++++++---- .../package/contents/ui/main.qml | 41 +++++++++++-------- .../package/contents/ui/tooltip.qml | 7 +++- .../package/contents/ui/widget.qml | 30 +++++++++----- .../awesome-widget/plugin/awesomewidget.cpp | 22 +--------- sources/awesome-widget/plugin/awkeys.cpp | 21 ++++------ sources/awesome-widget/plugin/awkeys.h | 9 ++-- .../package/contents/ui/about.qml | 21 ++++++---- .../package/contents/ui/activeapp.qml | 7 +++- .../package/contents/ui/advanced.qml | 9 +++- .../package/contents/ui/inactiveapp.qml | 7 +++- .../package/contents/ui/main.qml | 34 ++++++++------- .../package/contents/ui/widget.qml | 15 ++++--- sources/desktop-panel/plugin/desktoppanel.cpp | 11 +---- 18 files changed, 172 insertions(+), 127 deletions(-) diff --git a/README.md b/README.md index 19b10d6..d290084 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Optional dependencies * proprietary video driver * hddtemp * smartmontools -* music player (mpd or supported MPRIS) +* music player (mpd or MPRIS supported) Make dependencies ----------------- @@ -53,7 +53,7 @@ Installation cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../ make && sudo make install - **NOTE** on Plasma 5 it may require `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag + **NOTE** on Plasma 5 it very likely requires `-DKDE_INSTALL_USE_QT_SYS_PATHS=ON` flag Additional information ====================== diff --git a/sources/awesome-widget/package/contents/ui/about.qml b/sources/awesome-widget/package/contents/ui/about.qml index 28e33dc..3c18e5c 100644 --- a/sources/awesome-widget/package/contents/ui/about.qml +++ b/sources/awesome-widget/package/contents/ui/about.qml @@ -24,12 +24,19 @@ import org.kde.plasma.private.awesomewidget 1.0 Item { id: aboutPage + AWKeys { + id: awKeys; + } + AWActions { + id: awActions; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: AWKeys.isDebugEnabled() + property bool debug: awKeys.isDebugEnabled() Column { @@ -45,26 +52,26 @@ Item { QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter - text: AWActions.getAboutText("header") + text: awActions.getAboutText("header") } QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter - text: AWActions.getAboutText("version") + text: awActions.getAboutText("version") } QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignJustify - text: AWActions.getAboutText("description") + text: awActions.getAboutText("description") } QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignLeft textFormat: Text.RichText - text: AWActions.getAboutText("links") + text: awActions.getAboutText("links") onLinkActivated: Qt.openUrlExternally(link); } @@ -75,7 +82,7 @@ Item { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignBottom textFormat: Text.RichText - text: AWActions.getAboutText("copy") + text: awActions.getAboutText("copy") } } } @@ -88,7 +95,7 @@ Item { QtLayouts.Layout.fillWidth: true wrapMode: Text.WordWrap horizontalAlignment: Text.AlignJustify - text: AWActions.getAboutText("translators") + text: awActions.getAboutText("translators") } QtControls.Label { @@ -97,7 +104,7 @@ Item { horizontalAlignment: Text.AlignJustify verticalAlignment: Text.AlignTop textFormat: Text.RichText - text: AWActions.getAboutText("3rdparty") + text: awActions.getAboutText("3rdparty") onLinkActivated: Qt.openUrlExternally(link); } } diff --git a/sources/awesome-widget/package/contents/ui/advanced.qml b/sources/awesome-widget/package/contents/ui/advanced.qml index c4d01ee..dfba138 100644 --- a/sources/awesome-widget/package/contents/ui/advanced.qml +++ b/sources/awesome-widget/package/contents/ui/advanced.qml @@ -23,12 +23,17 @@ import org.kde.plasma.private.awesomewidget 1.0 Item { id: advancedPage + // backend + AWKeys { + id: awKeys; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: AWKeys.isDebugEnabled() + property bool debug: awKeys.isDebugEnabled() property alias cfg_height: widgetHeight.value property alias cfg_width: widgetWidth.value diff --git a/sources/awesome-widget/package/contents/ui/appearance.qml b/sources/awesome-widget/package/contents/ui/appearance.qml index 9fc2619..bc49cfc 100644 --- a/sources/awesome-widget/package/contents/ui/appearance.qml +++ b/sources/awesome-widget/package/contents/ui/appearance.qml @@ -25,12 +25,17 @@ import org.kde.plasma.private.awesomewidget 1.0 Item { id: appearancePage + // backend + AWKeys { + id: awKeys; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: AWKeys.isDebugEnabled() + property bool debug: awKeys.isDebugEnabled() property variant weight: { 25: 0, 50: 1, diff --git a/sources/awesome-widget/package/contents/ui/dataengine.qml b/sources/awesome-widget/package/contents/ui/dataengine.qml index 7a681f4..fb4f37e 100644 --- a/sources/awesome-widget/package/contents/ui/dataengine.qml +++ b/sources/awesome-widget/package/contents/ui/dataengine.qml @@ -26,12 +26,20 @@ import org.kde.plasma.private.awesomewidget 1.0 Item { id: dataenginePage + // backend + AWKeys { + id: awKeys; + } + AWActions { + id: awActions; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: AWKeys.isDebugEnabled() + property bool debug: awKeys.isDebugEnabled() property variant tooltipSettings: { "tooltipNumber": plasmoid.configuration.tooltipNumber, "useTooltipBackground": plasmoid.configuration.useTooltipBackground, @@ -53,7 +61,7 @@ Item { "batInTooltipColor": plasmoid.configuration.batInTooltipColor } - property variant cfg_dataengine: AWActions.readDataEngineConfiguration() + property variant cfg_dataengine: awActions.readDataEngineConfiguration() Column { id: pageColumn @@ -87,7 +95,7 @@ Item { QtControls.Button { width: parent.width * 3 / 5 text: i18n("Edit scripts") - onClicked: AWKeys.editItem("extscript") + onClicked: awKeys.editItem("extscript") } } @@ -128,7 +136,7 @@ Item { QtControls.ComboBox { id: hdd width: parent.width * 3 / 5 - model: AWKeys.getHddDevices(true) + model: awKeys.getHddDevices(true) Component.onCompleted: { for (var i=0; i(uri, 1, 0, "AWActions", awactions_singletontype_provider); - qmlRegisterSingletonType(uri, 1, 0, "AWKeys", awkeys_singletontype_provider); + qmlRegisterType(uri, 1, 0, "AWActions"); + qmlRegisterType(uri, 1, 0, "AWKeys"); } diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index f66362b..b733d54 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -86,7 +86,7 @@ AWKeys::~AWKeys() } -void AWKeys::initKeys() +void AWKeys::initKeys(const QString currentPattern) { if (debug) qDebug() << PDEBUG; @@ -100,6 +100,7 @@ void AWKeys::initKeys() foundKeys.clear(); // init + pattern = currentPattern; extQuotes = getExtQuotes(); extScripts = getExtScripts(); extUpgrade = getExtUpgrade(); @@ -145,18 +146,12 @@ bool AWKeys::isDebugEnabled() } -QString AWKeys::parsePattern(const QString currentPattern) +QString AWKeys::parsePattern() { if (debug) qDebug() << PDEBUG; - if (keys.isEmpty()) return currentPattern; + if (keys.isEmpty()) return pattern; - // get key data - if ((foundBars.isEmpty()) && (foundKeys.isEmpty())) { - foundBars = findGraphicalItems(currentPattern); - foundKeys = findKeys(currentPattern); - } - - QString parsed = currentPattern; + QString parsed = pattern; parsed.replace(QString("$$"), QString("$\\$\\")); for (int i=0; i getExtQuotes(); @@ -121,6 +121,7 @@ private: QList extQuotes; QList extScripts; QList extUpgrade; + QString pattern; QStringList foundBars, foundKeys, keys; QMap values; QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices; diff --git a/sources/desktop-panel/package/contents/ui/about.qml b/sources/desktop-panel/package/contents/ui/about.qml index b4ec945..e18f5a5 100644 --- a/sources/desktop-panel/package/contents/ui/about.qml +++ b/sources/desktop-panel/package/contents/ui/about.qml @@ -24,12 +24,17 @@ import org.kde.plasma.private.desktoppanel 1.0 Item { id: aboutPage + // backend + DPAdds { + id: dpAdds; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: DPAdds.isDebugEnabled() + property bool debug: dpAdds.isDebugEnabled() Column { @@ -45,26 +50,26 @@ Item { QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter - text: DPAdds.getAboutText("header") + text: dpAdds.getAboutText("header") } QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignHCenter - text: DPAdds.getAboutText("version") + text: dpAdds.getAboutText("version") } QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignJustify - text: DPAdds.getAboutText("description") + text: dpAdds.getAboutText("description") } QtControls.Label { QtLayouts.Layout.fillWidth: true horizontalAlignment: Text.AlignLeft textFormat: Text.RichText - text: DPAdds.getAboutText("links") + text: dpAdds.getAboutText("links") onLinkActivated: Qt.openUrlExternally(link); } @@ -75,7 +80,7 @@ Item { horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignBottom textFormat: Text.RichText - text: DPAdds.getAboutText("copy") + text: dpAdds.getAboutText("copy") } } } @@ -88,7 +93,7 @@ Item { QtLayouts.Layout.fillWidth: true wrapMode: Text.WordWrap horizontalAlignment: Text.AlignJustify - text: DPAdds.getAboutText("translators") + text: dpAdds.getAboutText("translators") } QtControls.Label { @@ -97,7 +102,7 @@ Item { horizontalAlignment: Text.AlignJustify verticalAlignment: Text.AlignTop textFormat: Text.RichText - text: DPAdds.getAboutText("3rdparty") + text: dpAdds.getAboutText("3rdparty") onLinkActivated: Qt.openUrlExternally(link); } } diff --git a/sources/desktop-panel/package/contents/ui/activeapp.qml b/sources/desktop-panel/package/contents/ui/activeapp.qml index e894571..8e41406 100644 --- a/sources/desktop-panel/package/contents/ui/activeapp.qml +++ b/sources/desktop-panel/package/contents/ui/activeapp.qml @@ -25,12 +25,17 @@ import org.kde.plasma.private.desktoppanel 1.0 Item { id: activeAppearancePage + // backend + DPAdds { + id: dpAdds; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: DPAdds.isDebugEnabled() + property bool debug: dpAdds.isDebugEnabled() property variant weight: { 25: 0, 50: 1, diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml index a8023be..fe40517 100644 --- a/sources/desktop-panel/package/contents/ui/advanced.qml +++ b/sources/desktop-panel/package/contents/ui/advanced.qml @@ -25,12 +25,17 @@ import org.kde.plasma.private.desktoppanel 1.0 Item { id: advancedPage + // backend + DPAdds { + id: dpAdds; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: DPAdds.isDebugEnabled() + property bool debug: dpAdds.isDebugEnabled() property alias cfg_height: widgetHeight.value property alias cfg_width: widgetWidth.value @@ -237,7 +242,7 @@ Item { // QtControls.Button { // width: parent.width * 3 / 5 // text: i18n("Edit panels") -// onClicked: cfg_panels = DPAdds.editPanelsToContol(plasmoid.configuration.panels) +// onClicked: cfg_panels = dpAdds.editPanelsToContol(plasmoid.configuration.panels) // } // } } diff --git a/sources/desktop-panel/package/contents/ui/inactiveapp.qml b/sources/desktop-panel/package/contents/ui/inactiveapp.qml index 3086751..f3111dc 100644 --- a/sources/desktop-panel/package/contents/ui/inactiveapp.qml +++ b/sources/desktop-panel/package/contents/ui/inactiveapp.qml @@ -25,12 +25,17 @@ import org.kde.plasma.private.desktoppanel 1.0 Item { id: inactiveAppearancePage + // backend + DPAdds { + id: dpAdds; + } + width: childrenRect.width height: childrenRect.height implicitWidth: pageColumn.implicitWidth implicitHeight: pageColumn.implicitHeight - property bool debug: AWKeys.isDebugEnabled() + property bool debug: dpAdds.isDebugEnabled() property variant weight: { 25: 0, 50: 1, diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml index d4d3219..0f598eb 100644 --- a/sources/desktop-panel/package/contents/ui/main.qml +++ b/sources/desktop-panel/package/contents/ui/main.qml @@ -28,8 +28,12 @@ import "." Item { id: main + // backend + DPAdds { + id: dpAdds; + } - property bool debug: DPAdds.isDebugEnabled() + property bool debug: dpAdds.isDebugEnabled() property variant tooltipSettings: { "tooltipColor": plasmoid.configuration.tooltipColor, "tooltipType": plasmoid.configuration.tooltipType, @@ -54,14 +58,14 @@ Item { // ui GridLayout { anchors.fill: parent - columns: plasmoid.configuration.verticalLayout ? 1 : DPAdds.numberOfDesktops() - rows: plasmoid.configuration.verticalLayout ? DPAdds.numberOfDesktops() : 1 + columns: plasmoid.configuration.verticalLayout ? 1 : dpAdds.numberOfDesktops() + rows: plasmoid.configuration.verticalLayout ? dpAdds.numberOfDesktops() : 1 Repeater { id: repeater Layout.columnSpan: 0 Layout.rowSpan: 0 - model: DPAdds.numberOfDesktops() + model: dpAdds.numberOfDesktops() Text { id: text @@ -73,13 +77,13 @@ Item { verticalAlignment: Text.AlignVCenter - text: DPAdds.parsePattern(plasmoid.configuration.text, index + 1) + text: dpAdds.parsePattern(plasmoid.configuration.text, index + 1) property alias tooltip: tooltip MouseArea { hoverEnabled: true anchors.fill: parent - onClicked: DPAdds.setCurrentDesktop(index + 1); + onClicked: dpAdds.setCurrentDesktop(index + 1); onEntered: needTooltipUpdate() } @@ -112,8 +116,8 @@ Item { timer.start() return } - repeater.itemAt(i).text = DPAdds.parsePattern(plasmoid.configuration.text, i + 1) - if (DPAdds.currentDesktop() == i + 1) { + repeater.itemAt(i).text = dpAdds.parsePattern(plasmoid.configuration.text, i + 1) + if (dpAdds.currentDesktop() == i + 1) { repeater.itemAt(i).color = plasmoid.configuration.currentFontColor repeater.itemAt(i).font.family = plasmoid.configuration.currentFontFamily repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic" ? true : false @@ -137,7 +141,7 @@ Item { if (debug) console.log("[main::onNeedTooltipUpdate]") for (var i=0; i(uri, 1, 0, "DPAdds", dpadds_singletontype_provider); + qmlRegisterType(uri, 1, 0, "DPAdds"); }