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

some part of refactoring

Browse Source 
move plugin from private
fix translation issue (#50)
This commit is contained in:
arcan1s 2015-05-12 00:19:08 +03:00
parent daa362fc16
commit c6cadba4b6
41 changed files with 166 additions and 147 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sources/CMakeLists.txt
View File

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

6
sources/awesome-widget-kde4/configuration.cpp
View File

@ -795,7 +795,7 @@ void AwesomeWidget::contextMenuBars(const QPoint pos)
for (int i=0; i<graphicalItems.count(); i++) {
if (graphicalItems[i]->fileName() != 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;
}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

20
sources/awesome-widget-kf5/plugin/CMakeLists.txt
View File

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

2
sources/awesome-widget-kf5/plugin/awactions.cpp
View File

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

7
sources/awesome-widget-kf5/plugin/awactions.h
View File

@ -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<QString, QVariant> getFont(const QMap<QString, QVariant> defaultFont);
// dataengine
Q_INVOKABLE QMap<QString, QVariant> readDataEngineConfiguration();
Q_INVOKABLE void writeDataEngineConfiguration(const QMap<QString, QVariant> 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);

2
sources/awesome-widget-kf5/plugin/awesomewidget.cpp
View File

@ -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<AWActions>(uri, 1, 0, "AWActions", awactions_singletontype_provider);
qmlRegisterSingletonType<AWKeys>(uri, 1, 0, "AWKeys", awkeys_singletontype_provider);

2
sources/awesome-widget-kf5/plugin/awesomewidget.h
View File

@ -22,8 +22,6 @@
#include <QQmlExtensionPlugin>
class QQmlEngine;
class AWPlugin : public QQmlExtensionPlugin
{
Q_OBJECT

57
sources/awesome-widget-kf5/plugin/awkeys.cpp
View File

@ -135,10 +135,10 @@ QString AWKeys::parsePattern()
QString parsed = pattern;
parsed.replace(QString("$$"), QString("$\\$\\"));
for (int i=0; i<foundKeys.count(); i++)
parsed.replace(QString("$") + foundKeys[i], valueByKey(foundKeys[i]));
parsed.replace(QString("$%1").arg(foundKeys[i]), valueByKey(foundKeys[i]));
parsed.replace(QString(" "), QString("&nbsp;"));
for (int i=0; i<foundBars.count(); i++)
parsed.replace(QString("$") + foundBars[i], getItemByTag(foundBars[i])->image(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; i<graphicalItems.count(); i++)
graphicalItemsKeys.append(graphicalItems[i]->name() + 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; i<extScripts.count(); i++) {
if (extScripts[i]->tag() != 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; i<extUpgrade.count(); i++) {
if (extUpgrade[i]->tag() != 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; i<extQuotes.count(); i++) {
if (extQuotes[i]->number() != 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; i<extQuotes.count(); i++) {
if (extQuotes[i]->fileName() != 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; i<extScripts.count(); i++) {
if (extScripts[i]->fileName() != 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; i<extUpgrade.count(); i++) {
if (extUpgrade[i]->fileName() != 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; i<graphicalItems.count(); i++) {
if (graphicalItems[i]->fileName() != 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<keys.count(); i++) {
if (keys[i].startsWith(QString("bar"))) continue;
if (pattern.contains(QString("$") + keys[i])) {
if (pattern.contains(QString("$%1").arg(keys[i]))) {
if (debug) qDebug() << PDEBUG << ":" << "Found key" << keys[i];
selectedKeys.append(keys[i]);
}
@ -1339,8 +1348,8 @@ QList<ExtQuotes *> AWKeys::getExtQuotes()
QList<ExtQuotes *> 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<ExtScript *> AWKeys::getExtScripts()
QList<ExtScript *> 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<ExtUpgrade *> AWKeys::getExtUpgrade()
QList<ExtUpgrade *> 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<GraphicalItem *> AWKeys::getGraphicalItems()
QList<GraphicalItem *> 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;

2
sources/awesome-widget-kf5/plugin/awkeys.h
View File

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

2
sources/awesome-widget-kf5/plugin/awtooltip.cpp
View File

@ -104,7 +104,7 @@ QPixmap AWToolTip::image()
float normX = 100.0 / static_cast<float>(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<data[requiredKeys[i]].count()-1; j++) {

2
sources/awesome-widget-kf5/plugin/awtooltip.h
View File

@ -32,7 +32,7 @@ class AWToolTip : public QObject
Q_OBJECT
public:
AWToolTip(QObject *parent = 0,
AWToolTip(QObject *parent = nullptr,
QMap<QString, QVariant> settings = QMap<QString, QVariant>());
~AWToolTip();

16
sources/awesome-widget-kf5/plugin/graphicalitem.cpp
View File

@ -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; i<m_dirs.count(); i++)
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << m_dirs[i] + QDir::separator() + m_fileName <<
QFile::remove(m_dirs[i] + QDir::separator() + m_fileName);
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
// check if exists
for (int i=0; i<m_dirs.count(); i++)
if (QFile::exists(m_dirs[i] + QDir::separator() + m_fileName)) return 0;
return 1;
if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
return true;
}
@ -468,7 +468,7 @@ void GraphicalItem::writeConfiguration()
{
if (debug) qDebug() << PDEBUG;
QSettings settings(m_dirs[0] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));
@ -493,7 +493,7 @@ void GraphicalItem::changeColor()
{
if (debug) qDebug() << PDEBUG;
QColor color = stringToColor(((QPushButton *)sender())->text());
QColor color = stringToColor((dynamic_cast<QPushButton *>(sender()))->text());
QColor newColor = QColorDialog::getColor(color, 0, i18n("Select color"),
QColorDialog::ShowAlphaChannel);
if (!newColor.isValid()) return;

4
sources/awesome-widget-kf5/plugin/graphicalitem.h
View File

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

2
sources/awesome-widget-kf5/plugin/qmldir
View File

@ -1,3 +1,3 @@
module org.kde.plasma.private.awesomewidget
module org.kde.plasma.awesomewidget
plugin awplugin

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

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

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

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

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

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

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

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

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

@ -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<repeater.count; i++) {
if (!repeater.itemAt(i)) {
if (debug) console.log("[main::onNeedUpdate] : Nothing to do here " + i)
@ -124,12 +125,9 @@ Item {
repeater.itemAt(i).font.weight = general.fontWeight[plasmoid.configuration.fontWeight]
}
repeater.itemAt(i).update()
newHeight += plasmoid.configuration.height == 0 ? repeater.itemAt(i).contentHeight : plasmoid.configuration.height / repeater.count
newWidth += plasmoid.configuration.width == 0 ? repeater.itemAt(i).contentWidth : plasmoid.configuration.width / repeater.count
}
Layout.minimumHeight = newHeight
Layout.minimumWidth = newWidth
if (!initializated) sizeUpdate()
needTooltipUpdate()
}
@ -141,6 +139,19 @@ Item {
}
}
onSizeUpdate: {
if (debug) console.log("[main::onSizeUpdate]")
var newHeight = 0
var newWidth = 0
for (var i=0; i<repeater.count; i++) {
newHeight += plasmoid.configuration.height == 0 ? repeater.itemAt(i).contentHeight : plasmoid.configuration.height / repeater.count
newWidth += plasmoid.configuration.width == 0 ? repeater.itemAt(i).contentWidth : plasmoid.configuration.width / repeater.count
}
Layout.minimumHeight = newHeight
Layout.minimumWidth = newWidth
}
Plasmoid.onActivated: {
if (debug) console.log("[main::onActivated]")
@ -150,10 +161,13 @@ Item {
Plasmoid.onUserConfiguringChanged: {
if (debug) console.log("[main::onUserConfiguringChanged]")
initializated = false
DPAdds.setMark(plasmoid.configuration.mark)
DPAdds.setPanelsToControl(plasmoid.configuration.panels)
DPAdds.setToolTipData(tooltipSettings)
needUpdate()
initializated = true
}
Component.onCompleted: {

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

@ -18,7 +18,7 @@
import QtQuick 2.0
import QtQuick.Controls 1.3 as QtControls
import org.kde.plasma.private.desktoppanel 1.0
import org.kde.plasma.desktoppanel 1.0
Item {

8
sources/desktop-panel-kf5/plugin/CMakeLists.txt
View File

@ -1,4 +1,5 @@
set (PLUGIN_NAME dpplugin)
add_definitions(-DTRANSLATION_DOMAIN=\"plasma_applet_org.kde.plasma.desktoppanel\")
add_definitions (${Qt5Core_DEFINITIONS})
set (Qt_INCLUDE ${Qt5Core_INCLUDE_DIRS}
@ -21,13 +22,12 @@ include_directories (${CMAKE_SOURCE_DIR}
${Qt_INCLUDE}
${Kf5_INCLUDE})
file (GLOB SUBPROJECT_SOURCE *.cpp)
file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
file (GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp)
file (GLOB SUBPROJECT_NOTIFY *.notifyrc)
add_library (${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})
target_link_libraries (${PLUGIN_NAME} ${Qt_LIBRARIES} ${Kf5_LIBRARIES})
install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel)
install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/private/desktoppanel)
install (TARGETS ${PLUGIN_NAME} DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/desktoppanel)
install (FILES qmldir DESTINATION ${QML_INSTALL_DIR}/org/kde/plasma/desktoppanel)
install (FILES ${SUBPROJECT_NOTIFY} DESTINATION ${KNOTIFYRC_INSTALL_DIR})

2
sources/desktop-panel-kf5/plugin/desktoppanel.cpp
View File

@ -33,7 +33,7 @@ static QObject *dpadds_singletontype_provider(QQmlEngine *engine, QJSEngine *scr
void DPPlugin::registerTypes(const char *uri)
{
Q_ASSERT(uri == QLatin1String("org.kde.plasma.private.desktoppanel"));
Q_ASSERT(uri == QLatin1String("org.kde.plasma.desktoppanel"));
qmlRegisterSingletonType<DPAdds>(uri, 1, 0, "DPAdds", dpadds_singletontype_provider);
}

2
sources/desktop-panel-kf5/plugin/desktoppanel.h
View File

@ -22,8 +22,6 @@
#include <QQmlExtensionPlugin>
class QQmlEngine;
class DPPlugin : public QQmlExtensionPlugin
{
Q_OBJECT

18
sources/desktop-panel-kf5/plugin/dpadds.cpp
View File

@ -109,7 +109,7 @@ QString DPAdds::toolTipImage(const int desktop)
QStringList windowList;
for (int i=0; i<info.windowsData.count(); i++)
windowList.append(info.windowsData[i].name);
return QString("<ul><li>") + windowList.join(QString("</li><li>")) + QString("</li></ul>");
return QString("<ul><li>%1</li></ul>").arg(windowList.join(QString("</li><li>")));
}
// 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<keys.count(); i++)
parsed.replace(QString("$") + keys[i], valueByKey(keys[i], desktop));
parsed.replace(QString("$%1").arg(keys[i]), valueByKey(keys[i], desktop));
parsed.replace(QString(" "), QString("&nbsp;"));
parsed.replace(QString("$\\$\\"), QString("$$"));
@ -238,11 +238,7 @@ QString DPAdds::valueByKey(const QString key, int desktop)
if (debug) qDebug() << PDEBUG << ":" << "Requested key" << key;
if (desktop == -1) desktop = currentDesktop();
QString currentMark;
if (currentDesktop() == desktop)
currentMark = mark;
else
currentMark = QString("");
QString currentMark = currentDesktop() == desktop ? mark : QString("");
if (key == QString("mark"))
return QString("%1").arg(currentMark, mark.count(), QLatin1Char(' '));
else if (key == QString("name"))
@ -261,7 +257,7 @@ QString DPAdds::editPanelsToContol(const QString current)
if (debug) qDebug() << PDEBUG;
// paint
QDialog *dialog = new QDialog(0);
QDialog *dialog = new QDialog(nullptr);
QListWidget *widget = new QListWidget(dialog);
QDialogButtonBox *buttons = new QDialogButtonBox(QDialogButtonBox::Open | QDialogButtonBox::Close,
Qt::Vertical, dialog);
@ -366,7 +362,7 @@ void DPAdds::changePanelsState()
if (debug) qDebug() << PDEBUG;
if (panelsToControl.isEmpty()) return;
QList<Plasma::Containment *> panels = getPanels();
// QList<Plasma::Containment *> panels = getPanels();
// for (int i=0; i<panels.count(); i++) {
// if (!panelsToControl.contains(i)) continue;
// bool wasVisible = panels[i]->view()->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"));
}

2
sources/desktop-panel-kf5/plugin/dpadds.h
View File

@ -43,7 +43,7 @@ class DPAdds : public QObject
} DesktopWindowsInfo;
public:
DPAdds(QObject *parent = 0);
DPAdds(QObject *parent = nullptr);
~DPAdds();
Q_INVOKABLE bool isDebugEnabled();

2
sources/desktop-panel-kf5/plugin/qmldir
View File

@ -1,3 +1,3 @@
module org.kde.plasma.private.desktoppanel
module org.kde.plasma.desktoppanel
plugin dpplugin

14
sources/extsysmon/extquotes.cpp
View File

@ -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<m_dirs.count(); i++)
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << m_dirs[i] + QDir::separator() + m_fileName <<
QFile::remove(m_dirs[i] + QDir::separator() + m_fileName);
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
// check if exists
for (int i=0; i<m_dirs.count(); i++)
if (QFile::exists(m_dirs[i] + QDir::separator() + m_fileName)) return 0;
return 1;
if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
return true;
}
@ -296,7 +296,7 @@ void ExtQuotes::writeConfiguration()
{
if (debug) qDebug() << PDEBUG;
QSettings settings(m_dirs[0] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));

4
sources/extsysmon/extquotes.h
View File

@ -42,7 +42,7 @@ class ExtQuotes : public QDialog
Q_PROPERTY(QString ticker READ ticker WRITE setTicker)
public:
explicit ExtQuotes(QWidget *parent = 0, const QString quotesName = QString(),
explicit ExtQuotes(QWidget *parent = nullptr, const QString quotesName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
~ExtQuotes();
// get methods
@ -68,7 +68,7 @@ public slots:
void readConfiguration();
QMap<QString, float> run();
int showConfiguration();
int tryDelete();
bool tryDelete();
void writeConfiguration();
private slots:

20
sources/extsysmon/extscript.cpp
View File

@ -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; i<m_dirs.count(); i++)
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << m_dirs[i] + QDir::separator() + m_fileName <<
QFile::remove(m_dirs[i] + QDir::separator() + m_fileName);
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
// check if exists
for (int i=0; i<m_dirs.count(); i++)
if (QFile::exists(m_dirs[i] + QDir::separator() + m_fileName)) return 0;
return 1;
if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
return true;
}
@ -412,7 +412,7 @@ void ExtScript::writeConfiguration()
{
if (debug) qDebug() << PDEBUG;
QSettings settings(m_dirs[0] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));

4
sources/extsysmon/extscript.h
View File

@ -46,7 +46,7 @@ public:
stderr2stdout
};
explicit ExtScript(QWidget *parent = 0, const QString scriptName = QString(),
explicit ExtScript(QWidget *parent = nullptr, const QString scriptName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
~ExtScript();
// get methods
@ -80,7 +80,7 @@ public slots:
void readConfiguration();
QString run();
int showConfiguration();
int tryDelete();
bool tryDelete();
void writeConfiguration();
private:

20
sources/extsysmon/extsysmon.cpp
View File

@ -76,7 +76,7 @@ QString ExtendedSysMon::getAllHdd()
QStringList allDevices = QDir(QString("/dev")).entryList(QDir::System, QDir::Name);
QStringList devices = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$")));
for (int i=0; i<devices.count(); i++)
devices[i] = QString("/dev/") + devices[i];
devices[i] = QString("/dev/%1").arg(devices[i]);
if (debug) qDebug() << PDEBUG << ":" << "Device list" << devices;
return devices.join(QChar(','));
@ -107,7 +107,7 @@ QString ExtendedSysMon::getAutoMpris()
if (debug) qDebug() << PDEBUG;
QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(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; i<arguments.count(); i++) {
@ -136,8 +136,8 @@ void ExtendedSysMon::initQuotes()
dirs = KGlobal::dirs()->findDirs("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<QString, QVariant> ExtendedSysMon::getBattery(const QString acpiPath)
if (allDevices[i].contains(batRegexp))
batDevices.append(allDevices[i]);
for (int i=0; i<batDevices.count(); i++) {
QFile batFile(acpiPath + QString("/") + batDevices[i] + QString("/capacity"));
QFile batFile(QString("%1/%2/capacity").arg(acpiPath).arg(batDevices[i]));
if (batFile.open(QIODevice::ReadOnly))
battery[QString("bat") + QString::number(i)] = QString(batFile.readLine()).trimmed().toInt();
battery[QString("bat%1").arg(i)] = QString(batFile.readLine()).trimmed().toInt();
batFile.close();
}
float number = 0.0;

12
sources/extsysmon/extsysmon.h
View File

@ -40,12 +40,12 @@ public:
float getHddTemp(const QString cmd, const QString device);
QString getNetworkDevice();
QMap<QString, QVariant> getPlayerInfo(const QString playerName,
const QString mpdAddress = 0,
const QString mpdPort = 0,
const QString mpris = 0);
QMap<QString, QVariant> getPlayerMpdInfo(const QString mpdAddress = 0,
const QString mpdPort = 0);
QMap<QString, QVariant> getPlayerMprisInfo(const QString mpris = 0);
const QString mpdAddress = QString(),
const QString mpdPort = QString(),
const QString mpris = QString());
QMap<QString, QVariant> getPlayerMpdInfo(const QString mpdAddress = QString(),
const QString mpdPort = QString());
QMap<QString, QVariant> getPlayerMprisInfo(const QString mpris = QString());
QMap<QString, QVariant> getPsStats();
protected:

16
sources/extsysmon/extupgrade.cpp
View File

@ -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<m_dirs.count(); i++)
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << m_dirs[i] + QDir::separator() + m_fileName <<
QFile::remove(m_dirs[i] + QDir::separator() + m_fileName);
if (debug) qDebug() << PDEBUG << ":" << "Remove file" << QString("%1/%2").arg(m_dirs[i]).arg(m_fileName) <<
QFile::remove(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName));
// check if exists
for (int i=0; i<m_dirs.count(); i++)
if (QFile::exists(m_dirs[i] + QDir::separator() + m_fileName)) return 0;
return 1;
if (QFile::exists(QString("%1/%2").arg(m_dirs[i]).arg(m_fileName))) return false;
return true;
}
@ -312,7 +312,7 @@ void ExtUpgrade::writeConfiguration()
{
if (debug) qDebug() << PDEBUG;
QSettings settings(m_dirs[0] + QDir::separator() + m_fileName, QSettings::IniFormat);
QSettings settings(QString("%1/%2").arg(m_dirs[0]).arg(m_fileName), QSettings::IniFormat);
if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName();
settings.beginGroup(QString("Desktop Entry"));

4
sources/extsysmon/extupgrade.h
View File

@ -38,7 +38,7 @@ class ExtUpgrade : public QDialog
Q_PROPERTY(int interval READ interval WRITE setInterval)
public:
explicit ExtUpgrade(QWidget *parent = 0, const QString upgradeName = QString(),
explicit ExtUpgrade(QWidget *parent = nullptr, const QString upgradeName = QString(),
const QStringList directories = QStringList(), const bool debugCmd = false);
~ExtUpgrade();
// get methods
@ -66,7 +66,7 @@ public slots:
void readConfiguration();
int run();
int showConfiguration();
int tryDelete();
bool tryDelete();
void writeConfiguration();
private: