From e4be3b2e02f6655a90323266f14576ecade9b725 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Thu, 20 Nov 2014 04:07:14 +0300 Subject: [PATCH] simplify custom script class remove QGraphicsView border --- sources/awesome-widget/awesome-widget.cpp | 1 + sources/awesome-widget/graphicalitem.cpp | 1 + sources/desktop-panel/desktop-panel.cpp | 1 + sources/ext-sysmon/extscript.cpp | 98 ++++++++++------------- sources/ext-sysmon/extscript.h | 1 + 5 files changed, 48 insertions(+), 54 deletions(-) diff --git a/sources/awesome-widget/awesome-widget.cpp b/sources/awesome-widget/awesome-widget.cpp index dfe34c6..451a119 100644 --- a/sources/awesome-widget/awesome-widget.cpp +++ b/sources/awesome-widget/awesome-widget.cpp @@ -210,6 +210,7 @@ void AwesomeWidget::init() toolTipView = new QGraphicsView(toolTipScene); toolTipView->setStyleSheet(QString("background: transparent")); toolTipView->setContentsMargins(0, 0, 0, 0); + toolTipView->setFrameShape(QFrame::NoFrame); toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); Plasma::ToolTipManager::self()->setContent(this, toolTip); diff --git a/sources/awesome-widget/graphicalitem.cpp b/sources/awesome-widget/graphicalitem.cpp index 3e7a418..0437ced 100644 --- a/sources/awesome-widget/graphicalitem.cpp +++ b/sources/awesome-widget/graphicalitem.cpp @@ -395,6 +395,7 @@ void GraphicalItem::showConfiguration(const QStringList tags) setDirection(ui->comboBox_direction->currentText()); setHeight(ui->spinBox_height->value()); setWidth(ui->spinBox_width->value()); + writeConfiguration(); } diff --git a/sources/desktop-panel/desktop-panel.cpp b/sources/desktop-panel/desktop-panel.cpp index d05c04d..c2bc6a0 100644 --- a/sources/desktop-panel/desktop-panel.cpp +++ b/sources/desktop-panel/desktop-panel.cpp @@ -129,6 +129,7 @@ void DesktopPanel::init() toolTipView = new QGraphicsView(toolTipScene); toolTipView->setStyleSheet(QString("background: transparent")); toolTipView->setContentsMargins(0, 0, 0, 0); + toolTipView->setFrameShape(QFrame::NoFrame); toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); Plasma::ToolTipManager::self()->setContent(this, toolTip); diff --git a/sources/ext-sysmon/extscript.cpp b/sources/ext-sysmon/extscript.cpp index 939451b..21fdfa0 100644 --- a/sources/ext-sysmon/extscript.cpp +++ b/sources/ext-sysmon/extscript.cpp @@ -34,6 +34,7 @@ ExtScript::ExtScript(QWidget *parent, const QString scriptName, const QStringLis debug(debugCmd), ui(new Ui::ExtScript) { + _name = fileName; readConfiguration(); ui->setupUi(this); } @@ -103,6 +104,27 @@ ExtScript::Redirect ExtScript::getRedirect() } +QString ExtScript::getStrRedirect() +{ + if (debug) qDebug() << PDEBUG; + + QString value; + switch (_redirect) { + case stdout2stderr: + value = QString("stdout2stderr"); + break; + case stderr2stdout: + value = QString("stderr2stdout"); + break; + default: + value = QString("nothing"); + break; + } + + return value; +} + + bool ExtScript::hasOutput() { if (debug) qDebug() << PDEBUG; @@ -205,26 +227,14 @@ void ExtScript::readConfiguration() if (!QDir(dirs[i]).entryList(QDir::Files).contains(fileName)) continue; QSettings settings(dirs[i] + QDir::separator() + fileName, QSettings::IniFormat); settings.beginGroup(QString("Desktop Entry")); - QStringList childKeys = settings.childKeys(); - for (int i=0; ispinBox_interval->setValue(_interval); int ret = exec(); - if (ret == 1) { - setName(ui->lineEdit_name->text()); - setComment(ui->lineEdit_comment->text()); - setExec(ui->lineEdit_command->text()); - setPrefix(ui->lineEdit_prefix->text()); - setActive(ui->checkBox_active->checkState() == Qt::Checked); - setHasOutput(ui->checkBox_output->checkState() == Qt::Checked); - setRedirect(ui->comboBox_redirect->currentText()); - setInterval(ui->spinBox_interval->value()); - writeConfiguration(); - } + if (ret != 1) return; + setName(ui->lineEdit_name->text()); + setComment(ui->lineEdit_comment->text()); + setExec(ui->lineEdit_command->text()); + setPrefix(ui->lineEdit_prefix->text()); + setActive(ui->checkBox_active->checkState() == Qt::Checked); + setHasOutput(ui->checkBox_output->checkState() == Qt::Checked); + setRedirect(ui->comboBox_redirect->currentText()); + setInterval(ui->spinBox_interval->value()); + + writeConfiguration(); } @@ -327,34 +337,14 @@ void ExtScript::writeConfiguration() if (debug) qDebug() << PDEBUG << ":" << "Configuration file" << settings.fileName(); settings.beginGroup(QString("Desktop Entry")); - QString strValue; settings.setValue(QString("Encoding"), QString("UTF-8")); settings.setValue(QString("Name"), _name); settings.setValue(QString("Comment"), _comment); settings.setValue(QString("Exec"), _exec); settings.setValue(QString("X-AW-Prefix"), _prefix); - if (_active) - strValue = QString("true"); - else - strValue = QString("false"); - settings.setValue(QString("X-AW-Active"), strValue); - if (_output) - strValue = QString("true"); - else - strValue = QString("false"); - settings.setValue(QString("X-AW-Output"), strValue); - switch (_redirect) { - case stdout2stderr: - strValue = QString("stdout2stderr"); - break; - case stderr2stdout: - strValue = QString("stderr2stdout"); - break; - default: - strValue = QString("nothing"); - break; - } - settings.setValue(QString("X-AW-Redirect"), strValue); + settings.setValue(QString("X-AW-Active"), QVariant(_active).toString()); + settings.setValue(QString("X-AW-Output"), QVariant(_active).toString()); + settings.setValue(QString("X-AW-Redirect"), getStrRedirect()); settings.setValue(QString("X-AW-Interval"), _interval); settings.endGroup(); diff --git a/sources/ext-sysmon/extscript.h b/sources/ext-sysmon/extscript.h index b72094a..743d5e0 100644 --- a/sources/ext-sysmon/extscript.h +++ b/sources/ext-sysmon/extscript.h @@ -53,6 +53,7 @@ public: QString getName(); QString getPrefix(); Redirect getRedirect(); + QString getStrRedirect(); bool hasOutput(); bool isActive(); // set methods