Improve loading process of engine's path at startup.

fr33mind · Mar 22, 2017 · 6833ee7 · 6833ee7
1 parent ab7c6ca
commit 6833ee7
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 8 deletions.
diff --git a/editor/belle.cpp b/editor/belle.cpp
@@ -249,11 +249,25 @@ Belle::Belle(QWidget *widget)
     connect(mUi.scenesTabWidget, SIGNAL(currentChanged(int)), this, SLOT(scenesTabWidgetPageChanged(int)));
 
     restoreSettings();
-    Engine::loadDefaultPath();
+    Engine::loadPath();
 }
 
 void Belle::afterShow()
 {
+    if (mSettings->contains("Project/enginePath")) {
+        //if its a new version and Engine didn't already correct its path, ask user.
+        if (mSettings->value("version", "").toString() != VERSION_STR &&
+            Engine::defaultPath() != Engine::path() &&
+            Engine::isValidPath(Engine::defaultPath())) {
+            QMessageBox::StandardButton btn = QMessageBox::question(this, tr("Update engine path?"),
+                                                                          tr("Some settings of a previous version of Belle were found.\n"
+                                                                             " Currently the engine path is set to:\n\"%1\".\n\n"
+                                                                   "Do you wish to update it to:\n\"%2\"?").arg(Engine::path()).arg(Engine::defaultPath()));
+            if (btn == QMessageBox::Yes)
+                Engine::setPath(Engine::defaultPath());
+        }
+    }
+
     loadEmptyProject();
 
     if (!Engine::isValid()) {
@@ -267,6 +281,7 @@ void Belle::afterShow()
 void Belle::saveSettings()
 {
     //save settings
+    mSettings->setValue("version", VERSION_STR);
     mSettings->setValue("showBuiltinBrowserMessage", mShowBuiltinBrowserMessage);
     mSettings->setValue("showWebSafeFontsMessage", ChooseFontWidget::showWebSafeFontsMessage());
     mSettings->beginGroup("Window");

diff --git a/editor/engine.cpp b/editor/engine.cpp
@@ -71,6 +71,21 @@ QString Engine::path()
     return mPath;
 }
 
+bool Engine::loadPath()
+{
+    bool defaultLoaded = loadDefaultPath();
+
+    if (isValidPath(mPath))
+        return true;
+
+    if (defaultLoaded) {
+        mPath = mDefaultPath;
+        return isValidPath(mPath);
+    }
+
+    return false;
+}
+
 bool Engine::isValid()
 {
     return isValidPath(mPath);
@@ -81,30 +96,29 @@ QString Engine::defaultPath()
     return mDefaultPath;
 }
 
-void Engine::loadDefaultPath()
+bool Engine::loadDefaultPath()
 {
     #if defined(Q_OS_MAC)
         if (mDefaultPath == ENGINE_DEFAULT_PATH) {
             mDefaultPath = QCoreApplication::applicationDirPath() +
                            QDir::separator() + ENGINE_DEFAULT_PATH;
-
-            if (mPath == ENGINE_DEFAULT_PATH)
-                mPath = mDefaultPath;
         }
     #endif
 
     if (isValidPath(mDefaultPath))
-        return;
+        return true;
 
     QStringList paths;
     paths << "engine";
 
     foreach(const QString& path, paths) {
         if (isValidPath(path)) {
             mDefaultPath = path;
-            break;
+            return true;
         }
     }
+
+    return false;
 }
 
 QString Engine::browserPath()

diff --git a/editor/engine.h b/editor/engine.h
@@ -34,8 +34,9 @@ class Engine {
     static bool isValidPath(const QString&);
     static bool isValid();
     static QString path();
+    static bool loadPath();
     static QString defaultPath();
-    static void loadDefaultPath();
+    static bool loadDefaultPath();
     static void setPath(const QString&);
     static bool pathChanged();
     static QString browserPath();