Force import project

new commandline option -f/--force allows to open lpr file without warning
xhpohanka · May 24, 2020 · 4d87159 · 4d87159
1 parent 6d1a643
commit 4d87159
Show file tree

Hide file tree

Showing 5 changed files with 38 additions and 5 deletions.
diff --git a/src/core/MainController.cpp b/src/core/MainController.cpp
@@ -15,7 +15,7 @@
 
 #include <string>
 
-MainController::MainController(QQmlApplicationEngine& qmlEngine, QString templateFile, QObject* parent)
+MainController::MainController(QQmlApplicationEngine& qmlEngine, QString templateFile, bool forceImport, QObject* parent)
     : QObject(parent)
     , m_guiManager(this, qmlEngine)
     , m_logManager(this)
@@ -44,6 +44,7 @@ MainController::MainController(QQmlApplicationEngine& qmlEngine, QString templat
     , m_developerMode(false)
     , m_clickSounds(false)
     , m_templateFileToImport(templateFile)
+    , m_forceImport(forceImport)
 {
     // print Qt Version to verify that the right library is loaded:
     qInfo() << "Compiled with Qt Version" << QT_VERSION_STR;
@@ -193,7 +194,11 @@ void MainController::restoreApp() {
         m_projectManager.setCurrentProject("empty", /*createIfNotExist*/ true);
     } else if (appState["version"].toDouble() < 0.3) {
         onFirstStart();
-    } else {
+    } else if (m_templateFileToImport.length() > 0 && m_forceImport) {
+        m_projectManager.importProjectFile(m_templateFileToImport, true);
+        m_guiManager.closeTutorialView();
+    }
+    else {
         m_projectManager.setCurrentProject(appState["currentProject"].toString());
     }
 }

diff --git a/src/core/MainController.h b/src/core/MainController.h
@@ -62,6 +62,7 @@ class MainController : public QObject
     Q_PROPERTY(bool developerMode READ getDeveloperMode WRITE setDeveloperMode NOTIFY developerModeChanged)
     Q_PROPERTY(bool clickSounds READ getClickSounds WRITE setClickSounds NOTIFY clickSoundsChanged)
     Q_PROPERTY(QString templateFileToImport READ getTemplateFileBaseName NOTIFY templateFileToImportChanged)
+    Q_PROPERTY(bool forceImport READ getForceImport NOTIFY forceImportChanged)
 
 public:
 
@@ -70,7 +71,8 @@ class MainController : public QObject
      * @param qmlEngine is the QML enigne to use to create the GUI
      * @param parent the QObject parent
      */
-    explicit MainController(QQmlApplicationEngine& qmlEngine, QString templateFile, QObject *parent = nullptr);
+    explicit MainController(QQmlApplicationEngine& qmlEngine, QString templateFile,
+                            bool forceImport = false, QObject *parent = nullptr);
 
 
 signals:
@@ -85,6 +87,8 @@ class MainController : public QObject
 
     void templateFileToImportChanged();
 
+    void forceImportChanged();
+
 
 public slots:
 
@@ -278,6 +282,8 @@ public slots:
     bool getClickSounds() const { return m_clickSounds; }
     void setClickSounds(bool value) { m_clickSounds = value; emit clickSoundsChanged(); }
 
+    bool getForceImport() const { return m_forceImport; }
+
     QString getTemplateFileBaseName() const;
     void requestTemplateImport(QString filename);
     void onImportTemplateFileAccepted();
@@ -361,6 +367,7 @@ public slots:
      */
     QString m_templateFileToImport;
 
+    bool m_forceImport;
 };
 
 #endif // MAINCONTROLLER_H
diff --git a/src/core/manager/GuiManager.h b/src/core/manager/GuiManager.h
@@ -51,6 +51,8 @@ class GuiManager : public QObject
     void overrideGuiScalingChanged();
     void overrideGraphicsLevelChanged();
     void snapToGridChanged();
+    void closeTutorialView();
+    void openTutorialView();
 
 public slots:
 

diff --git a/src/main.cpp b/src/main.cpp
@@ -114,8 +114,13 @@ int main(int argc, char* argv[]) {
 
     QCommandLineParser parser;
     parser.addPositionalArgument("template", "Template to import");
+    parser.addOptions({
+                         {{"f", "force"}, "force import (no warning dialog)"}
+                      });
+    parser.addHelpOption();
     parser.process(app);
     QString templateFile = parser.positionalArguments().size() >= 1 ? parser.positionalArguments().at(0) : "";
+    bool forceImport = parser.isSet("force");
 
     // prepare QML engine:
     qmlRegisterSingletonType(QUrl("qrc:/qml/DefaultStyle.qml"), "CustomStyle", 1, 0, "Style");
@@ -140,7 +145,7 @@ int main(int argc, char* argv[]) {
 	engine.rootContext()->setContextProperty("GRAPHICAL_EFFECTS_LEVEL", GRAPHICAL_EFFECTS_LEVEL);
 
 	// MainController will take care of initalizing GUI, output etc.:
-    MainController controller(engine, templateFile);
+    MainController controller(engine, templateFile, forceImport);
 	QObject::connect(&app, SIGNAL(aboutToQuit()), &controller, SLOT(onExit()));
     QObject::connect(&engine, SIGNAL(quit()), &app, SLOT(quit())); // to make Qt.quit() to work
 

diff --git a/src/qml/main.qml b/src/qml/main.qml
@@ -479,6 +479,20 @@ Window {
                 visible: parent.mouseOver
             }
         }
+
+        Connections {
+            target: guiManager
+
+            onOpenTutorialView: {
+                if (!tutorialView.open)
+                    tutorialView.open = true
+            }
+            onCloseTutorialView: {
+                if (tutorialView.open)
+                    tutorialView.open = false
+            }
+        }
+
     }
 
     // -------------------------------- Template Import Dialog ---------------------------------
@@ -487,7 +501,7 @@ Window {
         id: templateImportDialog
         title: "Import Template"
         standardButtons: Dialog.Open | Dialog.Cancel
-        visible: controller.templateFileToImport
+        visible: controller.templateFileToImport && !controller.forceImport
 
         onAccepted: {
             controller.onImportTemplateFileAccepted()