From 3bd73d04588401aedcbd953de0afc604c437d2c1 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 12 Feb 2015 02:57:05 +0300 Subject: [PATCH] fix cppcheck warnings improvements of interaction with items --- arch/PKGBUILD-kde4 | 2 +- arch/PKGBUILD-kf5 | 2 +- sources/awesome-widget-kde4/awesome-widget.h | 3 +- sources/awesome-widget-kde4/configuration.cpp | 142 +++++++++++++++--- sources/awesome-widget-kde4/customlabel.h | 2 +- sources/awesome-widget-kde4/deinteraction.cpp | 2 +- sources/awesome-widget-kde4/graphicalitem.cpp | 12 +- sources/awesome-widget-kde4/graphicalitem.h | 4 +- .../awesome-widget-kf5/plugin/awactions.cpp | 1 + sources/awesome-widget-kf5/plugin/awkeys.cpp | 70 +++++++-- .../awesome-widget-kf5/plugin/awtooltip.cpp | 7 +- .../plugin/graphicalitem.cpp | 12 +- .../awesome-widget-kf5/plugin/graphicalitem.h | 4 +- sources/desktop-panel-kde4/desktop-panel.h | 8 +- sources/extsysmon/extscript.cpp | 12 +- sources/extsysmon/extscript.h | 4 +- sources/extsysmon/extsysmon.cpp | 8 +- sources/extsysmon/extupgrade.cpp | 12 +- sources/extsysmon/extupgrade.h | 4 +- 19 files changed, 237 insertions(+), 74 deletions(-) diff --git a/arch/PKGBUILD-kde4 b/arch/PKGBUILD-kde4 index 1619dcb..e78a170 100644 --- a/arch/PKGBUILD-kde4 +++ b/arch/PKGBUILD-kde4 @@ -20,7 +20,7 @@ optdepends=("amarok: for music player monitor" makedepends=('automoc4' 'cmake') source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('25e1598b2d939b927428a219bae7c187') +md5sums=('b9e77735ca866164395b2b9d4124e0ac') backup=('usr/share/config/plasma-dataengine-extsysmon.conf') prepare() { diff --git a/arch/PKGBUILD-kf5 b/arch/PKGBUILD-kf5 index dfcb650..c3dfe19 100644 --- a/arch/PKGBUILD-kf5 +++ b/arch/PKGBUILD-kf5 @@ -20,7 +20,7 @@ optdepends=("amarok: for music player monitor" makedepends=('cmake' 'extra-cmake-modules') source=(https://github.com/arcan1s/awesome-widgets/releases/download/V.${pkgver}/${_pkgname}-${pkgver}-src.tar.xz) install=${pkgname}.install -md5sums=('25e1598b2d939b927428a219bae7c187') +md5sums=('b9e77735ca866164395b2b9d4124e0ac') backup=('etc/xdg/plasma-dataengine-extsysmon.conf') prepare() { diff --git a/sources/awesome-widget-kde4/awesome-widget.h b/sources/awesome-widget-kde4/awesome-widget.h index 7cabbc6..57d69ae 100644 --- a/sources/awesome-widget-kde4/awesome-widget.h +++ b/sources/awesome-widget-kde4/awesome-widget.h @@ -87,6 +87,7 @@ private slots: void contextMenuPkgCommand(const QPoint pos); void copyBar(const QString original); void copyCustomCommand(const QString original); + void copyPkgCommand(const QString original); void editBar(QListWidgetItem *item); void editCustomCommand(QListWidgetItem *item); void editPkgCommand(QListWidgetItem *item); @@ -125,7 +126,7 @@ private: QGraphicsScene *toolTipScene = nullptr; QGraphicsView *toolTipView = nullptr; // values - int networkDeviceUpdate; + int networkDeviceUpdate = 0; QMap counts; QMap> tooltipValues; QMap values; diff --git a/sources/awesome-widget-kde4/configuration.cpp b/sources/awesome-widget-kde4/configuration.cpp index c47e7c1..67cc1a3 100644 --- a/sources/awesome-widget-kde4/configuration.cpp +++ b/sources/awesome-widget-kde4/configuration.cpp @@ -547,7 +547,6 @@ void AwesomeWidget::configAccepted() deSettings[QString("MPDADDRESS")] = uiDEConfig.lineEdit_mpdaddress->text(); deSettings[QString("MPDPORT")] = QString::number(uiDEConfig.spinBox_mpdport->value()); deSettings[QString("MPRIS")] = uiDEConfig.comboBox_mpris->currentText(); - deSettings[QString("PKGNULL")] = items.join(QChar(',')); deSettings[QString("PLAYER")] = uiDEConfig.comboBox_playerSelect->currentText(); writeDataEngineConfiguration(deSettings); } @@ -708,7 +707,17 @@ void AwesomeWidget::addBar() GraphicalItem *item = new GraphicalItem(0, name, dirs, debug); item->setName(QString("bar%1").arg(number)); - item->showConfiguration(bars); + if (item->showConfiguration(bars) == 1) { + getGraphicalItems(); + QListWidgetItem *widgetItem = new QListWidgetItem(item->fileName()); + QStringList tooltip; + tooltip.append(i18n("Tag: %1", item->name() + item->bar())); + tooltip.append(i18n("Comment: %1", item->comment())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + uiAdvancedConfig.listWidget_bars->addItem(widgetItem); + uiAdvancedConfig.listWidget_bars->sortItems(); + } + delete item; } @@ -716,7 +725,7 @@ void AwesomeWidget::addCustomScript() { if (debug) qDebug() << PDEBUG; - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/scripts"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts"); bool ok; QString name = QInputDialog::getText(0, i18n("Enter file name"), i18n("File name"), QLineEdit::Normal, @@ -726,7 +735,17 @@ void AwesomeWidget::addCustomScript() ExtScript *script = new ExtScript(0, name, dirs, debug); - script->showConfiguration(); + if (script->showConfiguration() == 1) { + QListWidgetItem *widgetItem = new QListWidgetItem(script->fileName()); + QStringList tooltip; + tooltip.append(i18n("Name: %1", script->name())); + tooltip.append(i18n("Comment: %1", script->comment())); + tooltip.append(i18n("Exec: %1", script->executable())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + uiDEConfig.listWidget_custom->addItem(widgetItem); + uiDEConfig.listWidget_custom->sortItems(); + } + delete script; } @@ -734,7 +753,7 @@ void AwesomeWidget::addPkgCommand() { if (debug) qDebug() << PDEBUG; - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/upgrade"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade"); bool ok; QString name = QInputDialog::getText(0, i18n("Enter file name"), i18n("File name"), QLineEdit::Normal, @@ -744,7 +763,17 @@ void AwesomeWidget::addPkgCommand() ExtUpgrade *upgrade = new ExtUpgrade(0, name, dirs, debug); - upgrade->showConfiguration(); + if (upgrade->showConfiguration() == 1) { + QListWidgetItem *widgetItem = new QListWidgetItem(upgrade->fileName()); + QStringList tooltip; + tooltip.append(i18n("Name: %1", upgrade->name())); + tooltip.append(i18n("Comment: %1", upgrade->comment())); + tooltip.append(i18n("Exec: %1", upgrade->executable())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + uiDEConfig.listWidget_pkgCommand->addItem(widgetItem); + uiDEConfig.listWidget_pkgCommand->sortItems(); + } + delete upgrade; } @@ -766,9 +795,10 @@ void AwesomeWidget::contextMenuBars(const QPoint pos) for (int i=0; ifileName() != uiAdvancedConfig.listWidget_bars->currentItem()->text()) continue; - graphicalItems[i]->tryDelete(); - graphicalItems.takeAt(i); - uiAdvancedConfig.listWidget_bars->takeItem(uiAdvancedConfig.listWidget_bars->currentRow()); + if (graphicalItems[i]->tryDelete() == 1) { + graphicalItems.removeAt(i); + uiAdvancedConfig.listWidget_bars->takeItem(uiAdvancedConfig.listWidget_bars->currentRow()); + } break; } } @@ -789,11 +819,11 @@ void AwesomeWidget::contextMenuCustomCommand(const QPoint pos) else if (action == copy) copyCustomCommand(uiDEConfig.listWidget_custom->currentItem()->text()); else if (action == remove) { - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/scripts"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts"); ExtScript *script = new ExtScript(0, uiDEConfig.listWidget_custom->currentItem()->text(), dirs, debug); - script->tryDelete(); + if (script->tryDelete() == 1) + uiDEConfig.listWidget_custom->takeItem(uiDEConfig.listWidget_custom->currentRow()); delete script; - uiDEConfig.listWidget_custom->takeItem(uiDEConfig.listWidget_custom->currentRow()); } } @@ -804,14 +834,20 @@ void AwesomeWidget::contextMenuPkgCommand(const QPoint pos) if (uiDEConfig.listWidget_pkgCommand->currentItem() == 0) return; QMenu menu(uiDEConfig.listWidget_pkgCommand); + QAction *edit = menu.addAction(QIcon::fromTheme("document-edit"), i18n("Edit")); + QAction *copy = menu.addAction(QIcon::fromTheme("edit-copy"), i18n("Copy")); QAction *remove = menu.addAction(QIcon::fromTheme("edit-delete"), i18n("Remove")); QAction *action = menu.exec(uiDEConfig.listWidget_pkgCommand->viewport()->mapToGlobal(pos)); - if (action == remove) { - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/upgrade"); + if (action == edit) + editPkgCommand(uiDEConfig.listWidget_pkgCommand->currentItem()); + else if (action == copy) + copyPkgCommand(uiDEConfig.listWidget_pkgCommand->currentItem()->text()); + else if (action == remove) { + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade"); ExtUpgrade *upgrade = new ExtUpgrade(0, uiDEConfig.listWidget_pkgCommand->currentItem()->text(), dirs, debug); - upgrade->tryDelete(); + if (upgrade->tryDelete() == 1) + uiDEConfig.listWidget_pkgCommand->takeItem(uiDEConfig.listWidget_pkgCommand->currentRow()); delete upgrade; - uiDEConfig.listWidget_pkgCommand->takeItem(uiDEConfig.listWidget_pkgCommand->currentRow()); } } @@ -864,7 +900,16 @@ void AwesomeWidget::copyBar(const QString original) item->setWidth(originalItem->width()); delete originalItem; - item->showConfiguration(bars); + if (item->showConfiguration(bars) == 1) { + getGraphicalItems(); + QListWidgetItem *widgetItem = new QListWidgetItem(item->fileName()); + QStringList tooltip; + tooltip.append(i18n("Tag: %1", item->name() + item->bar())); + tooltip.append(i18n("Comment: %1", item->comment())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + uiAdvancedConfig.listWidget_bars->addItem(widgetItem); + uiAdvancedConfig.listWidget_bars->sortItems(); + } delete item; } @@ -873,7 +918,7 @@ void AwesomeWidget::copyCustomCommand(const QString original) { if (debug) qDebug() << PDEBUG; - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/scripts"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts"); bool ok; QString name = QInputDialog::getText(0, i18n("Enter file name"), i18n("File name"), QLineEdit::Normal, @@ -893,14 +938,59 @@ void AwesomeWidget::copyCustomCommand(const QString original) script->setRedirect(originalScript->redirect()); delete originalScript; - script->showConfiguration(); + if (script->showConfiguration() == 1) { + QListWidgetItem *widgetItem = new QListWidgetItem(script->fileName()); + QStringList tooltip; + tooltip.append(i18n("Name: %1", script->name())); + tooltip.append(i18n("Comment: %1", script->comment())); + tooltip.append(i18n("Exec: %1", script->executable())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + uiDEConfig.listWidget_custom->addItem(widgetItem); + uiDEConfig.listWidget_custom->sortItems(); + } delete script; } +void AwesomeWidget::copyPkgCommand(const QString original) +{ + if (debug) qDebug() << PDEBUG; + + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade"); + bool ok; + QString name = QInputDialog::getText(0, i18n("Enter file name"), + i18n("File name"), QLineEdit::Normal, + QString(""), &ok); + if ((!ok) || (name.isEmpty())) return; + if (!name.endsWith(QString(".desktop"))) name += QString(".desktop"); + + ExtUpgrade *originalUpgrade = new ExtUpgrade(0, original, dirs, debug); + ExtUpgrade *upgrade = new ExtUpgrade(0, name, dirs, debug); + upgrade->setActive(originalUpgrade->isActive()); + upgrade->setComment(originalUpgrade->comment()); + upgrade->setExecutable(originalUpgrade->executable()); + upgrade->setName(originalUpgrade->name()); + upgrade->setNull(originalUpgrade->null()); + delete originalUpgrade; + + if (upgrade->showConfiguration() == 1) { + QListWidgetItem *widgetItem = new QListWidgetItem(upgrade->fileName()); + QStringList tooltip; + tooltip.append(i18n("Name: %1", upgrade->name())); + tooltip.append(i18n("Comment: %1", upgrade->comment())); + tooltip.append(i18n("Exec: %1", upgrade->executable())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + uiDEConfig.listWidget_pkgCommand->addItem(widgetItem); + uiDEConfig.listWidget_pkgCommand->sortItems(); + } + delete upgrade; +} + + void AwesomeWidget::editBar(QListWidgetItem *item) { if (debug) qDebug() << PDEBUG; + if (item == nullptr) return; QStringList bars; bars.append(keys.filter((QRegExp(QString("^cpu(?!cl).*"))))); @@ -921,8 +1011,9 @@ void AwesomeWidget::editBar(QListWidgetItem *item) void AwesomeWidget::editCustomCommand(QListWidgetItem *item) { if (debug) qDebug() << PDEBUG; + if (item == nullptr) return; - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/scripts"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts"); ExtScript *script = new ExtScript(0, item->text(), dirs, debug); script->showConfiguration(); } @@ -931,8 +1022,9 @@ void AwesomeWidget::editCustomCommand(QListWidgetItem *item) void AwesomeWidget::editPkgCommand(QListWidgetItem *item) { if (debug) qDebug() << PDEBUG; + if (item == nullptr) return; - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/upgrade"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade"); ExtUpgrade *upgrade = new ExtUpgrade(0, item->text(), dirs, debug); upgrade->showConfiguration(); } @@ -984,11 +1076,11 @@ QList AwesomeWidget::initScripts() QList externalScripts; // create directory at $HOME - QString localDir = KStandardDirs::locateLocal("data", "plasma_dataengine_extsysmon/scripts"); + QString localDir = KStandardDirs::locateLocal("data", "awesomewidgets/scripts"); if (KStandardDirs::makeDir(localDir)) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/scripts"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/scripts"); QStringList names; for (int i=0; i AwesomeWidget::initUpgrades() QList externalUpgrade; // create directory at $HOME - QString localDir = KStandardDirs::locateLocal("data", "plasma_dataengine_extsysmon/upgrade"); + QString localDir = KStandardDirs::locateLocal("data", "awesomewidgets/upgrade"); if (KStandardDirs::makeDir(localDir)) if (debug) qDebug() << PDEBUG << ":" << "Created directory" << localDir; - QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_dataengine_extsysmon/upgrade"); + QStringList dirs = KGlobal::dirs()->findDirs("data", "awesomewidgets/upgrade"); QStringList names; for (int i=0; i -1) extsysmonEngine->connectSource(QString("pkg"), - this, 60*60*1000, Plasma::AlignToHour); + this, configuration[QString("interval")].toInt()); // player regExp = QRegExp(QString("(album|artist|duration|progress|title)")); if (foundKeys.indexOf(regExp) > -1) diff --git a/sources/awesome-widget-kde4/graphicalitem.cpp b/sources/awesome-widget-kde4/graphicalitem.cpp index a15a0d0..61231a2 100644 --- a/sources/awesome-widget-kde4/graphicalitem.cpp +++ b/sources/awesome-widget-kde4/graphicalitem.cpp @@ -412,7 +412,7 @@ void GraphicalItem::readConfiguration() } -void GraphicalItem::showConfiguration(const QStringList tags) +int GraphicalItem::showConfiguration(const QStringList tags) { if (debug) qDebug() << PDEBUG; @@ -429,7 +429,7 @@ void GraphicalItem::showConfiguration(const QStringList tags) ui->spinBox_width->setValue(m_width); int ret = exec(); - if (ret != 1) return; + if (ret != 1) return ret; setName(ui->label_nameValue->text()); setComment(ui->lineEdit_comment->text()); @@ -443,16 +443,22 @@ void GraphicalItem::showConfiguration(const QStringList tags) setWidth(ui->spinBox_width->value()); writeConfiguration(); + return ret; } -void GraphicalItem::tryDelete() +int GraphicalItem::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; i confi if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName(); settings.beginGroup(QString("Configuration")); + settings.setValue(QString("ACPIPATH"), configuration[QString("ACPIPATH")]); settings.setValue(QString("GPUDEV"), configuration[QString("GPUDEV")]); settings.setValue(QString("HDDDEV"), configuration[QString("HDDDEV")]); settings.setValue(QString("HDDTEMPCMD"), configuration[QString("HDDTEMPCMD")]); diff --git a/sources/awesome-widget-kf5/plugin/awkeys.cpp b/sources/awesome-widget-kf5/plugin/awkeys.cpp index b71d124..8395f35 100644 --- a/sources/awesome-widget-kf5/plugin/awkeys.cpp +++ b/sources/awesome-widget-kf5/plugin/awkeys.cpp @@ -856,21 +856,33 @@ void AWKeys::editItemButtonPressed(QAbstractButton *button) case RequestedExtScript: for (int i=0; ifileName() != current) continue; - extScripts[i]->tryDelete(); + if (extScripts[i]->tryDelete() == 1) { + widgetDialog->takeItem(widgetDialog->row(item)); + extScripts.clear(); + extScripts = getExtScripts(); + } break; } break; case RequestedExtUpgrade: for (int i=0; ifileName() != current) continue; - extUpgrade[i]->tryDelete(); + if (extUpgrade[i]->tryDelete() == 1) { + widgetDialog->takeItem(widgetDialog->row(item)); + extUpgrade.clear(); + extUpgrade = getExtUpgrade(); + } break; } break; case RequestedGraphicalItem: for (int i=0; ifileName() != current) continue; - graphicalItems[i]->tryDelete(); + if (graphicalItems[i]->tryDelete() == 1) { + widgetDialog->takeItem(widgetDialog->row(item)); + graphicalItems.clear(); + graphicalItems = getGraphicalItems(); + } break; } break; @@ -964,7 +976,17 @@ void AWKeys::copyBar(const QString original) item->setWidth(graphicalItems[originalItem]->width()); } - item->showConfiguration(bars); + if (item->showConfiguration(bars) == 1) { + graphicalItems.clear(); + graphicalItems = getGraphicalItems(); + QListWidgetItem *widgetItem = new QListWidgetItem(item->fileName()); + QStringList tooltip; + tooltip.append(i18n("Tag: %1", item->name() + item->bar())); + tooltip.append(i18n("Comment: %1", item->comment())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + widgetDialog->addItem(widgetItem); + widgetDialog->sortItems(); + } delete item; } @@ -1003,7 +1025,18 @@ void AWKeys::copyScript(const QString original) script->setRedirect(extScripts[originalItem]->redirect()); } - script->showConfiguration(); + if (script->showConfiguration() == 1) { + extScripts.clear(); + extScripts = getExtScripts(); + QListWidgetItem *widgetItem = new QListWidgetItem(script->fileName()); + QStringList tooltip; + tooltip.append(i18n("Name: %1", script->name())); + tooltip.append(i18n("Comment: %1", script->comment())); + tooltip.append(i18n("Exec: %1", script->executable())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + widgetDialog->addItem(widgetItem); + widgetDialog->sortItems(); + } delete script; } @@ -1030,17 +1063,28 @@ void AWKeys::copyUpgrade(const QString original) originalItem = i; break; } - ExtUpgrade *uprade = new ExtUpgrade(0, name, dirs, debug); + ExtUpgrade *upgrade = new ExtUpgrade(0, name, dirs, debug); if (originalItem != -1) { - uprade->setActive(extUpgrade[originalItem]->isActive()); - uprade->setComment(extUpgrade[originalItem]->comment()); - uprade->setExecutable(extUpgrade[originalItem]->executable()); - uprade->setName(extUpgrade[originalItem]->name()); - uprade->setNull(extUpgrade[originalItem]->null()); + upgrade->setActive(extUpgrade[originalItem]->isActive()); + upgrade->setComment(extUpgrade[originalItem]->comment()); + upgrade->setExecutable(extUpgrade[originalItem]->executable()); + upgrade->setName(extUpgrade[originalItem]->name()); + upgrade->setNull(extUpgrade[originalItem]->null()); } - uprade->showConfiguration(); - delete uprade; + if (upgrade->showConfiguration() == 1) { + extUpgrade.clear(); + extUpgrade = getExtUpgrade(); + QListWidgetItem *widgetItem = new QListWidgetItem(upgrade->fileName()); + QStringList tooltip; + tooltip.append(i18n("Name: %1", upgrade->name())); + tooltip.append(i18n("Comment: %1", upgrade->comment())); + tooltip.append(i18n("Exec: %1", upgrade->executable())); + widgetItem->setToolTip(tooltip.join(QChar('\n'))); + widgetDialog->addItem(widgetItem); + widgetDialog->sortItems(); + } + delete upgrade; } diff --git a/sources/awesome-widget-kf5/plugin/awtooltip.cpp b/sources/awesome-widget-kf5/plugin/awtooltip.cpp index 42aea01..72bb43b 100644 --- a/sources/awesome-widget-kf5/plugin/awtooltip.cpp +++ b/sources/awesome-widget-kf5/plugin/awtooltip.cpp @@ -100,12 +100,11 @@ QPixmap AWToolTip::image() else toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush)); bool down = false; - bool isBattery = false; for (int i=0; i(data[requiredKeys[i]].count()); float normY = 100.0 / (1.5 * boundaries[requiredKeys[i]]); - isBattery = (requiredKeys[i] == QString("batTooltip")); - if (!isBattery) pen.setColor(QColor(configuration[requiredKeys[i] + QString("Color")].toString())); + if (requiredKeys[i] != QString("batTooltip")) + pen.setColor(QColor(configuration[requiredKeys[i] + QString("Color")].toString())); float shift = i * 100.0; if (down) shift -= 100.0; for (int j=0; j 0) pen.setColor(QColor(configuration[QString("batTooltipColor")].toString())); else diff --git a/sources/awesome-widget-kf5/plugin/graphicalitem.cpp b/sources/awesome-widget-kf5/plugin/graphicalitem.cpp index e44be2a..5c03fa8 100644 --- a/sources/awesome-widget-kf5/plugin/graphicalitem.cpp +++ b/sources/awesome-widget-kf5/plugin/graphicalitem.cpp @@ -414,7 +414,7 @@ void GraphicalItem::readConfiguration() } -void GraphicalItem::showConfiguration(const QStringList tags) +int GraphicalItem::showConfiguration(const QStringList tags) { if (debug) qDebug() << PDEBUG; @@ -431,7 +431,7 @@ void GraphicalItem::showConfiguration(const QStringList tags) ui->spinBox_width->setValue(m_width); int ret = exec(); - if (ret != 1) return; + if (ret != 1) return ret; setName(ui->label_nameValue->text()); setComment(ui->lineEdit_comment->text()); @@ -445,16 +445,22 @@ void GraphicalItem::showConfiguration(const QStringList tags) setWidth(ui->spinBox_width->value()); writeConfiguration(); + return ret; } -void GraphicalItem::tryDelete() +int GraphicalItem::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; i getPanels(); QString panelLocationToStr(Plasma::Location loc); // ui - QGraphicsGridLayout *layout; + QGraphicsGridLayout *layout = nullptr; QList proxyWidgets; QList labels; // tooltip Plasma::ToolTipContent toolTip; - QGraphicsScene *toolTipScene; - QGraphicsView *toolTipView; + QGraphicsScene *toolTipScene = nullptr; + QGraphicsView *toolTipView = nullptr; // debug bool debug; int activeTooltip = -1; - int oldState; + int oldState = 0; // configuration interface Ui::AppearanceWidget uiAppConfig; Ui::ConfigWindow uiWidConfig; diff --git a/sources/extsysmon/extscript.cpp b/sources/extsysmon/extscript.cpp index 5922bbd..b8504d5 100644 --- a/sources/extsysmon/extscript.cpp +++ b/sources/extsysmon/extscript.cpp @@ -316,7 +316,7 @@ ExtScript::ScriptData ExtScript::run(const int time) } -void ExtScript::showConfiguration() +int ExtScript::showConfiguration() { if (debug) qDebug() << PDEBUG; @@ -336,7 +336,7 @@ void ExtScript::showConfiguration() ui->spinBox_interval->setValue(m_interval); int ret = exec(); - if (ret != 1) return; + if (ret != 1) return ret; setName(ui->lineEdit_name->text()); setComment(ui->lineEdit_comment->text()); setApiVersion(AWESAPI); @@ -348,16 +348,22 @@ void ExtScript::showConfiguration() setInterval(ui->spinBox_interval->value()); writeConfiguration(); + return ret; } -void ExtScript::tryDelete() +int ExtScript::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; icall(QDBus::BlockWithGui, QString("ListNames")); - QList arguments = listServices.arguments(); + if (listServices.arguments().count() == 0) return QString(); + QStringList arguments = listServices.arguments()[0].toStringList(); for (int i=0; ispinBox_null->setValue(m_null); int ret = exec(); - if (ret != 1) return; + if (ret != 1) return ret; setName(ui->lineEdit_name->text()); setComment(ui->lineEdit_comment->text()); setApiVersion(AWEUAPI); @@ -219,16 +219,22 @@ void ExtUpgrade::showConfiguration() setNull(ui->spinBox_null->value()); writeConfiguration(); + return ret; } -void ExtUpgrade::tryDelete() +int ExtUpgrade::tryDelete() { if (debug) qDebug() << PDEBUG; for (int i=0; i