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

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

SVN commit 1146688 by foerster:

DatabaseWidget / Database Setup: Added some extensions to choose the correct database \
type when load the settings. Renamed slots to match conventions.

 M  +3 -4      libs/widgets/common/databasewidget.cpp  
 M  +1 -30     utilities/setup/setupdatabase.cpp  


--- trunk/extragear/graphics/digikam/libs/widgets/common/databasewidget.cpp \
#1146687:1146688 @@ -175,9 +175,9 @@
             this, SLOT(slotDatabasePathEdited(const QString&)));
 
     connect(databaseType, SIGNAL(currentIndexChanged(int)),
-            this, SLOT(handleDBTypeIndexChanged(int)));
+            this, SLOT(slotHandleDBTypeIndexChanged(int)));
 
-    connect(internalServer, SIGNAL(stateChanged(int index)),
+    connect(internalServer, SIGNAL(stateChanged(int)),
             this, SLOT(slotHandleInternalServerCheckbox(int)));
 
     connect(checkDatabaseConnectionButton, SIGNAL(clicked()),
@@ -332,10 +332,9 @@
     {
         //kDebug(50003) << "Comparing comboboxentry on index ["<< i <<"] [" << \
                databaseType->itemData(i)
           //            << "] with ["<< settings->getDatabaseType() << "]";
-        if (databaseType->itemText(i) == settings->getDatabaseType())
+        if (databaseType->itemData(i).toString() == settings->getDatabaseType())
         {
             databaseType->setCurrentIndex(i);
-            setDatabaseInputFields(databaseType->itemData(i).toString());
         }
     }
 }
--- trunk/extragear/graphics/digikam/utilities/setup/setupdatabase.cpp \
#1146687:1146688 @@ -154,36 +154,7 @@
     AlbumSettings* settings = AlbumSettings::instance();
     if (!settings) return;
 
-    d->databaseWidget->originalDbPath = settings->getDatabaseFilePath();
-    d->databaseWidget->originalDbType = settings->getDatabaseType();
-    d->databaseWidget->databasePathEdit->setUrl(settings->getDatabaseFilePath());
-
-    d->databaseWidget->internalServer->setChecked(settings->getInternalDatabaseServer());
                
-    d->databaseWidget->databaseName->setText(settings->getDatabaseName());
-    d->databaseWidget->databaseNameThumbnails->setText(settings->getDatabaseNameThumbnails());
                
-    d->databaseWidget->hostName->setText(settings->getDatabaseHostName());
-    d->databaseWidget->hostPort->setValue(settings->getDatabasePort());
-    d->databaseWidget->connectionOptions->setText(settings->getDatabaseConnectoptions());
                
-
-    d->databaseWidget->userName->setText(settings->getDatabaseUserName());
-
-    d->databaseWidget->password->setText(settings->getDatabasePassword());
-
-    /* Now set the type according the database type from the settings.
-     * If no item is found, ignore the setting.
-     */
-    for (int i=0; i<d->databaseWidget->databaseType->count(); i++)
-    {
-        kDebug(50003) << "Comparing comboboxentry on index ["<< i <<"] [" 
-                      << d->databaseWidget->databaseType->itemText(i) 
-                      << "] with ["<< settings->getDatabaseType() << "]";
-
-        if (d->databaseWidget->databaseType->itemText(i)==settings->getDatabaseType())
                
-        {
-            d->databaseWidget->databaseType->setCurrentIndex(i);
-            d->databaseWidget->setDatabaseInputFields(d->databaseWidget->databaseType->itemText(i));
 +    d->databaseWidget->setParametersFromSettings(settings);
         }
-    }
-}
 
 }  // namespace Digikam


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