New upstream version 3.4.4+dfsg.upstream/3.4.4+dfsg

1 files changed, 14 insertions, 35 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp
index 7e084fb..26a9f52 100644
--- a/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/dialogs/aboutdialog.cpp
@@ -1,16 +1,18 @@
 #include "aboutdialog.h"
 #include "ui_aboutdialog.h"
 #include "common/utils.h"
-#include "sqlitestudio.h"
 #include "iconmanager.h"
 #include "services/extralicensemanager.h"
 #include "services/pluginmanager.h"
+#include "services/sqliteextensionmanager.h"
 #include "formmanager.h"
 #include "iconmanager.h"
+#include "mainwindow.h"
 #include <QDebug>
 #include <QFile>
 #include <QApplication>
 #include <QClipboard>
+#include <QAction>
 
 AboutDialog::AboutDialog(InitialMode initialMode, QWidget *parent) :
     QDialog(parent),
@@ -38,8 +40,8 @@ void AboutDialog::init(InitialMode initialMode)
         case DistributionType::PORTABLE:
             distName = tr("Portable distribution.");
             break;
-        case DistributionType::OSX_BOUNDLE:
-            distName = tr("MacOS X application boundle distribution.");
+        case DistributionType::OSX_BUNDLE:
+            distName = tr("MacOS X application bundle distribution.");
             break;
         case DistributionType::OS_MANAGED:
             distName = tr("Operating system managed distribution.");
@@ -75,28 +77,21 @@ void AboutDialog::init(InitialMode initialMode)
     licenseContents.clear();
 
     // Environment
-    ui->appDirEdit->setText(qApp->applicationDirPath());
-    ui->cfgDirEdit->setText(CFG->getConfigDir());
-    ui->pluginDirList->addItems(filterResourcePaths(PLUGINS->getPluginDirs()));
-    ui->iconDirList->addItems(filterResourcePaths(ICONMANAGER->getIconDirs()));
-    ui->formDirList->addItems(filterResourcePaths(FORMS->getFormDirs()));
+    ui->appDirEdit->setText(toNativePath(qApp->applicationDirPath()));
+    ui->cfgDirEdit->setText(toNativePath(CFG->getConfigDir()));
+    ui->pluginDirList->setPlainText(filterResourcePaths(PLUGINS->getPluginDirs()).join("\n"));
+    ui->iconDirList->setPlainText(filterResourcePaths(ICONMANAGER->getIconDirs()).join("\n"));
+    ui->formDirList->setPlainText(filterResourcePaths(FORMS->getFormDirs()).join("\n"));
+    ui->extensionDirList->setPlainText(filterResourcePaths(SQLITE_EXTENSIONS->getExtensionDirs()).join("\n"));
     ui->qtVerEdit->setText(QT_VERSION_STR);
     ui->sqlite3Edit->setText(CFG->getSqlite3Version());
-
-    QAction* copyAct;
-    for (QListWidget* w : {ui->pluginDirList, ui->iconDirList, ui->formDirList})
-    {
-        copyAct = new QAction(tr("Copy"), w);
-        w->addAction(copyAct);
-        connect(copyAct, SIGNAL(triggered()), this, SLOT(copy()));
-    }
 }
 
 void AboutDialog::buildIndex()
 {
     static const QString entryTpl = QStringLiteral("<li>%1</li>");
     QStringList entries;
-    for (const QString& idx : indexContents)
+    for (QString& idx : indexContents)
         entries += entryTpl.arg(idx);
 
     licenseContents.prepend(tr("<h3>Table of contents:</h3><ol>%2</ol>").arg(entries.join("")));
@@ -135,24 +130,8 @@ QStringList AboutDialog::filterResourcePaths(const QStringList& paths)
         if (path.startsWith(":"))
             continue;
 
-        output << path;
+        QString newPath = toNativePath(path);
+        output << newPath;
     }
     return output;
 }
-
-void AboutDialog::copy()
-{
-    QListWidget* list = dynamic_cast<QListWidget*>(sender()->parent());
-    if (!list)
-        return;
-
-    QList<QListWidgetItem*> items = list->selectedItems();
-    if (items.size() == 0)
-        return;
-
-    QStringList lines;
-    for (QListWidgetItem* item : items)
-        lines << item->text();
-
-    QApplication::clipboard()->setText(lines.join("\n"));
-}