From 4b0552e3efafa1eadcd2968be0a51e0124ffca32 Mon Sep 17 00:00:00 2001
From: nowrep <nowrep@gmail.com>
Date: Sun, 2 Jun 2013 18:25:25 +0200
Subject: [PATCH] [GreaseMonkey] Added "Edit in text editor" button to script
 info.

---
 src/plugins/GreaseMonkey/gm_script.cpp        |   2 +
 src/plugins/GreaseMonkey/gm_script.h          |   3 +
 .../settings/gm_settingsscriptinfo.cpp        |  46 +++-
 .../settings/gm_settingsscriptinfo.h          |   6 +
 .../settings/gm_settingsscriptinfo.ui         | 202 ++++++++++--------
 .../StatusBarIcons/statusbariconsplugin.cpp   |   2 +-
 6 files changed, 160 insertions(+), 101 deletions(-)

diff --git a/src/plugins/GreaseMonkey/gm_script.cpp b/src/plugins/GreaseMonkey/gm_script.cpp
index 0e4d9fc85..3558bc8db 100644
--- a/src/plugins/GreaseMonkey/gm_script.cpp
+++ b/src/plugins/GreaseMonkey/gm_script.cpp
@@ -152,6 +152,8 @@ void GM_Script::watchedFileChanged(const QString &file)
 
         m_manager->removeScript(this, false);
         m_manager->addScript(this);
+
+        emit scriptChanged();
     }
 }
 
diff --git a/src/plugins/GreaseMonkey/gm_script.h b/src/plugins/GreaseMonkey/gm_script.h
index d50bb3278..86d396c7c 100644
--- a/src/plugins/GreaseMonkey/gm_script.h
+++ b/src/plugins/GreaseMonkey/gm_script.h
@@ -61,6 +61,9 @@ public:
 
     bool match(const QString &urlString);
 
+signals:
+    void scriptChanged();
+
 private slots:
     void watchedFileChanged(const QString &file);
 
diff --git a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp
index c5ca9ba1b..ff9684ba6 100644
--- a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp
+++ b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.cpp
@@ -19,23 +19,47 @@
 #include "ui_gm_settingsscriptinfo.h"
 #include "../gm_script.h"
 
-GM_SettingsScriptInfo::GM_SettingsScriptInfo(GM_Script* script, QWidget* parent) :
-    QDialog(parent),
-    ui(new Ui::GM_SettingsScriptInfo)
+#include <QDesktopServices>
+
+GM_SettingsScriptInfo::GM_SettingsScriptInfo(GM_Script* script, QWidget* parent)
+    : QDialog(parent)
+    , ui(new Ui::GM_SettingsScriptInfo)
+    , m_script(script)
 {
     ui->setupUi(this);
-    setWindowTitle(tr("Script Details of %1").arg(script->name()));
+    loadScript();
 
-    ui->name->setText(script->fullName());
-    ui->version->setText(script->version());
-    ui->url->setText(script->downloadUrl().toString());
-    ui->startAt->setText(script->startAt() == GM_Script::DocumentStart ? "document-start" : "document-end");
-    ui->description->setText(script->description());
-    ui->include->setText(script->include().join("<br/>"));
-    ui->exclude->setText(script->exclude().join("<br/>"));
+    connect(m_script, SIGNAL(scriptChanged()), this, SLOT(loadScript()));
+    connect(ui->editInEditor, SIGNAL(clicked()), this, SLOT(editInTextEditor()));
+}
+
+void GM_SettingsScriptInfo::editInTextEditor()
+{
+    QDesktopServices::openUrl(QUrl::fromLocalFile(m_script->fileName()));
+}
+
+void GM_SettingsScriptInfo::loadScript()
+{
+    setWindowTitle(tr("Script Details of %1").arg(m_script->name()));
+
+    ui->name->setText(m_script->name());
+    ui->nspace->setText(m_script->nameSpace());
+    ui->version->setText(m_script->version());
+    ui->url->setText(m_script->downloadUrl().toString());
+    ui->startAt->setText(m_script->startAt() == GM_Script::DocumentStart ? "document-start" : "document-end");
+    ui->description->setText(m_script->description());
+    ui->include->setText(m_script->include().join("<br/>"));
+    ui->exclude->setText(m_script->exclude().join("<br/>"));
+
+    ui->version->setVisible(!m_script->version().isEmpty());
+    ui->labelVersion->setVisible(!m_script->version().isEmpty());
+
+    ui->url->setVisible(!m_script->downloadUrl().isEmpty());
+    ui->labelUrl->setVisible(!m_script->downloadUrl().isEmpty());
 }
 
 GM_SettingsScriptInfo::~GM_SettingsScriptInfo()
 {
     delete ui;
 }
+
diff --git a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h
index f08d0a227..187eb2284 100644
--- a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h
+++ b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.h
@@ -35,8 +35,14 @@ public:
     explicit GM_SettingsScriptInfo(GM_Script* script, QWidget* parent = 0);
     ~GM_SettingsScriptInfo();
 
+private slots:
+    void editInTextEditor();
+    void loadScript();
+
 private:
     Ui::GM_SettingsScriptInfo* ui;
+
+    GM_Script* m_script;
 };
 
 #endif // GM_SETTINGSSCRIPTINFO_H
diff --git a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.ui b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.ui
index 724ac526c..7c39198fe 100644
--- a/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.ui
+++ b/src/plugins/GreaseMonkey/settings/gm_settingsscriptinfo.ui
@@ -10,60 +10,10 @@
     <height>408</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout">
    <item>
     <layout class="QGridLayout" name="gridLayout">
-     <item row="0" column="0">
-      <widget class="QLabel" name="label_3">
-       <property name="text">
-        <string>Name:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="0">
-      <widget class="QLabel" name="label_6">
-       <property name="text">
-        <string>Version:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="2" column="0">
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>URL:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="3" column="0">
-      <widget class="QLabel" name="label_7">
-       <property name="text">
-        <string>Start at:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="4" column="0">
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Description:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="0">
+     <item row="6" column="0">
       <widget class="QLabel" name="label_8">
        <property name="text">
         <string>Runs at:</string>
@@ -73,15 +23,11 @@
        </property>
       </widget>
      </item>
-     <item row="6" column="0">
-      <widget class="QLabel" name="label_9">
-       <property name="text">
-        <string>Does not run at:</string>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-       </property>
-      </widget>
+     <item row="5" column="1">
+      <widget class="QTextBrowser" name="description"/>
+     </item>
+     <item row="7" column="1">
+      <widget class="QTextBrowser" name="exclude"/>
      </item>
      <item row="0" column="1">
       <widget class="SqueezeLabelV2" name="name">
@@ -93,27 +39,37 @@
        </property>
       </widget>
      </item>
-     <item row="3" column="1">
-      <widget class="QLabel" name="startAt">
+     <item row="5" column="0">
+      <widget class="QLabel" name="label_4">
        <property name="text">
-        <string/>
+        <string>Description:</string>
        </property>
-       <property name="textInteractionFlags">
-        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QLabel" name="labelVersion">
+       <property name="text">
+        <string>Version:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="4" column="0">
+      <widget class="QLabel" name="label_7">
+       <property name="text">
+        <string>Start at:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
        </property>
       </widget>
      </item>
      <item row="2" column="1">
-      <widget class="SqueezeLabelV2" name="url">
-       <property name="text">
-        <string/>
-       </property>
-       <property name="textInteractionFlags">
-        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
-       </property>
-      </widget>
-     </item>
-     <item row="1" column="1">
       <widget class="QLabel" name="version">
        <property name="text">
         <string/>
@@ -123,26 +79,94 @@
        </property>
       </widget>
      </item>
-     <item row="4" column="1">
-      <widget class="QTextBrowser" name="description"/>
+     <item row="0" column="0">
+      <widget class="QLabel" name="label_3">
+       <property name="text">
+        <string>Name:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
      </item>
-     <item row="5" column="1">
-      <widget class="QTextBrowser" name="include"/>
+     <item row="4" column="1">
+      <widget class="QLabel" name="startAt">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="textInteractionFlags">
+        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="1">
+      <widget class="SqueezeLabelV2" name="url">
+       <property name="text">
+        <string/>
+       </property>
+       <property name="textInteractionFlags">
+        <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
+       </property>
+      </widget>
+     </item>
+     <item row="3" column="0">
+      <widget class="QLabel" name="labelUrl">
+       <property name="text">
+        <string>URL:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
      </item>
      <item row="6" column="1">
-      <widget class="QTextBrowser" name="exclude"/>
+      <widget class="QTextBrowser" name="include"/>
+     </item>
+     <item row="7" column="0">
+      <widget class="QLabel" name="label_9">
+       <property name="text">
+        <string>Does not run at:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string>Namespace:</string>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QLabel" name="nspace"/>
      </item>
     </layout>
    </item>
    <item>
-    <widget class="QDialogButtonBox" name="buttonBox">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="standardButtons">
-      <set>QDialogButtonBox::Close</set>
-     </property>
-    </widget>
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="editInEditor">
+       <property name="text">
+        <string>Edit in text editor</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Close</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
   </layout>
  </widget>
diff --git a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp
index 0285332c4..d671ec9ce 100644
--- a/src/plugins/StatusBarIcons/statusbariconsplugin.cpp
+++ b/src/plugins/StatusBarIcons/statusbariconsplugin.cpp
@@ -75,7 +75,7 @@ bool StatusBarIconsPlugin::testPlugin()
     return (QupZilla::VERSION == QLatin1String("1.5.0"));
 }
 
-QTranslator *StatusBarIconsPlugin::getTranslator(const QString &locale)
+QTranslator* StatusBarIconsPlugin::getTranslator(const QString &locale)
 {
     QTranslator* translator = new QTranslator(this);
     translator->load(locale, ":/sbi/locale/");