arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 06:45:48 +00:00
Code Issues Projects Releases Wiki Activity

fix cppcheck warnings

Browse Source 
improvements of interaction with items
This commit is contained in:
arcan1s
2015-02-12 02:57:05 +03:00
parent 4dbf5150fc
commit 3bd73d0458
19 changed files with 237 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -181,6 +181,7 @@ void AWActions::writeDataEngineConfiguration(const QMap<QString, QVariant> 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")]);

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

@ -856,21 +856,33 @@ void AWKeys::editItemButtonPressed(QAbstractButton *button)
case RequestedExtScript:
for (int i=0; i<extScripts.count(); i++) {
if (extScripts[i]->fileName() != 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; i<extUpgrade.count(); i++) {
if (extUpgrade[i]->fileName() != 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; i<graphicalItems.count(); i++) {
if (graphicalItems[i]->fileName() != 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;
}

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

@ -100,12 +100,11 @@ QPixmap AWToolTip::image()
else
toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush));
bool down = false;
bool isBattery = false;
for (int i=0; i<requiredKeys.count(); i++) {
float normX = 100.0 / static_cast<float>(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<data[requiredKeys[i]].count()-1; j++) {
@ -113,7 +112,7 @@ QPixmap AWToolTip::image()
float y1 = - fabs(data[requiredKeys[i]][j]) * normY + 5.0;
float x2 = (j + 1) * normX + shift;
float y2 = - fabs(data[requiredKeys[i]][j+1]) * normY + 5.0;
if (isBattery) {
if (requiredKeys[i] == QString("batTooltip")) {
if (data[requiredKeys[i]][j+1] > 0)
pen.setColor(QColor(configuration[QString("batTooltipColor")].toString()));
else

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

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

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

@ -85,8 +85,8 @@ public:
public slots:
void readConfiguration();
void showConfiguration(const QStringList tags = QStringList());
void tryDelete();
int showConfiguration(const QStringList tags = QStringList());
int tryDelete();
void writeConfiguration();
private slots: