From: Peter Penz <peter.penz19@gmail.com>
Date: Sun, 14 Aug 2011 13:30:29 +0000 (+0200)
Subject: Remove "FirstRun" property
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/e57bef02614a581dbe520b7946b9a0cb61165f33

Remove "FirstRun" property

The property got obsoleted by the "Version" property.
---

diff --git a/src/dolphinmainwindow.cpp b/src/dolphinmainwindow.cpp
index f495cef54..76d61978f 100644
--- a/src/dolphinmainwindow.cpp
+++ b/src/dolphinmainwindow.cpp
@@ -99,7 +99,7 @@
 namespace {
     // Used for GeneralSettings::version() to determine whether
     // an updated version of Dolphin is running.
-    const int CurrentDolphinVersion = 171;
+    const int CurrentDolphinVersion = 200;
 };
 
 /*
@@ -172,7 +172,7 @@ DolphinMainWindow::DolphinMainWindow() :
     const DolphinSettings& settings = DolphinSettings::instance();
 
     GeneralSettings* generalSettings = settings.generalSettings();
-    const bool firstRun = generalSettings->firstRun();
+    const bool firstRun = (generalSettings->version() < 200);
     if (firstRun) {
         generalSettings->setViewPropsTimestamp(QDateTime::currentDateTime());
     }
@@ -652,9 +652,7 @@ void DolphinMainWindow::closeEvent(QCloseEvent* event)
         }
     }
 
-    generalSettings->setFirstRun(false);
     generalSettings->setVersion(CurrentDolphinVersion);
-
     settings.save();
 
     if (m_searchDockIsTemporaryVisible) {
@@ -1845,24 +1843,16 @@ void DolphinMainWindow::setupDockWidgets()
             searchPanel, SLOT(setUrl(KUrl)));
 #endif
 
-    const GeneralSettings* generalSettings = DolphinSettings::instance().generalSettings();
-    const bool firstRun = generalSettings->firstRun();
-    if (firstRun) {
+    if (DolphinSettings::instance().generalSettings()->version() < 200) {
         infoDock->hide();
         foldersDock->hide();
 #ifndef Q_OS_WIN
         terminalDock->hide();
 #endif
-    }
-
 #ifdef HAVE_NEPOMUK
-    // The search dock has been introduced with Dolphin 1.7.0. Hide it per
-    // default when updating from an older Dolphin version or when Dolphin is
-    // started the first time.
-    if (firstRun || generalSettings->version() < 170) {
         searchDock->hide();
-    }
 #endif
+    }
 
     // Setup "Places"
     DolphinDockWidget* placesDock = new DolphinDockWidget(i18nc("@title:window", "Places"));
diff --git a/src/settings/dolphin_generalsettings.kcfg b/src/settings/dolphin_generalsettings.kcfg
index c5f6f7456..74b0ad2ae 100644
--- a/src/settings/dolphin_generalsettings.kcfg
+++ b/src/settings/dolphin_generalsettings.kcfg
@@ -20,10 +20,6 @@
             <label>Should the full path be shown inside the location bar</label>
             <default>false</default>
         </entry>
-        <entry name="FirstRun" type="Bool">
-            <label>Is the application started the first time (internal setting not shown in the UI)</label>
-            <default>true</default>
-        </entry>
         <entry name="Version" type="Int">
             <label>Internal version of Dolphin, containing 3 digits for mayor, minor, bugfix</label>
             <default>0</default>