Welcome: Add a -notour argument

Helpful for a quick startup, e.g. in cases of forced clean settings.

Change-Id: I5b247d77e1157448187453c71b6c2a07b77f3889
Reviewed-by: André Hartmann <aha_1980@gmx.de>
Reviewed-by: Eike Ziller <eike.ziller@qt.io>

2 files changed, 22 insertions, 10 deletions

diff --git a/src/plugins/welcome/Welcome.json.in b/src/plugins/welcome/Welcome.json.in
index 993c09f983a..8cdf438151d 100644
--- a/src/plugins/welcome/Welcome.json.in
+++ b/src/plugins/welcome/Welcome.json.in
@@ -14,6 +14,12 @@
     ],
     \"Category\" : \"Core\",
     \"Description\" : \"Secondary Welcome Screen Plugin.\",
+    \"Arguments\" : [
+        {
+            \"Name\" : \"-notour\",
+            \"Description\" : \"Do not ask for taking a UI tour on startup\"
+        }
+    ],
     \"Url\" : \"http://www.qt.io\",
     $$dependencyList
 }
diff --git a/src/plugins/welcome/welcomeplugin.cpp b/src/plugins/welcome/welcomeplugin.cpp
index dea242a8108..88a8a1ace4a 100644
--- a/src/plugins/welcome/welcomeplugin.cpp
+++ b/src/plugins/welcome/welcomeplugin.cpp
@@ -132,16 +132,10 @@ class WelcomePlugin : public ExtensionSystem::IPlugin
 public:
     ~WelcomePlugin() final { delete m_welcomeMode; }
 
-    bool initialize(const QStringList &, QString *) final
+    bool initialize(const QStringList &arguments, QString *) final
     {
         m_welcomeMode = new WelcomeMode;
-        return true;
-    }
 
-    void extensionsInitialized() final
-    {
-        m_welcomeMode->initPlugins();
-        ModeManager::activateMode(m_welcomeMode->id());
         auto introAction = new QAction(tr("UI Tour"), this);
         connect(introAction, &QAction::triggered, this, []() {
             auto intro = new IntroductionWidget(ICore::mainWindow());
@@ -151,9 +145,21 @@ public:
         ActionContainer *mhelp = ActionManager::actionContainer(Core::Constants::M_HELP);
         if (QTC_GUARD(mhelp))
             mhelp->addAction(cmd, Core::Constants::G_HELP_HELP);
-        connect(ICore::instance(), &ICore::coreOpened, this, []() {
-            IntroductionWidget::askUserAboutIntroduction(ICore::mainWindow(), ICore::settings());
-        }, Qt::QueuedConnection);
+
+        if (!arguments.contains("-notour")) {
+            connect(ICore::instance(), &ICore::coreOpened, this, []() {
+                IntroductionWidget::askUserAboutIntroduction(ICore::mainWindow(),
+                                                             ICore::settings());
+            }, Qt::QueuedConnection);
+        }
+
+        return true;
+    }
+
+    void extensionsInitialized() final
+    {
+        m_welcomeMode->initPlugins();
+        ModeManager::activateMode(m_welcomeMode->id());
     }
 
     WelcomeMode *m_welcomeMode = nullptr;