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

more correct fix for #57

Browse Source
This commit is contained in:
arcan1s 2015-07-19 00:14:49 +03:00
parent eb63ef5e96
commit c7d998eb12
18 changed files with 172 additions and 127 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
README.md
View File

@ -35,7 +35,7 @@ Optional dependencies
* proprietary video driver * proprietary video driver
* hddtemp * hddtemp
* smartmontools * smartmontools
* music player (mpd or supported MPRIS) * music player (mpd or MPRIS supported)
Make dependencies Make dependencies
----------------- -----------------
@ -53,7 +53,7 @@ Installation
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../ cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ../
make && sudo make install 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 Additional information
====================== ======================

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

@ -24,12 +24,19 @@ import org.kde.plasma.private.awesomewidget 1.0
Item { Item {
id: aboutPage id: aboutPage
AWKeys {
id: awKeys;
}
AWActions {
id: awActions;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: AWKeys.isDebugEnabled() property bool debug: awKeys.isDebugEnabled()
Column { Column {
@ -45,26 +52,26 @@ Item {
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: AWActions.getAboutText("header") text: awActions.getAboutText("header")
} }
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: AWActions.getAboutText("version") text: awActions.getAboutText("version")
} }
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
text: AWActions.getAboutText("description") text: awActions.getAboutText("description")
} }
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
textFormat: Text.RichText textFormat: Text.RichText
text: AWActions.getAboutText("links") text: awActions.getAboutText("links")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link);
} }
@ -75,7 +82,7 @@ Item {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
textFormat: Text.RichText textFormat: Text.RichText
text: AWActions.getAboutText("copy") text: awActions.getAboutText("copy")
} }
} }
} }
@ -88,7 +95,7 @@ Item {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
text: AWActions.getAboutText("translators") text: awActions.getAboutText("translators")
} }
QtControls.Label { QtControls.Label {
@ -97,7 +104,7 @@ Item {
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
verticalAlignment: Text.AlignTop verticalAlignment: Text.AlignTop
textFormat: Text.RichText textFormat: Text.RichText
text: AWActions.getAboutText("3rdparty") text: awActions.getAboutText("3rdparty")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link);
} }
} }

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

@ -23,12 +23,17 @@ import org.kde.plasma.private.awesomewidget 1.0
Item { Item {
id: advancedPage id: advancedPage
// backend
AWKeys {
id: awKeys;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: AWKeys.isDebugEnabled() property bool debug: awKeys.isDebugEnabled()
property alias cfg_height: widgetHeight.value property alias cfg_height: widgetHeight.value
property alias cfg_width: widgetWidth.value property alias cfg_width: widgetWidth.value

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

@ -25,12 +25,17 @@ import org.kde.plasma.private.awesomewidget 1.0
Item { Item {
id: appearancePage id: appearancePage
// backend
AWKeys {
id: awKeys;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: AWKeys.isDebugEnabled() property bool debug: awKeys.isDebugEnabled()
property variant weight: { property variant weight: {
25: 0, 25: 0,
50: 1, 50: 1,

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

@ -26,12 +26,20 @@ import org.kde.plasma.private.awesomewidget 1.0
Item { Item {
id: dataenginePage id: dataenginePage
// backend
AWKeys {
id: awKeys;
}
AWActions {
id: awActions;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: AWKeys.isDebugEnabled() property bool debug: awKeys.isDebugEnabled()
property variant tooltipSettings: { property variant tooltipSettings: {
"tooltipNumber": plasmoid.configuration.tooltipNumber, "tooltipNumber": plasmoid.configuration.tooltipNumber,
"useTooltipBackground": plasmoid.configuration.useTooltipBackground, "useTooltipBackground": plasmoid.configuration.useTooltipBackground,
@ -53,7 +61,7 @@ Item {
"batInTooltipColor": plasmoid.configuration.batInTooltipColor "batInTooltipColor": plasmoid.configuration.batInTooltipColor
} }
property variant cfg_dataengine: AWActions.readDataEngineConfiguration() property variant cfg_dataengine: awActions.readDataEngineConfiguration()
Column { Column {
id: pageColumn id: pageColumn
@ -87,7 +95,7 @@ Item {
QtControls.Button { QtControls.Button {
width: parent.width * 3 / 5 width: parent.width * 3 / 5
text: i18n("Edit scripts") text: i18n("Edit scripts")
onClicked: AWKeys.editItem("extscript") onClicked: awKeys.editItem("extscript")
} }
} }
@ -128,7 +136,7 @@ Item {
QtControls.ComboBox { QtControls.ComboBox {
id: hdd id: hdd
width: parent.width * 3 / 5 width: parent.width * 3 / 5
model: AWKeys.getHddDevices(true) model: awKeys.getHddDevices(true)
Component.onCompleted: { Component.onCompleted: {
for (var i=0; i<model.length; i++) { for (var i=0; i<model.length; i++) {
if (model[i] == cfg_dataengine["HDDDEV"]) { if (model[i] == cfg_dataengine["HDDDEV"]) {
@ -247,7 +255,7 @@ Item {
QtControls.Button { QtControls.Button {
width: parent.width * 3 / 5 width: parent.width * 3 / 5
text: i18n("Edit tickers") text: i18n("Edit tickers")
onClicked: AWKeys.editItem("extquotes") onClicked: awKeys.editItem("extquotes")
} }
} }
@ -264,7 +272,7 @@ Item {
QtControls.Button { QtControls.Button {
width: parent.width * 3 / 5 width: parent.width * 3 / 5
text: i18n("Edit command") text: i18n("Edit command")
onClicked: AWKeys.editItem("extupgrade") onClicked: awKeys.editItem("extupgrade")
} }
} }
} }
@ -273,7 +281,7 @@ Item {
if (debug) console.log("[dataengine::onCompleted]") if (debug) console.log("[dataengine::onCompleted]")
// init submodule // init submodule
AWKeys.initKeys(plasmoid.configuration.text) awKeys.initKeys(plasmoid.configuration.text)
} }
Component.onDestruction: { Component.onDestruction: {
@ -283,6 +291,6 @@ Item {
cfg_dataengine["HDDDEV"] = hdd.currentText cfg_dataengine["HDDDEV"] = hdd.currentText
cfg_dataengine["PLAYER"] = player.currentText cfg_dataengine["PLAYER"] = player.currentText
cfg_dataengine["MPRIS"] = mpris.currentText cfg_dataengine["MPRIS"] = mpris.currentText
AWActions.writeDataEngineConfiguration(cfg_dataengine) awActions.writeDataEngineConfiguration(cfg_dataengine)
} }
} }

41
sources/awesome-widget/package/contents/ui/main.qml
View File

@ -28,8 +28,15 @@ import "."
Item { Item {
id: main id: main
// backend
AWKeys {
id: awKeys;
}
AWActions {
id: awActions;
}
property bool debug: AWKeys.isDebugEnabled() property bool debug: awKeys.isDebugEnabled()
property variant settings: { property variant settings: {
"customTime": plasmoid.configuration.customTime, "customTime": plasmoid.configuration.customTime,
"customUptime": plasmoid.configuration.customUptime, "customUptime": plasmoid.configuration.customUptime,
@ -86,13 +93,13 @@ Item {
// FIXME: ugly workaround to make some sources working // FIXME: ugly workaround to make some sources working
systemmonitorDE.interval = plasmoid.configuration.interval systemmonitorDE.interval = plasmoid.configuration.interval
AWKeys.setDataBySource(sourceName, data, settings) awKeys.setDataBySource(sourceName, data, settings)
} }
onSourceAdded: { onSourceAdded: {
if (debug) console.log("[main::onSourceAdded] : Source " + source) if (debug) console.log("[main::onSourceAdded] : Source " + source)
AWKeys.addDevice(source) awKeys.addDevice(source)
} }
} }
@ -107,7 +114,7 @@ Item {
// FIXME: ugly workaround to make some sources working // FIXME: ugly workaround to make some sources working
extsysmonDE.interval = plasmoid.configuration.interval extsysmonDE.interval = plasmoid.configuration.interval
AWKeys.setDataBySource(sourceName, data, settings) awKeys.setDataBySource(sourceName, data, settings)
} }
} }
@ -120,7 +127,7 @@ Item {
onNewData: { onNewData: {
if (debug) console.log("[main::onNewData] : Update source " + sourceName) if (debug) console.log("[main::onNewData] : Update source " + sourceName)
AWKeys.setDataBySource(sourceName, data, settings) awKeys.setDataBySource(sourceName, data, settings)
} }
} }
@ -167,8 +174,8 @@ Item {
// init submodule // init submodule
Plasmoid.userConfiguringChanged(false) Plasmoid.userConfiguringChanged(false)
// connect data // connect data
AWKeys.dropSourceFromDataengine.connect(dropSource) awKeys.dropSourceFromDataengine.connect(dropSource)
AWKeys.needToBeUpdated.connect(needUpdate) awKeys.needToBeUpdated.connect(needUpdate)
} }
onDropSource: { onDropSource: {
@ -181,8 +188,8 @@ Item {
onNeedUpdate: { onNeedUpdate: {
if (debug) console.log("[main::onNeedUpdate]") if (debug) console.log("[main::onNeedUpdate]")
text.text = AWKeys.parsePattern(plasmoid.configuration.text) text.text = awKeys.parsePattern()
tooltip.text = AWKeys.toolTipImage() tooltip.text = awKeys.toolTipImage()
sizeUpdate() sizeUpdate()
} }
@ -211,10 +218,10 @@ Item {
if (debug) console.log("[main::onUserConfiguringChanged]") if (debug) console.log("[main::onUserConfiguringChanged]")
// init submodule // init submodule
AWKeys.initKeys() awKeys.initKeys(plasmoid.configuration.text)
AWKeys.initTooltip(tooltipSettings) awKeys.initTooltip(tooltipSettings)
AWKeys.setPopupEnabled(plasmoid.configuration.notify) awKeys.setPopupEnabled(plasmoid.configuration.notify)
AWKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines) awKeys.setWrapNewLines(plasmoid.configuration.wrapNewLines)
needUpdate() needUpdate()
} }
@ -222,24 +229,24 @@ Item {
function action_checkUpdates() { function action_checkUpdates() {
if (debug) console.log("[main::action_checkUpdates]") if (debug) console.log("[main::action_checkUpdates]")
AWActions.checkUpdates() awActions.checkUpdates()
} }
function action_showReadme() { function action_showReadme() {
if (debug) console.log("[main::action_showReadme]") if (debug) console.log("[main::action_showReadme]")
AWActions.showReadme() awActions.showReadme()
} }
function action_report() { function action_report() {
if (debug) console.log("[main::action_report]") if (debug) console.log("[main::action_report]")
AWActions.sendEmail() awActions.sendEmail()
} }
function action_requestKey() { function action_requestKey() {
if (debug) console.log("[main::action_requestKey]") if (debug) console.log("[main::action_requestKey]")
AWKeys.graphicalValueByKey() awKeys.graphicalValueByKey()
} }
} }

7
sources/awesome-widget/package/contents/ui/tooltip.qml
View File

@ -25,12 +25,17 @@ import org.kde.plasma.private.awesomewidget 1.0
Item { Item {
id: tooltipPage id: tooltipPage
// backend
AWKeys {
id: awKeys;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: AWKeys.isDebugEnabled() property bool debug: awKeys.isDebugEnabled()
property alias cfg_tooltipNumber: tooltipNumber.value property alias cfg_tooltipNumber: tooltipNumber.value
property alias cfg_useTooltipBackground: useTooltipBackground.checked property alias cfg_useTooltipBackground: useTooltipBackground.checked

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

@ -24,12 +24,20 @@ import org.kde.plasma.private.awesomewidget 1.0
Item { Item {
id: widgetPage id: widgetPage
// backend
AWKeys {
id: awKeys;
}
AWActions {
id: awActions;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: AWKeys.isDebugEnabled() property bool debug: awKeys.isDebugEnabled()
property variant settings: { property variant settings: {
"customTime": plasmoid.configuration.customTime, "customTime": plasmoid.configuration.customTime,
"customUptime": plasmoid.configuration.customUptime, "customUptime": plasmoid.configuration.customUptime,
@ -89,7 +97,7 @@ Item {
"family": plasmoid.configuration.fontFamily, "family": plasmoid.configuration.fontFamily,
"size": plasmoid.configuration.fontSize "size": plasmoid.configuration.fontSize
} }
var font = AWActions.getFont(defaultFont) var font = awActions.getFont(defaultFont)
var pos = textPattern.cursorPosition var pos = textPattern.cursorPosition
var selected = textPattern.selectedText var selected = textPattern.selectedText
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
@ -249,10 +257,10 @@ Item {
var message = i18n("Tag: %1", tags.currentText) var message = i18n("Tag: %1", tags.currentText)
message += "<br>" message += "<br>"
message += i18n("Value: %1", AWKeys.valueByKey(tags.currentText)) message += i18n("Value: %1", awKeys.valueByKey(tags.currentText))
message += "<br>" message += "<br>"
message += i18n("Info: %1", AWKeys.infoByKey(tags.currentText)) message += i18n("Info: %1", awKeys.infoByKey(tags.currentText))
AWActions.sendNotification("tag", message) awActions.sendNotification("tag", message)
} }
} }
} }
@ -263,7 +271,7 @@ Item {
QtControls.Button { QtControls.Button {
width: parent.width width: parent.width
text: i18n("Edit bars") text: i18n("Edit bars")
onClicked: AWKeys.editItem("graphicalitem") onClicked: awKeys.editItem("graphicalitem")
} }
} }
@ -287,7 +295,7 @@ Item {
onNewData: { onNewData: {
if (debug) console.log("[widget::onNewData] : Update source " + sourceName) if (debug) console.log("[widget::onNewData] : Update source " + sourceName)
AWKeys.setDataBySource(sourceName, data, settings) awKeys.setDataBySource(sourceName, data, settings)
} }
} }
@ -300,7 +308,7 @@ Item {
onNewData: { onNewData: {
if (debug) console.log("[widget::onNewData] : Update source " + sourceName) if (debug) console.log("[widget::onNewData] : Update source " + sourceName)
AWKeys.setDataBySource(sourceName, data, settings) awKeys.setDataBySource(sourceName, data, settings)
} }
} }
@ -313,7 +321,7 @@ Item {
onNewData: { onNewData: {
if (debug) console.log("[widget::onNewData] : Update source " + sourceName) if (debug) console.log("[widget::onNewData] : Update source " + sourceName)
AWKeys.setDataBySource(sourceName, data, settings) awKeys.setDataBySource(sourceName, data, settings)
} }
} }
@ -321,7 +329,7 @@ Item {
if (debug) console.log("[widget::onCompleted]") if (debug) console.log("[widget::onCompleted]")
// init submodule // init submodule
AWKeys.initKeys(plasmoid.configuration.text) awKeys.initKeys(plasmoid.configuration.text)
tags.model = AWKeys.dictKeys(true) tags.model = awKeys.dictKeys(true)
} }
} }

22
sources/awesome-widget/plugin/awesomewidget.cpp
View File

@ -23,28 +23,10 @@
#include "awkeys.h" #include "awkeys.h"
static QObject *awactions_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
{
Q_UNUSED(engine);
Q_UNUSED(scriptEngine);
return new AWActions();
}
static QObject *awkeys_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
{
Q_UNUSED(engine);
Q_UNUSED(scriptEngine);
return new AWKeys();
}
void AWPlugin::registerTypes(const char *uri) void AWPlugin::registerTypes(const char *uri)
{ {
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget")); Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget"));
qmlRegisterSingletonType<AWActions>(uri, 1, 0, "AWActions", awactions_singletontype_provider); qmlRegisterType<AWActions>(uri, 1, 0, "AWActions");
qmlRegisterSingletonType<AWKeys>(uri, 1, 0, "AWKeys", awkeys_singletontype_provider); qmlRegisterType<AWKeys>(uri, 1, 0, "AWKeys");
} }

21
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -86,7 +86,7 @@ AWKeys::~AWKeys()
} }
void AWKeys::initKeys() void AWKeys::initKeys(const QString currentPattern)
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
@ -100,6 +100,7 @@ void AWKeys::initKeys()
foundKeys.clear(); foundKeys.clear();
// init // init
pattern = currentPattern;
extQuotes = getExtQuotes(); extQuotes = getExtQuotes();
extScripts = getExtScripts(); extScripts = getExtScripts();
extUpgrade = getExtUpgrade(); extUpgrade = getExtUpgrade();
@ -145,18 +146,12 @@ bool AWKeys::isDebugEnabled()
} }
QString AWKeys::parsePattern(const QString currentPattern) QString AWKeys::parsePattern()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
if (keys.isEmpty()) return currentPattern; if (keys.isEmpty()) return pattern;
// get key data QString parsed = pattern;
if ((foundBars.isEmpty()) && (foundKeys.isEmpty())) {
foundBars = findGraphicalItems(currentPattern);
foundKeys = findKeys(currentPattern);
}
QString parsed = currentPattern;
parsed.replace(QString("$$"), QString("$\\$\\")); parsed.replace(QString("$$"), QString("$\\$\\"));
for (int i=0; i<foundKeys.count(); i++) for (int i=0; i<foundKeys.count(); i++)
parsed.replace(QString("$%1").arg(foundKeys[i]), htmlValue(foundKeys[i])); parsed.replace(QString("$%1").arg(foundKeys[i]), htmlValue(foundKeys[i]));
@ -854,6 +849,8 @@ void AWKeys::reinitKeys()
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
keys = dictKeys(); keys = dictKeys();
foundBars = findGraphicalItems();
foundKeys = findKeys();
} }
@ -1328,7 +1325,7 @@ float AWKeys::temperature(const float temp, const QString units)
} }
QStringList AWKeys::findGraphicalItems(const QString pattern) QStringList AWKeys::findGraphicalItems()
{ {
if (debug) qDebug() << PDEBUG; if (debug) qDebug() << PDEBUG;
@ -1348,7 +1345,7 @@ QStringList AWKeys::findGraphicalItems(const QString pattern)
} }
QStringList AWKeys::findKeys(const QString pattern) QStringList AWKeys::findKeys()
{ {
QStringList selectedKeys; QStringList selectedKeys;
for (int i=0; i<keys.count(); i++) { for (int i=0; i<keys.count(); i++) {

9
sources/awesome-widget/plugin/awkeys.h
View File

@ -51,12 +51,12 @@ public:
AWKeys(QObject *parent = nullptr); AWKeys(QObject *parent = nullptr);
~AWKeys(); ~AWKeys();
Q_INVOKABLE void initKeys(); Q_INVOKABLE void initKeys(const QString currentPattern);
Q_INVOKABLE void initTooltip(const QVariantMap tooltipParams); Q_INVOKABLE void initTooltip(const QVariantMap tooltipParams);
Q_INVOKABLE void setPopupEnabled(const bool popup = false); Q_INVOKABLE void setPopupEnabled(const bool popup = false);
Q_INVOKABLE void setWrapNewLines(const bool wrap = false); Q_INVOKABLE void setWrapNewLines(const bool wrap = false);
Q_INVOKABLE bool isDebugEnabled(); Q_INVOKABLE bool isDebugEnabled();
Q_INVOKABLE QString parsePattern(const QString currentPattern); Q_INVOKABLE QString parsePattern();
Q_INVOKABLE QString toolTipImage(); Q_INVOKABLE QString toolTipImage();
Q_INVOKABLE QSize toolTipSize(); Q_INVOKABLE QSize toolTipSize();
// keys // keys
@ -94,8 +94,8 @@ private:
int numberCpus(); int numberCpus();
float temperature(const float temp, const QString units); float temperature(const float temp, const QString units);
// find methods // find methods
QStringList findGraphicalItems(const QString pattern); QStringList findGraphicalItems();
QStringList findKeys(const QString pattern); QStringList findKeys();
// get methods // get methods
// get methods // get methods
QList<ExtQuotes *> getExtQuotes(); QList<ExtQuotes *> getExtQuotes();
@ -121,6 +121,7 @@ private:
QList<ExtQuotes *> extQuotes; QList<ExtQuotes *> extQuotes;
QList<ExtScript *> extScripts; QList<ExtScript *> extScripts;
QList<ExtUpgrade *> extUpgrade; QList<ExtUpgrade *> extUpgrade;
QString pattern;
QStringList foundBars, foundKeys, keys; QStringList foundBars, foundKeys, keys;
QMap<QString, QString> values; QMap<QString, QString> values;
QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices; QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;

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

@ -24,12 +24,17 @@ import org.kde.plasma.private.desktoppanel 1.0
Item { Item {
id: aboutPage id: aboutPage
// backend
DPAdds {
id: dpAdds;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: DPAdds.isDebugEnabled() property bool debug: dpAdds.isDebugEnabled()
Column { Column {
@ -45,26 +50,26 @@ Item {
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: DPAdds.getAboutText("header") text: dpAdds.getAboutText("header")
} }
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
text: DPAdds.getAboutText("version") text: dpAdds.getAboutText("version")
} }
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
text: DPAdds.getAboutText("description") text: dpAdds.getAboutText("description")
} }
QtControls.Label { QtControls.Label {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
textFormat: Text.RichText textFormat: Text.RichText
text: DPAdds.getAboutText("links") text: dpAdds.getAboutText("links")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link);
} }
@ -75,7 +80,7 @@ Item {
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignBottom verticalAlignment: Text.AlignBottom
textFormat: Text.RichText textFormat: Text.RichText
text: DPAdds.getAboutText("copy") text: dpAdds.getAboutText("copy")
} }
} }
} }
@ -88,7 +93,7 @@ Item {
QtLayouts.Layout.fillWidth: true QtLayouts.Layout.fillWidth: true
wrapMode: Text.WordWrap wrapMode: Text.WordWrap
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
text: DPAdds.getAboutText("translators") text: dpAdds.getAboutText("translators")
} }
QtControls.Label { QtControls.Label {
@ -97,7 +102,7 @@ Item {
horizontalAlignment: Text.AlignJustify horizontalAlignment: Text.AlignJustify
verticalAlignment: Text.AlignTop verticalAlignment: Text.AlignTop
textFormat: Text.RichText textFormat: Text.RichText
text: DPAdds.getAboutText("3rdparty") text: dpAdds.getAboutText("3rdparty")
onLinkActivated: Qt.openUrlExternally(link); onLinkActivated: Qt.openUrlExternally(link);
} }
} }

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

@ -25,12 +25,17 @@ import org.kde.plasma.private.desktoppanel 1.0
Item { Item {
id: activeAppearancePage id: activeAppearancePage
// backend
DPAdds {
id: dpAdds;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: DPAdds.isDebugEnabled() property bool debug: dpAdds.isDebugEnabled()
property variant weight: { property variant weight: {
25: 0, 25: 0,
50: 1, 50: 1,

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

@ -25,12 +25,17 @@ import org.kde.plasma.private.desktoppanel 1.0
Item { Item {
id: advancedPage id: advancedPage
// backend
DPAdds {
id: dpAdds;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: DPAdds.isDebugEnabled() property bool debug: dpAdds.isDebugEnabled()
property alias cfg_height: widgetHeight.value property alias cfg_height: widgetHeight.value
property alias cfg_width: widgetWidth.value property alias cfg_width: widgetWidth.value
@ -237,7 +242,7 @@ Item {
// QtControls.Button { // QtControls.Button {
// width: parent.width * 3 / 5 // width: parent.width * 3 / 5
// text: i18n("Edit panels") // text: i18n("Edit panels")
// onClicked: cfg_panels = DPAdds.editPanelsToContol(plasmoid.configuration.panels) // onClicked: cfg_panels = dpAdds.editPanelsToContol(plasmoid.configuration.panels)
// } // }
// } // }
} }

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

@ -25,12 +25,17 @@ import org.kde.plasma.private.desktoppanel 1.0
Item { Item {
id: inactiveAppearancePage id: inactiveAppearancePage
// backend
DPAdds {
id: dpAdds;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: AWKeys.isDebugEnabled() property bool debug: dpAdds.isDebugEnabled()
property variant weight: { property variant weight: {
25: 0, 25: 0,
50: 1, 50: 1,

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

@ -28,8 +28,12 @@ import "."
Item { Item {
id: main id: main
// backend
DPAdds {
id: dpAdds;
}
property bool debug: DPAdds.isDebugEnabled() property bool debug: dpAdds.isDebugEnabled()
property variant tooltipSettings: { property variant tooltipSettings: {
"tooltipColor": plasmoid.configuration.tooltipColor, "tooltipColor": plasmoid.configuration.tooltipColor,
"tooltipType": plasmoid.configuration.tooltipType, "tooltipType": plasmoid.configuration.tooltipType,
@ -54,14 +58,14 @@ Item {
// ui // ui
GridLayout { GridLayout {
anchors.fill: parent anchors.fill: parent
columns: plasmoid.configuration.verticalLayout ? 1 : DPAdds.numberOfDesktops() columns: plasmoid.configuration.verticalLayout ? 1 : dpAdds.numberOfDesktops()
rows: plasmoid.configuration.verticalLayout ? DPAdds.numberOfDesktops() : 1 rows: plasmoid.configuration.verticalLayout ? dpAdds.numberOfDesktops() : 1
Repeater { Repeater {
id: repeater id: repeater
Layout.columnSpan: 0 Layout.columnSpan: 0
Layout.rowSpan: 0 Layout.rowSpan: 0
model: DPAdds.numberOfDesktops() model: dpAdds.numberOfDesktops()
Text { Text {
id: text id: text
@ -73,13 +77,13 @@ Item {
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
text: DPAdds.parsePattern(plasmoid.configuration.text, index + 1) text: dpAdds.parsePattern(plasmoid.configuration.text, index + 1)
property alias tooltip: tooltip property alias tooltip: tooltip
MouseArea { MouseArea {
hoverEnabled: true hoverEnabled: true
anchors.fill: parent anchors.fill: parent
onClicked: DPAdds.setCurrentDesktop(index + 1); onClicked: dpAdds.setCurrentDesktop(index + 1);
onEntered: needTooltipUpdate() onEntered: needTooltipUpdate()
} }
@ -112,8 +116,8 @@ Item {
timer.start() timer.start()
return return
} }
repeater.itemAt(i).text = DPAdds.parsePattern(plasmoid.configuration.text, i + 1) repeater.itemAt(i).text = dpAdds.parsePattern(plasmoid.configuration.text, i + 1)
if (DPAdds.currentDesktop() == i + 1) { if (dpAdds.currentDesktop() == i + 1) {
repeater.itemAt(i).color = plasmoid.configuration.currentFontColor repeater.itemAt(i).color = plasmoid.configuration.currentFontColor
repeater.itemAt(i).font.family = plasmoid.configuration.currentFontFamily repeater.itemAt(i).font.family = plasmoid.configuration.currentFontFamily
repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic" ? true : false repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic" ? true : false
@ -137,7 +141,7 @@ Item {
if (debug) console.log("[main::onNeedTooltipUpdate]") if (debug) console.log("[main::onNeedTooltipUpdate]")
for (var i=0; i<repeater.count; i++) { for (var i=0; i<repeater.count; i++) {
repeater.itemAt(i).tooltip.text = DPAdds.toolTipImage(i + 1) repeater.itemAt(i).tooltip.text = dpAdds.toolTipImage(i + 1)
} }
} }
@ -169,16 +173,16 @@ Item {
Plasmoid.onActivated: { Plasmoid.onActivated: {
if (debug) console.log("[main::onActivated]") if (debug) console.log("[main::onActivated]")
// DPAdds.changePanelsState() // dpAdds.changePanelsState()
} }
Plasmoid.onUserConfiguringChanged: { Plasmoid.onUserConfiguringChanged: {
if (plasmoid.userConfiguring) return if (plasmoid.userConfiguring) return
if (debug) console.log("[main::onUserConfiguringChanged]") if (debug) console.log("[main::onUserConfiguringChanged]")
DPAdds.setMark(plasmoid.configuration.mark) dpAdds.setMark(plasmoid.configuration.mark)
DPAdds.setPanelsToControl(plasmoid.configuration.panels) dpAdds.setPanelsToControl(plasmoid.configuration.panels)
DPAdds.setToolTipData(tooltipSettings) dpAdds.setToolTipData(tooltipSettings)
needUpdate() needUpdate()
} }
@ -188,7 +192,7 @@ Item {
// init submodule // init submodule
Plasmoid.userConfiguringChanged(false) Plasmoid.userConfiguringChanged(false)
DPAdds.desktopChanged.connect(needUpdate) dpAdds.desktopChanged.connect(needUpdate)
DPAdds.windowListChanged.connect(needTooltipUpdate) dpAdds.windowListChanged.connect(needTooltipUpdate)
} }
} }

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

@ -23,12 +23,17 @@ import org.kde.plasma.private.desktoppanel 1.0
Item { Item {
id: widgetPage id: widgetPage
// backend
DPAdds {
id: dpAdds;
}
width: childrenRect.width width: childrenRect.width
height: childrenRect.height height: childrenRect.height
implicitWidth: pageColumn.implicitWidth implicitWidth: pageColumn.implicitWidth
implicitHeight: pageColumn.implicitHeight implicitHeight: pageColumn.implicitHeight
property bool debug: DPAdds.isDebugEnabled() property bool debug: dpAdds.isDebugEnabled()
property alias cfg_text: textPattern.text property alias cfg_text: textPattern.text
@ -61,7 +66,7 @@ Item {
"family": plasmoid.configuration.fontFamily, "family": plasmoid.configuration.fontFamily,
"size": plasmoid.configuration.fontSize "size": plasmoid.configuration.fontSize
} }
var font = DPAdds.getFont(defaultFont) var font = dpAdds.getFont(defaultFont)
var pos = textPattern.cursorPosition var pos = textPattern.cursorPosition
var selected = textPattern.selectedText var selected = textPattern.selectedText
textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd) textPattern.remove(textPattern.selectionStart, textPattern.selectionEnd)
@ -198,7 +203,7 @@ Item {
QtControls.ComboBox { QtControls.ComboBox {
id: tags id: tags
width: parent.width - addTagButton.width - showValueButton.width width: parent.width - addTagButton.width - showValueButton.width
model: DPAdds.dictKeys() model: dpAdds.dictKeys()
} }
QtControls.Button { QtControls.Button {
id: addTagButton id: addTagButton
@ -222,8 +227,8 @@ Item {
var message = i18n("Tag: %1", tags.currentText) var message = i18n("Tag: %1", tags.currentText)
message += "<br>" message += "<br>"
message += i18n("Value: %1", DPAdds.valueByKey(tags.currentText)) message += i18n("Value: %1", dpAdds.valueByKey(tags.currentText))
DPAdds.sendNotification("tag", message) dpAdds.sendNotification("tag", message)
} }
} }
} }

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

@ -22,18 +22,9 @@
#include "dpadds.h" #include "dpadds.h"
static QObject *dpadds_singletontype_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
{
Q_UNUSED(engine);
Q_UNUSED(scriptEngine);
return new DPAdds();
}
void DPPlugin::registerTypes(const char *uri) void DPPlugin::registerTypes(const char *uri)
{ {
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.desktoppanel")); Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.desktoppanel"));
qmlRegisterSingletonType<DPAdds>(uri, 1, 0, "DPAdds", dpadds_singletontype_provider); qmlRegisterType<DPAdds>(uri, 1, 0, "DPAdds");
} }