Merge tag 'upstream/3.0.2'

Upstream version 3.0.2

# gpg: Signature made Fri 30 Jan 2015 05:00:11 PM EST using RSA key ID EBE9BD91
# gpg: Good signature from "Unit 193 <unit193@gmail.com>"
# gpg:                 aka "Unit 193 <unit193@ninthfloor.org>"
# gpg:                 aka "Unit 193 <unit193@ubuntu.com>"

1 files changed, 12 insertions, 8 deletions

diff --git a/SQLiteStudio3/guiSQLiteStudio/formmanager.cpp b/SQLiteStudio3/guiSQLiteStudio/formmanager.cpp
index 9df36d0..0ee7d43 100644
--- a/SQLiteStudio3/guiSQLiteStudio/formmanager.cpp
+++ b/SQLiteStudio3/guiSQLiteStudio/formmanager.cpp
@@ -46,6 +46,11 @@ QStringList FormManager::getAvailableForms() const
     return widgetNameToFullPath.keys();
 }
 
+QStringList FormManager::getFormDirs() const
+{
+    return formDirs;
+}
+
 QWidget* FormManager::createWidgetByFullPath(const QString& path)
 {
     QWidget* widget = uiLoader->load(path);
@@ -104,22 +109,21 @@ void FormManager::init()
 
 void FormManager::load()
 {
-    QStringList dirs;
-    dirs += qApp->applicationDirPath() + "/forms";
-    dirs += ":/forms";
-    dirs += QDir(CFG->getConfigDir()).absoluteFilePath("forms");
+    formDirs += qApp->applicationDirPath() + "/forms";
+    formDirs += ":/forms";
+    formDirs += QDir(CFG->getConfigDir()).absoluteFilePath("forms");
 
     QString envDirs = SQLITESTUDIO->getEnv("SQLITESTUDIO_FORMS");
     if (!envDirs.isNull())
-        dirs += envDirs.split(PATH_LIST_SEPARATOR);
+        formDirs += envDirs.split(PATH_LIST_SEPARATOR);
 
-    dirs += PLUGINS->getPluginDirs();
+    formDirs += PLUGINS->getPluginDirs();
 
 #ifdef FORMS_DIR
-    dirs += STRINGIFY(FORMS_DIR);
+    formDirs += STRINGIFY(FORMS_DIR);
 #endif
 
-    foreach (QString dirPath, dirs)
+    foreach (QString dirPath, formDirs)
         loadRecurently(dirPath, "");
 }