From c6cadba4b649626b81d7cf78ae7d50390ee8bb15 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 12 May 2015 00:19:08 +0300 Subject: [PATCH] some part of refactoring move plugin from private fix translation issue (#50) --- sources/CMakeLists.txt | 3 + sources/awesome-widget-kde4/configuration.cpp | 6 +- .../package/contents/ui/about.qml | 2 +- .../package/contents/ui/advanced.qml | 2 +- .../package/contents/ui/appearance.qml | 2 +- .../package/contents/ui/dataengine.qml | 2 +- .../package/contents/ui/main.qml | 2 +- .../package/contents/ui/tooltip.qml | 2 +- .../package/contents/ui/widget.qml | 2 +- .../awesome-widget-kf5/plugin/CMakeLists.txt | 20 +++---- .../awesome-widget-kf5/plugin/awactions.cpp | 2 +- sources/awesome-widget-kf5/plugin/awactions.h | 7 ++- .../plugin/awesomewidget.cpp | 2 +- .../awesome-widget-kf5/plugin/awesomewidget.h | 2 - sources/awesome-widget-kf5/plugin/awkeys.cpp | 57 +++++++++++-------- sources/awesome-widget-kf5/plugin/awkeys.h | 2 +- .../awesome-widget-kf5/plugin/awtooltip.cpp | 2 +- sources/awesome-widget-kf5/plugin/awtooltip.h | 2 +- .../plugin/graphicalitem.cpp | 16 +++--- .../awesome-widget-kf5/plugin/graphicalitem.h | 4 +- sources/awesome-widget-kf5/plugin/qmldir | 2 +- .../package/contents/ui/about.qml | 2 +- .../package/contents/ui/activeapp.qml | 2 +- .../package/contents/ui/advanced.qml | 2 +- .../package/contents/ui/inactiveapp.qml | 2 +- .../package/contents/ui/main.qml | 34 +++++++---- .../package/contents/ui/widget.qml | 2 +- .../desktop-panel-kf5/plugin/CMakeLists.txt | 8 +-- .../desktop-panel-kf5/plugin/desktoppanel.cpp | 2 +- .../desktop-panel-kf5/plugin/desktoppanel.h | 2 - sources/desktop-panel-kf5/plugin/dpadds.cpp | 18 +++--- sources/desktop-panel-kf5/plugin/dpadds.h | 2 +- sources/desktop-panel-kf5/plugin/qmldir | 2 +- sources/extsysmon/extquotes.cpp | 14 ++--- sources/extsysmon/extquotes.h | 4 +- sources/extsysmon/extscript.cpp | 20 +++---- sources/extsysmon/extscript.h | 4 +- sources/extsysmon/extsysmon.cpp | 20 +++---- sources/extsysmon/extsysmon.h | 12 ++-- sources/extsysmon/extupgrade.cpp | 16 +++--- sources/extsysmon/extupgrade.h | 4 +- 41 files changed, 166 insertions(+), 147 deletions(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index bfcfe2e..6d482b5 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -37,6 +37,9 @@ if (CMAKE_COMPILER_IS_GNUCXX) else () message (STATUS "Unknown compiler") endif () +if (CMAKE_BUILD_TYPE MATCHES Debug) + set (CMAKE_VERBOSE_MAKEFILE ON) +endif () configure_file (${CMAKE_SOURCE_DIR}/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/version.h) set (PROJECT_TRDPARTY_DIR ${CMAKE_CURRENT_SOURCE_DIR}/3rdparty) diff --git a/sources/awesome-widget-kde4/configuration.cpp b/sources/awesome-widget-kde4/configuration.cpp index d8a1b98..b7646da 100644 --- a/sources/awesome-widget-kde4/configuration.cpp +++ b/sources/awesome-widget-kde4/configuration.cpp @@ -795,7 +795,7 @@ void AwesomeWidget::contextMenuBars(const QPoint pos) for (int i=0; ifileName() != uiAdvancedConfig.listWidget_bars->currentItem()->text()) continue; - if (graphicalItems[i]->tryDelete() == 1) { + if (graphicalItems[i]->tryDelete()) { graphicalItems.removeAt(i); uiAdvancedConfig.listWidget_bars->takeItem(uiAdvancedConfig.listWidget_bars->currentRow()); } @@ -821,7 +821,7 @@ void AwesomeWidget::contextMenuCustomCommand(const QPoint pos) else if (action == remove) { QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts"); ExtScript *script = new ExtScript(0, uiDEConfig.listWidget_custom->currentItem()->text(), dirs, debug); - if (script->tryDelete() == 1) + if (script->tryDelete()) uiDEConfig.listWidget_custom->takeItem(uiDEConfig.listWidget_custom->currentRow()); delete script; } @@ -845,7 +845,7 @@ void AwesomeWidget::contextMenuPkgCommand(const QPoint pos) else if (action == remove) { QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade"); ExtUpgrade *upgrade = new ExtUpgrade(0, uiDEConfig.listWidget_pkgCommand->currentItem()->text(), dirs, debug); - if (upgrade->tryDelete() == 1) + if (upgrade->tryDelete()) uiDEConfig.listWidget_pkgCommand->takeItem(uiDEConfig.listWidget_pkgCommand->currentRow()); delete upgrade; } diff --git a/sources/awesome-widget-kf5/package/contents/ui/about.qml b/sources/awesome-widget-kf5/package/contents/ui/about.qml index d9bb93e..edfeb61 100644 --- a/sources/awesome-widget-kf5/package/contents/ui/about.qml +++ b/sources/awesome-widget-kf5/package/contents/ui/about.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.3 as QtControls import QtQuick.Layouts 1.0 as QtLayouts -import org.kde.plasma.private.awesomewidget 1.0 +import org.kde.plasma.awesomewidget 1.0 Item { diff --git a/sources/awesome-widget-kf5/package/contents/ui/advanced.qml b/sources/awesome-widget-kf5/package/contents/ui/advanced.qml index 6076415..d89b7b4 100644 --- a/sources/awesome-widget-kf5/package/contents/ui/advanced.qml +++ b/sources/awesome-widget-kf5/package/contents/ui/advanced.qml @@ -18,7 +18,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.3 as QtControls -import org.kde.plasma.private.awesomewidget 1.0 +import org.kde.plasma.awesomewidget 1.0 Item { diff --git a/sources/awesome-widget-kf5/package/contents/ui/appearance.qml b/sources/awesome-widget-kf5/package/contents/ui/appearance.qml index 9fc2619..b1c28df 100644 --- a/sources/awesome-widget-kf5/package/contents/ui/appearance.qml +++ b/sources/awesome-widget-kf5/package/contents/ui/appearance.qml @@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls import QtQuick.Controls.Styles 1.3 as QtStyles import QtQuick.Dialogs 1.1 as QtDialogs -import org.kde.plasma.private.awesomewidget 1.0 +import org.kde.plasma.awesomewidget 1.0 Item { diff --git a/sources/awesome-widget-kf5/package/contents/ui/dataengine.qml b/sources/awesome-widget-kf5/package/contents/ui/dataengine.qml index d7f6ae4..80e8075 100644 --- a/sources/awesome-widget-kf5/package/contents/ui/dataengine.qml +++ b/sources/awesome-widget-kf5/package/contents/ui/dataengine.qml @@ -21,7 +21,7 @@ import QtQuick.Dialogs 1.1 as QtDialogs import QtQuick.Layouts 1.0 as QtLayouts import QtQuick.Controls.Styles 1.3 as QtStyles -import org.kde.plasma.private.awesomewidget 1.0 +import org.kde.plasma.awesomewidget 1.0 Item { diff --git a/sources/awesome-widget-kf5/package/contents/ui/main.qml b/sources/awesome-widget-kf5/package/contents/ui/main.qml index 194d1fb..83b1fcb 100644 --- a/sources/awesome-widget-kf5/package/contents/ui/main.qml +++ b/sources/awesome-widget-kf5/package/contents/ui/main.qml @@ -22,7 +22,7 @@ import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents -import org.kde.plasma.private.awesomewidget 1.0 +import org.kde.plasma.awesomewidget 1.0 import "." diff --git a/sources/awesome-widget-kf5/package/contents/ui/tooltip.qml b/sources/awesome-widget-kf5/package/contents/ui/tooltip.qml index bca8235..a59aa00 100644 --- a/sources/awesome-widget-kf5/package/contents/ui/tooltip.qml +++ b/sources/awesome-widget-kf5/package/contents/ui/tooltip.qml @@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls import QtQuick.Controls.Styles 1.3 as QtStyles import QtQuick.Dialogs 1.1 as QtDialogs -import org.kde.plasma.private.awesomewidget 1.0 +import org.kde.plasma.awesomewidget 1.0 Item { diff --git a/sources/awesome-widget-kf5/package/contents/ui/widget.qml b/sources/awesome-widget-kf5/package/contents/ui/widget.qml index 5dcc2ec..cbbe9e3 100644 --- a/sources/awesome-widget-kf5/package/contents/ui/widget.qml +++ b/sources/awesome-widget-kf5/package/contents/ui/widget.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.3 as QtControls import org.kde.plasma.core 2.0 as PlasmaCore -import org.kde.plasma.private.awesomewidget 1.0 +import org.kde.plasma.awesomewidget 1.0 Item { diff --git a/sources/awesome-widget-kf5/plugin/CMakeLists.txt b/sources/awesome-widget-kf5/plugin/CMakeLists.txt index 99f07c7..dd08b04 100644 --- a/sources/awesome-widget-kf5/plugin/CMakeLists.txt +++ b/sources/awesome-widget-kf5/plugin/CMakeLists.txt @@ -1,4 +1,5 @@ set (PLUGIN_NAME awplugin) +add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.awesomewidget\") add_definitions (${Qt5Core_DEFINITIONS} ${Qt5Network_DEFINITIONS} ${Qt5Xml_DEFINITIONS}) set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS} @@ -24,24 +25,23 @@ include_directories (${CMAKE_SOURCE_DIR} ${Qt_INCLUDE} ${Kf5_INCLUDE}) -file (GLOB SUBPROJECT_SOURCE *.cpp) -file (GLOB SUBPROJECT_NOTIFY *.notifyrc) -file (GLOB SUBPROJECT_UI *.ui) # task source is required by extscripts file (GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/task/*.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp ../../extsysmon/extquotes.cpp ../../extsysmon/extscript.cpp ../../extsysmon/extupgrade.cpp) -set (TASK_HEADER ${PROJECT_TRDPARTY_DIR}/task/task.h) -set (SUBPROJECT_DESKTOPS ${CMAKE_CURRENT_SOURCE_DIR}/desktops) +set (SUBPROJECT_HEADER ${PROJECT_TRDPARTY_DIR}/task/task.h) +file (GLOB SUBPROJECT_UI *.ui) +file (GLOB SUBPROJECT_NOTIFY *.notifyrc) +set (SUBPROJECT_DESKTOP ${CMAKE_CURRENT_SOURCE_DIR}/desktops) -qt5_wrap_cpp (TASK_MOC_SOURCE ${TASK_HEADER}) +qt5_wrap_cpp (SUBPROJECT_MOC_SOURCE ${SUBPROJECT_HEADER}) qt5_wrap_ui (SUBPROJECT_UI_HEADER ${SUBPROJECT_UI}) -add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER} ${TASK_MOC_SOURCE}) +add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE} ${SUBPROJECT_UI_HEADER} ${SUBPROJECT_MOC_SOURCE}) target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES}) -install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget) -install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/awesomewidget) +install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/awesomewidget) +install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/awesomewidget) install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR}) -install (DIRECTORY ${SUBPROJECT_DESKTOPS} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) +install (DIRECTORY ${SUBPROJECT_DESKTOP} DESTINATION ${DATA_INSTALL_DIR}/${PROJECT_NAME}) diff --git a/sources/awesome-widget-kf5/plugin/awactions.cpp b/sources/awesome-widget-kf5/plugin/awactions.cpp index 33beb25..84a0ad7 100644 --- a/sources/awesome-widget-kf5/plugin/awactions.cpp +++ b/sources/awesome-widget-kf5/plugin/awactions.cpp @@ -199,7 +199,7 @@ void AWActions::sendNotification(const QString eventId, const QString message, c { if ((eventId == QString("event")) && (!enablePopup)) return; - KNotification *notification = KNotification::event(eventId, QString("Awesome Widget ::: ") + eventId, message); + KNotification *notification = KNotification::event(eventId, QString("Awesome Widget ::: %1").arg(eventId), message); notification->setComponentName(QString("plasma-applet-org.kde.plasma.awesome-widget")); } diff --git a/sources/awesome-widget-kf5/plugin/awactions.h b/sources/awesome-widget-kf5/plugin/awactions.h index 259ee49..26906b2 100644 --- a/sources/awesome-widget-kf5/plugin/awactions.h +++ b/sources/awesome-widget-kf5/plugin/awactions.h @@ -31,7 +31,7 @@ class AWActions : public QObject Q_OBJECT public: - AWActions(QObject *parent = 0); + AWActions(QObject *parent = nullptr); ~AWActions(); Q_INVOKABLE void checkUpdates(); @@ -39,14 +39,15 @@ public: Q_INVOKABLE void sendEmail(); Q_INVOKABLE void showReadme(); // configuration slots - Q_INVOKABLE QString getAboutText(const QString type = "header"); + Q_INVOKABLE QString getAboutText(const QString type = QString("header")); Q_INVOKABLE QMap getFont(const QMap defaultFont); // dataengine Q_INVOKABLE QMap readDataEngineConfiguration(); Q_INVOKABLE void writeDataEngineConfiguration(const QMap configuration); public slots: - Q_INVOKABLE static void sendNotification(const QString eventId, const QString message, const bool enablePopup = false); + Q_INVOKABLE static void sendNotification(const QString eventId, const QString message, + const bool enablePopup = false); private slots: void showUpdates(QString version); diff --git a/sources/awesome-widget-kf5/plugin/awesomewidget.cpp b/sources/awesome-widget-kf5/plugin/awesomewidget.cpp index 5166107..4c70f56 100644 --- a/sources/awesome-widget-kf5/plugin/awesomewidget.cpp +++ b/sources/awesome-widget-kf5/plugin/awesomewidget.cpp @@ -43,7 +43,7 @@ static QObject *awkeys_singletontype_provider(QQmlEngine *engine, QJSEngine *scr void AWPlugin::registerTypes(const char *uri) { - Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.awesomewidget")); + Q_ASSERT(uri == QLatin1String("org.kde.plasma.awesomewidget")); qmlRegisterSingletonType(uri, 1, 0, "AWActions", awactions_singletontype_provider); qmlRegisterSingletonType(uri, 1, 0, "AWKeys", awkeys_singletontype_provider); diff --git a/sources/awesome-widget-kf5/plugin/awesomewidget.h b/sources/awesome-widget-kf5/plugin/awesomewidget.h index c4c8922..743e2c9 100644 --- a/sources/awesome-widget-kf5/plugin/awesomewidget.h +++ b/sources/awesome-widget-kf5/plugin/awesomewidget.h @@ -22,8 +22,6 @@ #include -class QQmlEngine; - class AWPlugin : public QQmlExtensionPlugin { Q_OBJECT diff --git a/sources/awesome-widget-kf5/plugin/awkeys.cpp b/sources/awesome-widget-kf5/plugin/awkeys.cpp index b5eb9be..211f5c5 100644 --- a/sources/awesome-widget-kf5/plugin/awkeys.cpp +++ b/sources/awesome-widget-kf5/plugin/awkeys.cpp @@ -135,10 +135,10 @@ QString AWKeys::parsePattern() QString parsed = pattern; parsed.replace(QString("$$"), QString("$\\$\\")); for (int i=0; iimage(valueByKey(foundBars[i]).toFloat())); + parsed.replace(QString("$%1").arg(foundBars[i]), getItemByTag(foundBars[i])->image(valueByKey(foundBars[i]).toFloat())); parsed.replace(QString("$\\$\\"), QString("$$")); return parsed; @@ -259,10 +259,8 @@ QStringList AWKeys::dictKeys() allKeys.append(QString("hddw%1").arg(i)); } // hdd temp - for (int i=hddDevices.count()-1; i>=0; i--) { + for (int i=hddDevices.count()-1; i>=0; i--) allKeys.append(QString("hddtemp%1").arg(i)); - allKeys.append(QString("hddtemp%1").arg(i)); - } // network for (int i=networkDevices.count()-1; i>=0; i--) { allKeys.append(QString("down%1").arg(i)); @@ -308,7 +306,8 @@ QStringList AWKeys::dictKeys() // bars QStringList graphicalItemsKeys; for (int i=0; iname() + graphicalItems[i]->bar()); + graphicalItemsKeys.append(QString("%1%2").arg(graphicalItems[i]->name()) + .arg(graphicalItems[i]->bar())); graphicalItemsKeys.sort(); for (int i=graphicalItemsKeys.count()-1; i>=0; i--) allKeys.append(graphicalItemsKeys[i]); @@ -666,7 +665,10 @@ QString AWKeys::infoByKey(QString key) key.remove(QRegExp(QString("^bar[0-9]{1,}"))); if (key.startsWith(QString("custom"))) - return QString("%1").arg(extScripts[key.remove(QString("custom")).toInt()]->executable()); + for (int i=0; itag() != key) continue; + return extScripts[i]->executable(); + } else if (key.contains(QRegExp(QString("^hdd[rw]")))) return QString("%1").arg(diskDevices[key.remove(QRegExp(QString("hdd[rw]"))).toInt()]); else if (key.startsWith(QString("fan"))) @@ -678,11 +680,17 @@ QString AWKeys::infoByKey(QString key) else if (key.contains(QRegExp(QString("^(down|up)[0-9]")))) return QString("%1").arg(networkDevices[key.remove(QRegExp(QString("^(down|up)"))).toInt()]); else if (key.startsWith(QString("pkgcount"))) - return QString("%1").arg(extUpgrade[key.remove(QString("pkgcount")).toInt()]->executable()); + for (int i=0; itag() != key) continue; + return extUpgrade[i]->executable(); + } else if ((key.startsWith(QString("ask"))) || (key.startsWith(QString("bid"))) || (key.startsWith(QString("price")))) - return QString("%1").arg(extQuotes[key.remove(QRegExp(QString("^(ask|bid|price)"))).toInt()]->ticker()); + for (int i=0; inumber() != key.remove(QRegExp(QString("^(ask|bid|price)"))).toInt()) continue; + return extQuotes[i]->ticker(); + } else if (key.startsWith(QString("temp"))) return QString("%1").arg(tempDevices[key.remove(QString("temp")).toInt()]); @@ -761,7 +769,8 @@ void AWKeys::loadKeysFromCache() { if (debug) qDebug() << PDEBUG; - QString fileName = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)); + QString fileName = QString("%1/awesomewidgets.ndx") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation)); if (debug) qDebug() << PDEBUG << ":" << "Cache file" << fileName; QSettings cache(fileName, QSettings::IniFormat); QStringList cachedKeys; @@ -870,7 +879,7 @@ void AWKeys::editItemButtonPressed(QAbstractButton *button) case RequestedExtQuotes: for (int i=0; ifileName() != current) continue; - if (extQuotes[i]->tryDelete() == 1) { + if (extQuotes[i]->tryDelete()) { widgetDialog->takeItem(widgetDialog->row(item)); extQuotes.clear(); extQuotes = getExtQuotes(); @@ -881,7 +890,7 @@ void AWKeys::editItemButtonPressed(QAbstractButton *button) case RequestedExtScript: for (int i=0; ifileName() != current) continue; - if (extScripts[i]->tryDelete() == 1) { + if (extScripts[i]->tryDelete()) { widgetDialog->takeItem(widgetDialog->row(item)); extScripts.clear(); extScripts = getExtScripts(); @@ -892,7 +901,7 @@ void AWKeys::editItemButtonPressed(QAbstractButton *button) case RequestedExtUpgrade: for (int i=0; ifileName() != current) continue; - if (extUpgrade[i]->tryDelete() == 1) { + if (extUpgrade[i]->tryDelete()) { widgetDialog->takeItem(widgetDialog->row(item)); extUpgrade.clear(); extUpgrade = getExtUpgrade(); @@ -903,7 +912,7 @@ void AWKeys::editItemButtonPressed(QAbstractButton *button) case RequestedGraphicalItem: for (int i=0; ifileName() != current) continue; - if (graphicalItems[i]->tryDelete() == 1) { + if (graphicalItems[i]->tryDelete()) { widgetDialog->takeItem(widgetDialog->row(item)); graphicalItems.clear(); graphicalItems = getGraphicalItems(); @@ -1309,7 +1318,7 @@ QStringList AWKeys::findGraphicalItems() QStringList selectedKeys; for (int i=orderedKeys.count()-1; i>=0; i--) - if (pattern.contains(QString("$") + orderedKeys[i])) { + if (pattern.contains(QString("$%1").arg(orderedKeys[i]))) { if (debug) qDebug() << PDEBUG << ":" << "Found key" << orderedKeys[i]; selectedKeys.append(orderedKeys[i]); } @@ -1323,7 +1332,7 @@ QStringList AWKeys::findKeys() QStringList selectedKeys; for (int i=0; i AWKeys::getExtQuotes() QList externalQuotes; // create directory at $HOME - QString localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - QString("/awesomewidgets/quotes"); + QString localDir = QString("%1/awesomewidgets/quotes") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir localDirectory; if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; @@ -1370,8 +1379,8 @@ QList AWKeys::getExtScripts() QList externalScripts; // create directory at $HOME - QString localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - QString("/awesomewidgets/scripts"); + QString localDir = QString("%1/awesomewidgets/scripts") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir localDirectory; if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; @@ -1401,8 +1410,8 @@ QList AWKeys::getExtUpgrade() QList externalUpgrade; // create directory at $HOME - QString localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - QString("/awesomewidgets/upgrade"); + QString localDir = QString("%1/awesomewidgets/upgrade") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir localDirectory; if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; @@ -1432,8 +1441,8 @@ QList AWKeys::getGraphicalItems() QList items; // create directory at $HOME - QString localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - QString("/awesomewidgets/desktops"); + QString localDir = QString("%1/awesomewidgets/desktops") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir localDirectory; if (localDirectory.mkpath(localDir)) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; diff --git a/sources/awesome-widget-kf5/plugin/awkeys.h b/sources/awesome-widget-kf5/plugin/awkeys.h index 6b683c1..87e7937 100644 --- a/sources/awesome-widget-kf5/plugin/awkeys.h +++ b/sources/awesome-widget-kf5/plugin/awkeys.h @@ -48,7 +48,7 @@ class AWKeys : public QObject }; public: - AWKeys(QObject *parent = 0); + AWKeys(QObject *parent = nullptr); ~AWKeys(); Q_INVOKABLE void initKeys(const QString currentPattern, diff --git a/sources/awesome-widget-kf5/plugin/awtooltip.cpp b/sources/awesome-widget-kf5/plugin/awtooltip.cpp index 72bb43b..0c6c5d0 100644 --- a/sources/awesome-widget-kf5/plugin/awtooltip.cpp +++ b/sources/awesome-widget-kf5/plugin/awtooltip.cpp @@ -104,7 +104,7 @@ QPixmap AWToolTip::image() float normX = 100.0 / static_cast(data[requiredKeys[i]].count()); float normY = 100.0 / (1.5 * boundaries[requiredKeys[i]]); if (requiredKeys[i] != QString("batTooltip")) - pen.setColor(QColor(configuration[requiredKeys[i] + QString("Color")].toString())); + pen.setColor(QColor(configuration[QString("%1Color").arg(requiredKeys[i])].toString())); float shift = i * 100.0; if (down) shift -= 100.0; for (int j=0; j settings = QMap()); ~AWToolTip(); diff --git a/sources/awesome-widget-kf5/plugin/graphicalitem.cpp b/sources/awesome-widget-kf5/plugin/graphicalitem.cpp index 5c03fa8..19671a1 100644 --- a/sources/awesome-widget-kf5/plugin/graphicalitem.cpp +++ b/sources/awesome-widget-kf5/plugin/graphicalitem.cpp @@ -396,7 +396,7 @@ void GraphicalItem::readConfiguration() for (int i=m_dirs.count()-1; i>=0; i--) { if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue; - QSettings settings(m_dirs[i] + QDir::separator() + m_fileName, QSettings::IniFormat); + QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat); settings.beginGroup(QString("Desktop Entry")); setName(settings.value(QString("Name"), m_name).toString()); @@ -449,18 +449,18 @@ int GraphicalItem::showConfiguration(const QStringList tags) } -int GraphicalItem::tryDelete() +bool GraphicalItem::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; itext()); + QColor color = stringToColor((dynamic_cast(sender()))->text()); QColor newColor = QColorDialog::getColor(color, 0, i18n("Select color"), QColorDialog::ShowAlphaChannel); if (!newColor.isValid()) return; diff --git a/sources/awesome-widget-kf5/plugin/graphicalitem.h b/sources/awesome-widget-kf5/plugin/graphicalitem.h index 0d08c8f..5168f53 100644 --- a/sources/awesome-widget-kf5/plugin/graphicalitem.h +++ b/sources/awesome-widget-kf5/plugin/graphicalitem.h @@ -51,7 +51,7 @@ public: Circle }; - explicit GraphicalItem(QWidget *parent = 0, const QString desktopName = QString(), + explicit GraphicalItem(QWidget *parent = nullptr, const QString desktopName = QString(), const QStringList directories = QStringList(), const bool debugCmd = false); ~GraphicalItem(); QString fileName(); @@ -86,7 +86,7 @@ public: public slots: void readConfiguration(); int showConfiguration(const QStringList tags = QStringList()); - int tryDelete(); + bool tryDelete(); void writeConfiguration(); private slots: diff --git a/sources/awesome-widget-kf5/plugin/qmldir b/sources/awesome-widget-kf5/plugin/qmldir index 8a3ed27..76288c8 100644 --- a/sources/awesome-widget-kf5/plugin/qmldir +++ b/sources/awesome-widget-kf5/plugin/qmldir @@ -1,3 +1,3 @@ -module org.kde.plasma.private.awesomewidget +module org.kde.plasma.awesomewidget plugin awplugin diff --git a/sources/desktop-panel-kf5/package/contents/ui/about.qml b/sources/desktop-panel-kf5/package/contents/ui/about.qml index 52cd032..8d964b2 100644 --- a/sources/desktop-panel-kf5/package/contents/ui/about.qml +++ b/sources/desktop-panel-kf5/package/contents/ui/about.qml @@ -19,7 +19,7 @@ import QtQuick 2.0 import QtQuick.Controls 1.3 as QtControls import QtQuick.Layouts 1.0 as QtLayouts -import org.kde.plasma.private.desktoppanel 1.0 +import org.kde.plasma.desktoppanel 1.0 Item { diff --git a/sources/desktop-panel-kf5/package/contents/ui/activeapp.qml b/sources/desktop-panel-kf5/package/contents/ui/activeapp.qml index 55776b6..c6ff237 100644 --- a/sources/desktop-panel-kf5/package/contents/ui/activeapp.qml +++ b/sources/desktop-panel-kf5/package/contents/ui/activeapp.qml @@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls import QtQuick.Controls.Styles 1.3 as QtStyles import QtQuick.Dialogs 1.1 as QtDialogs -import org.kde.plasma.private.desktoppanel 1.0 +import org.kde.plasma.desktoppanel 1.0 Item { diff --git a/sources/desktop-panel-kf5/package/contents/ui/advanced.qml b/sources/desktop-panel-kf5/package/contents/ui/advanced.qml index a8023be..3425ac5 100644 --- a/sources/desktop-panel-kf5/package/contents/ui/advanced.qml +++ b/sources/desktop-panel-kf5/package/contents/ui/advanced.qml @@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls import QtQuick.Controls.Styles 1.3 as QtStyles import QtQuick.Dialogs 1.1 as QtDialogs -import org.kde.plasma.private.desktoppanel 1.0 +import org.kde.plasma.desktoppanel 1.0 Item { diff --git a/sources/desktop-panel-kf5/package/contents/ui/inactiveapp.qml b/sources/desktop-panel-kf5/package/contents/ui/inactiveapp.qml index 3086751..0333632 100644 --- a/sources/desktop-panel-kf5/package/contents/ui/inactiveapp.qml +++ b/sources/desktop-panel-kf5/package/contents/ui/inactiveapp.qml @@ -20,7 +20,7 @@ import QtQuick.Controls 1.3 as QtControls import QtQuick.Controls.Styles 1.3 as QtStyles import QtQuick.Dialogs 1.1 as QtDialogs -import org.kde.plasma.private.desktoppanel 1.0 +import org.kde.plasma.desktoppanel 1.0 Item { diff --git a/sources/desktop-panel-kf5/package/contents/ui/main.qml b/sources/desktop-panel-kf5/package/contents/ui/main.qml index 681abe1..68ebe73 100644 --- a/sources/desktop-panel-kf5/package/contents/ui/main.qml +++ b/sources/desktop-panel-kf5/package/contents/ui/main.qml @@ -22,7 +22,7 @@ import org.kde.plasma.plasmoid 2.0 import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents -import org.kde.plasma.private.desktoppanel 1.0 +import org.kde.plasma.desktoppanel 1.0 import "." @@ -35,9 +35,11 @@ Item { "tooltipType": plasmoid.configuration.tooltipType, "tooltipWidth": plasmoid.configuration.tooltipWidth } + property bool initializated: false signal needUpdate signal needTooltipUpdate + signal sizeUpdate // init @@ -49,16 +51,17 @@ Item { // ui - Grid { + GridLayout { anchors.fill: parent - horizontalItemAlignment: Grid.AlignHCenter - verticalItemAlignment: Grid.AlignVCenter 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() + Text { id: text height: contentHeight @@ -101,8 +104,6 @@ Item { onNeedUpdate: { if (debug) console.log("[main::onNeedUpdate]") - var newHeight = 0 - var newWidth = 0 for (var i=0; i(uri, 1, 0, "DPAdds", dpadds_singletontype_provider); } diff --git a/sources/desktop-panel-kf5/plugin/desktoppanel.h b/sources/desktop-panel-kf5/plugin/desktoppanel.h index 0887bcb..cd7d0cb 100644 --- a/sources/desktop-panel-kf5/plugin/desktoppanel.h +++ b/sources/desktop-panel-kf5/plugin/desktoppanel.h @@ -22,8 +22,6 @@ #include -class QQmlEngine; - class DPPlugin : public QQmlExtensionPlugin { Q_OBJECT diff --git a/sources/desktop-panel-kf5/plugin/dpadds.cpp b/sources/desktop-panel-kf5/plugin/dpadds.cpp index b6a6f18..11f4b45 100644 --- a/sources/desktop-panel-kf5/plugin/dpadds.cpp +++ b/sources/desktop-panel-kf5/plugin/dpadds.cpp @@ -109,7 +109,7 @@ QString DPAdds::toolTipImage(const int desktop) QStringList windowList; for (int i=0; i
  • ") + windowList.join(QString("
  • ")) + QString("
    • "); + return QString("
    • %1
    ").arg(windowList.join(QString("
  • "))); } // init QGraphicsScene *toolTipScene = new QGraphicsScene(); @@ -188,7 +188,7 @@ QString DPAdds::parsePattern(const QString pattern, const int desktop) QStringList keys = dictKeys(); parsed.replace(QString("$$"), QString("$\\$\\")); for (int i=0; i panels = getPanels(); +// QList panels = getPanels(); // for (int i=0; iview()->isVisible(); @@ -384,13 +380,13 @@ void DPAdds::changePanelsState() // KWindowSystem::setOnAllDesktops(winId, true); // } // } - panels.clear(); +// panels.clear(); } void DPAdds::sendNotification(const QString eventId, const QString message) { - KNotification *notification = KNotification::event(eventId, QString("Desktop Panel ::: ") + eventId, message); + KNotification *notification = KNotification::event(eventId, QString("Desktop Panel ::: %1").arg(eventId), message); notification->setComponentName(QString("plasma-applet-org.kde.plasma.desktop-panel")); } diff --git a/sources/desktop-panel-kf5/plugin/dpadds.h b/sources/desktop-panel-kf5/plugin/dpadds.h index 1a5f7e0..bb87b58 100644 --- a/sources/desktop-panel-kf5/plugin/dpadds.h +++ b/sources/desktop-panel-kf5/plugin/dpadds.h @@ -43,7 +43,7 @@ class DPAdds : public QObject } DesktopWindowsInfo; public: - DPAdds(QObject *parent = 0); + DPAdds(QObject *parent = nullptr); ~DPAdds(); Q_INVOKABLE bool isDebugEnabled(); diff --git a/sources/desktop-panel-kf5/plugin/qmldir b/sources/desktop-panel-kf5/plugin/qmldir index b49440a..312f4a7 100644 --- a/sources/desktop-panel-kf5/plugin/qmldir +++ b/sources/desktop-panel-kf5/plugin/qmldir @@ -1,3 +1,3 @@ -module org.kde.plasma.private.desktoppanel +module org.kde.plasma.desktoppanel plugin dpplugin diff --git a/sources/extsysmon/extquotes.cpp b/sources/extsysmon/extquotes.cpp index 32846f2..ac37d85 100644 --- a/sources/extsysmon/extquotes.cpp +++ b/sources/extsysmon/extquotes.cpp @@ -206,7 +206,7 @@ void ExtQuotes::readConfiguration() for (int i=m_dirs.count()-1; i>=0; i--) { if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue; - QSettings settings(m_dirs[i] + QDir::separator() + m_fileName, QSettings::IniFormat); + QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat); settings.beginGroup(QString("Desktop Entry")); setName(settings.value(QString("Name"), m_name).toString()); @@ -277,18 +277,18 @@ int ExtQuotes::showConfiguration() } -int ExtQuotes::tryDelete() +bool ExtQuotes::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; i run(); int showConfiguration(); - int tryDelete(); + bool tryDelete(); void writeConfiguration(); private slots: diff --git a/sources/extsysmon/extscript.cpp b/sources/extsysmon/extscript.cpp index 1d8446d..75b00ec 100644 --- a/sources/extsysmon/extscript.cpp +++ b/sources/extsysmon/extscript.cpp @@ -285,7 +285,7 @@ void ExtScript::readConfiguration() for (int i=m_dirs.count()-1; i>=0; i--) { if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue; - QSettings settings(m_dirs[i] + QDir::separator() + m_fileName, QSettings::IniFormat); + QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat); settings.beginGroup(QString("Desktop Entry")); setName(settings.value(QString("Name"), m_name).toString()); @@ -329,8 +329,8 @@ QString ExtScript::run() if (process.exitCode != 0) if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; - QString info = QString::number(process.exitCode) + QString(":") + - QTextCodec::codecForMib(106)->toUnicode(process.error).trimmed(); + QString info = QString("%1 : %2").arg(process.exitCode) + .arg(QTextCodec::codecForMib(106)->toUnicode(process.error).trimmed()); QString qoutput = QTextCodec::codecForMib(106)->toUnicode(process.output).trimmed(); switch (m_redirect) { case stdout2stderr: @@ -338,7 +338,7 @@ QString ExtScript::run() if (debug) qDebug() << PDEBUG << ":" << "Output" << qoutput; break; case stderr2stdout: - value = info + QString("\t") + qoutput; + value = QString("%1\t%2").arg(info).arg(qoutput); break; default: if (debug) qDebug() << PDEBUG << ":" << "Debug" << info; @@ -393,18 +393,18 @@ int ExtScript::showConfiguration() } -int ExtScript::tryDelete() +bool ExtScript::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; icall(QDBus::BlockWithGui, QString("ListNames")); - if (listServices.arguments().count() == 0) return QString(); + if (listServices.arguments().isEmpty()) return QString(); QStringList arguments = listServices.arguments()[0].toStringList(); for (int i=0; ifindDirs("data", "awesomewidgets/quotes"); #else - localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - QString("/awesomewidgets/quotes"); + localDir = QString("%1/awesomewidgets/quotes") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir localDirectory; if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; @@ -175,8 +175,8 @@ void ExtendedSysMon::initScripts() dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts"); #else - localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - QString("/awesomewidgets/scripts"); + localDir = QString("%1/awesomewidgets/scripts") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir localDirectory; if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; @@ -214,8 +214,8 @@ void ExtendedSysMon::initUpgrade() dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade"); #else - localDir = QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation) + - QString("/awesomewidgets/upgrade"); + localDir = QString("%1/awesomewidgets/upgrade") + .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)); QDir localDirectory; if ((!localDirectory.exists(localDir)) && (localDirectory.mkpath(localDir))) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; @@ -356,9 +356,9 @@ QMap ExtendedSysMon::getBattery(const QString acpiPath) if (allDevices[i].contains(batRegexp)) batDevices.append(allDevices[i]); for (int i=0; i getPlayerInfo(const QString playerName, - const QString mpdAddress = 0, - const QString mpdPort = 0, - const QString mpris = 0); - QMap getPlayerMpdInfo(const QString mpdAddress = 0, - const QString mpdPort = 0); - QMap getPlayerMprisInfo(const QString mpris = 0); + const QString mpdAddress = QString(), + const QString mpdPort = QString(), + const QString mpris = QString()); + QMap getPlayerMpdInfo(const QString mpdAddress = QString(), + const QString mpdPort = QString()); + QMap getPlayerMprisInfo(const QString mpris = QString()); QMap getPsStats(); protected: diff --git a/sources/extsysmon/extupgrade.cpp b/sources/extsysmon/extupgrade.cpp index 997e502..b76f767 100644 --- a/sources/extsysmon/extupgrade.cpp +++ b/sources/extsysmon/extupgrade.cpp @@ -216,7 +216,7 @@ void ExtUpgrade::readConfiguration() for (int i=m_dirs.count()-1; i>=0; i--) { if (!QDir(m_dirs[i]).entryList(QDir::Files).contains(m_fileName)) continue; - QSettings settings(m_dirs[i] + QDir::separator() + m_fileName, QSettings::IniFormat); + QSettings settings(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName), QSettings::IniFormat); settings.beginGroup(QString("Desktop Entry")); setName(settings.value(QString("Name"), m_name).toString()); @@ -245,7 +245,7 @@ int ExtUpgrade::run() if (!m_active) return value; if (times == 1) { - TaskResult process = runTask(QString("bash -c \"") + m_executable + QString("\"")); + TaskResult process = runTask(QString("bash -c \"%1\"").arg(m_executable)); if (debug) qDebug() << PDEBUG << ":" << "Cmd returns" << process.exitCode; if (process.exitCode != 0) if (debug) qDebug() << PDEBUG << ":" << "Error" << process.error; @@ -293,18 +293,18 @@ int ExtUpgrade::showConfiguration() } -int ExtUpgrade::tryDelete() +bool ExtUpgrade::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; i