From 016003905ca0e8e459e3dc33e786beda8ec92f45 Mon Sep 17 00:00:00 2001 From: Unit 193 Date: Fri, 30 Jan 2015 17:00:07 -0500 Subject: Imported Upstream version 3.0.2 --- SQLiteStudio3/guiSQLiteStudio/formmanager.cpp | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) (limited to 'SQLiteStudio3/guiSQLiteStudio/formmanager.cpp') 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, ""); } -- cgit v1.2.3