[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    extragear/graphics/digikam/digikam
From:       Holger Foerster <hamsi2k () freenet ! de>
Date:       2010-04-07 11:06:07
Message-ID: 20100407110607.047C3AC892 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1112099 by foerster:

Also remove (legacy parameter) "Album Path" from the configuration.
Adapted first run assistant call.

 M  +12 -4     albumsettings.cpp  
 M  +6 -3      main.cpp  


--- trunk/extragear/graphics/digikam/digikam/albumsettings.cpp #1112098:1112099
@@ -623,10 +623,9 @@
      * This has a higher priority as the other settings.
      */
     group  = config->group(d->configGroupDefault);
-    QString oldDatabaseFilePathKey = "Database File Path";
-    if (group.hasKey(oldDatabaseFilePathKey))
+    if (group.hasKey(d->configDatabaseFilePathEntry))
     {
-		QString oldDatabaseFilePath = group.readEntry(oldDatabaseFilePathKey, QString());
+		QString oldDatabaseFilePath = group.readEntry(d->configDatabaseFilePathEntry, QString());
 		if (oldDatabaseFilePath.isEmpty()==false)
 		{
 			d->databaseType="QSQLITE";
@@ -643,10 +642,19 @@
 		/*
 		 * After successful migrating, we can delete this entry now.
 		 */
-		group.deleteEntry(oldDatabaseFilePathKey);
+		group.deleteEntry(d->configDatabaseFilePathEntry);
     }
 
+    /*
+     *  Remove also the 0.9 legacy parameter - migration is currently done in main.cpp.
+     */
+	group  = config->group(d->configGroupDefault);
+	if (group.hasKey("Album Path"))
+	{
+		group.deleteEntry("Album Path");
+	}
 
+
 #ifdef HAVE_NEPOMUK
 
     group = config->group(d->configGroupNepomuk);
--- trunk/extragear/graphics/digikam/digikam/main.cpp #1112098:1112099
@@ -122,9 +122,12 @@
 
     // version 0.6 was the version when the new Albums Library
     // storage was implemented
-    if (version.startsWith(QLatin1String("0.5")) ||
-        !dirInfo.exists() ||
-        !dirInfo.isDir())
+    KConfigGroup databaseConfig = config->group("Database Settings");
+
+    kDebug(50003) << QString("") << databaseConfig.exists();
+    if (!databaseConfig.exists()
+    	 && (version.startsWith(QLatin1String("0.5"))
+    	     || !dirInfo.exists() || !dirInfo.isDir()))
     {
         // Run the first run assistant.
         AssistantDlg firstRun;
[prev in list] [next in list] [prev in thread] [next in thread]