From a4af7ffc070dabea3f6b8a7003a6966e0067b3de Mon Sep 17 00:00:00 2001
From: arcan1s <darkarcanis@mail.ru>
Date: Mon, 3 Nov 2014 05:03:14 +0300
Subject: [PATCH] some improvemance of external scripts

---
 sources/awesome-widget/awesome-widget.h  |  1 +
 sources/awesome-widget/configuration.cpp | 22 +++++++++++++++++++++-
 sources/awesome-widget/deconfig.ui       |  8 ++++----
 sources/ext-sysmon/extscript.cpp         |  4 +++-
 4 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/sources/awesome-widget/awesome-widget.h b/sources/awesome-widget/awesome-widget.h
index caa1dc2..6d25309 100644
--- a/sources/awesome-widget/awesome-widget.h
+++ b/sources/awesome-widget/awesome-widget.h
@@ -80,6 +80,7 @@ private slots:
     // configuration interface
     void addNewPkgCommand(QTableWidgetItem *item);
     void contextMenuPkgCommand(const QPoint pos);
+    void editCustomCommand(const int row, const int column);
     void editFanItem(QListWidgetItem *item);
     void editHddItem(QListWidgetItem *item);
     void editHddSpeedItem(QListWidgetItem *item);
diff --git a/sources/awesome-widget/configuration.cpp b/sources/awesome-widget/configuration.cpp
index 86efa9c..3a25923 100644
--- a/sources/awesome-widget/configuration.cpp
+++ b/sources/awesome-widget/configuration.cpp
@@ -20,6 +20,7 @@
 #include <KConfigDialog>
 #include <KGlobal>
 #include <KStandardDirs>
+#include <QDesktopServices>
 #include <QDir>
 #include <QMenu>
 #include <QNetworkInterface>
@@ -469,6 +470,8 @@ void AwesomeWidget::createConfigurationInterface(KConfigDialog *parent)
             this, SLOT(editMountItem(QListWidgetItem *)));
     connect(uiAdvancedConfig.listWidget_tempDevice, SIGNAL(itemActivated(QListWidgetItem *)),
             this, SLOT(editTempItem(QListWidgetItem *)));
+    connect(uiDEConfig.tableWidget_customCommand, SIGNAL(cellDoubleClicked(int, int)),
+            this, SLOT(editCustomCommand(int, int)));
     connect(uiDEConfig.tableWidget_pkgCommand, SIGNAL(itemChanged(QTableWidgetItem *)),
             this, SLOT(addNewPkgCommand(QTableWidgetItem *)));
     connect(uiDEConfig.tableWidget_pkgCommand, SIGNAL(customContextMenuRequested(QPoint)),
@@ -570,7 +573,7 @@ void AwesomeWidget::configAccepted()
     deSettings[QString("ACPIPATH")] = uiDEConfig.lineEdit_acpi->text();
     QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_engine_extsysmon/scripts");
     for (int i=0; i<uiDEConfig.tableWidget_customCommand->rowCount(); i++) {
-        ExtScript *script = new ExtScript(uiDEConfig.tableWidget_customCommand->item(i, 0)->text(), dirs);
+        ExtScript *script = new ExtScript(uiDEConfig.tableWidget_customCommand->item(i, 0)->text(), dirs, debug);
         if (uiDEConfig.tableWidget_customCommand->item(i, 0)->checkState() == Qt::Checked)
             script->setActive(true);
         else
@@ -758,6 +761,23 @@ void AwesomeWidget::contextMenuPkgCommand(const QPoint pos)
 }
 
 
+void AwesomeWidget::editCustomCommand(const int row, const int column)
+{
+    Q_UNUSED(column);
+    if (debug) qDebug() << PDEBUG;
+
+    QString name = uiDEConfig.tableWidget_customCommand->itemAt(row, 0)->text();
+    QString localDir = KStandardDirs::locateLocal("data", "plasma_engine_extsysmon/scripts");
+    QStringList dirs = KGlobal::dirs()->findDirs("data", "plasma_engine_extsysmon/scripts");
+    for (int i=0; i<dirs.count(); i++) {
+        if (!QDir(dirs[i]).exists(name)) continue;
+        if (dirs[i] == localDir) break;
+        QFile::copy(QDir(dirs[i]).absoluteFilePath(name), QDir(localDir).absoluteFilePath(name));
+    }
+    QDesktopServices::openUrl(QUrl(QDir(localDir).absoluteFilePath(name)));
+}
+
+
 void AwesomeWidget::editFanItem(QListWidgetItem *item)
 {
     if (debug) qDebug() << PDEBUG;
diff --git a/sources/awesome-widget/deconfig.ui b/sources/awesome-widget/deconfig.ui
index ad3766d..2e7cb9e 100644
--- a/sources/awesome-widget/deconfig.ui
+++ b/sources/awesome-widget/deconfig.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>700</width>
-    <height>590</height>
+    <height>588</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -43,7 +43,7 @@
         <x>0</x>
         <y>0</y>
         <width>684</width>
-        <height>574</height>
+        <height>572</height>
        </rect>
       </property>
       <layout class="QGridLayout" name="gridLayout">
@@ -459,12 +459,12 @@ del - remove item</string>
          </column>
          <column>
           <property name="text">
-           <string>Active</string>
+           <string>Interval</string>
           </property>
          </column>
          <column>
           <property name="text">
-           <string>Interval</string>
+           <string>Output</string>
           </property>
          </column>
          <column>
diff --git a/sources/ext-sysmon/extscript.cpp b/sources/ext-sysmon/extscript.cpp
index 95dfd25..b7181d1 100644
--- a/sources/ext-sysmon/extscript.cpp
+++ b/sources/ext-sysmon/extscript.cpp
@@ -173,7 +173,7 @@ void ExtScript::readConfiguration()
     if (debug) qDebug() << PDEBUG;
 
     QMap<QString, QString> settings;
-    for (int i=0; i<dirs.count(); i++) {
+    for (int i=dirs.count()-1; i>=0; i--) {
         if (!QDir(dirs[i]).entryList(QDir::Files).contains(name + QString(".conf"))) continue;
         QString fileName = dirs[i] + QDir::separator() + name + QString(".conf");
         QMap<QString, QString> newSettings = getConfigurationFromFile(fileName);
@@ -252,6 +252,8 @@ void ExtScript::writeConfiguration()
 
 void ExtScript::fromExternalConfiguration(const QMap<QString, QString> settings)
 {
+    if (debug) qDebug() << PDEBUG;
+
     if (settings.contains(QString("ACTIVE")))
         setActive(settings[QString("ACTIVE")] == QString("true"));
     if (settings.contains(QString("INTERVAL")))