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

List:       kde-commits
Subject:    branches/extragear/graphics/digikam/1.0-databaseext
From:       Holger Foerster <hamsi2k () freenet ! de>
Date:       2009-11-20 20:54:03
Message-ID: 1258750443.500266.6343.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 1052138 by foerster:

Using dedicated config item for thumbnails schema name.

 M  +1 -2      digikam/albummanager.cpp  
 M  +16 -0     digikam/albumsettings.cpp  
 M  +3 -0      digikam/albumsettings.h  
 M  +4 -1      libs/widgets/common/databasewidget.cpp  
 M  +1 -0      libs/widgets/common/databasewidget.h  
 M  +2 -0      utilities/setup/setupdatabase.cpp  


--- branches/extragear/graphics/digikam/1.0-databaseext/digikam/albummanager.cpp \
#1052137:1052138 @@ -651,8 +651,7 @@
     // -- Database initialization -------------------------------------------------
 
     QString databaseName = AlbumSettings::instance()->getDatabaseName();
-    //TODO Use a own database for thumbnails. For the first shoot, we merge it to \
                the main db.
-    QString thumbnailDatabaseName = databaseName;
+    QString thumbnailDatabaseName = \
AlbumSettings::instance()->getDatabaseNameThumbnails();  
     // SQLite specifics
     if (AlbumSettings::instance()->getDatabaseType().isEmpty())
--- branches/extragear/graphics/digikam/1.0-databaseext/digikam/albumsettings.cpp \
#1052137:1052138 @@ -71,6 +71,7 @@
         configGroupDatabase("Database Settings"),
         configDatabaseType("Database Type"),
         configDatabaseName("Database Name"),
+        configDatabaseNameThumbnails("Database Name Thumbnails"),
         configDatabaseHostName("Database Hostname"),
         configDatabasePort("Database Port"),
         configDatabaseUsername("Database Username"),
@@ -157,6 +158,7 @@
     const QString                       configGroupDatabase;
     const QString                       configDatabaseType;
     const QString                       configDatabaseName;
+    const QString                       configDatabaseNameThumbnails;
     const QString                       configDatabaseHostName;
     const QString                       configDatabasePort;
     const QString                       configDatabaseUsername;
@@ -323,6 +325,7 @@
     QString                             databaseType;
     QString                             databaseHostName;
     QString                             databaseName;
+    QString                             databaseNameThumbnails;
     QString                             databaseUserName;
     QString                             databasePassword;
     int                                 databasePort;
@@ -581,6 +584,7 @@
     group = config->group(d->configGroupDatabase);
     d->databaseType             = group.readEntry(d->configDatabaseType);
     d->databaseName             = group.readEntry(d->configDatabaseName);
+    d->databaseNameThumbnails   = group.readEntry(d->configDatabaseNameThumbnails);
     d->databaseHostName         = group.readEntry(d->configDatabaseHostName);
     d->databasePort             = group.readEntry(d->configDatabasePort).toInt();
     d->databaseUserName         = group.readEntry(d->configDatabaseUsername);
@@ -601,6 +605,7 @@
     {
         d->databaseType="QSQLITE";
         d->databaseName=oldDatabaseFilePath;
+        d->databaseNameThumbnails=oldDatabaseFilePath;
     }
 
     d->syncToDigikam         = group.readEntry(d->configSyncNepomuktoDigikamEntry, \
false); @@ -716,6 +721,7 @@
     group = config->group(d->configGroupDatabase);
     group.writeEntry(d->configDatabaseType, d->databaseType);
     group.writeEntry(d->configDatabaseName, d->databaseName);
+    group.writeEntry(d->configDatabaseNameThumbnails, d->databaseNameThumbnails);
     group.writeEntry(d->configDatabaseHostName, d->databaseHostName);
     group.writeEntry(d->configDatabasePort, d->databasePort);
     group.writeEntry(d->configDatabaseUsername, d->databaseUserName);
@@ -1589,6 +1595,11 @@
     return d->databaseName;
 }
 
+QString AlbumSettings::getDatabaseNameThumbnails() const
+{
+    return d->databaseNameThumbnails;
+}
+
 QString AlbumSettings::getDatabaseHostName() const
 {
     return d->databaseHostName;
@@ -1619,6 +1630,11 @@
     d->databaseName = databaseName;
 }
 
+void AlbumSettings::setDatabaseNameThumbnails(const QString &databaseNameThumbnails)
+{
+    d->databaseNameThumbnails = databaseNameThumbnails;
+}
+
 void AlbumSettings::setDatabaseHostName(const QString &hostName)
 {
     d->databaseHostName = hostName;
--- branches/extragear/graphics/digikam/1.0-databaseext/digikam/albumsettings.h \
#1052137:1052138 @@ -322,6 +322,9 @@
     QString getDatabaseName() const;
     void setDatabaseName(const QString &databaseName);
 
+    QString getDatabaseNameThumbnails() const;
+    void setDatabaseNameThumbnails(const QString &databaseNameThumbnails);
+
     QString getDatabaseHostName() const;
     void setDatabaseHostName(const QString &hostName);
 
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/widgets/common/databasewidget.cpp \
#1052137:1052138 @@ -71,8 +71,10 @@
 
         QLabel *databaseTypeLabel        = new QLabel(i18n("Type"));
         databaseType                  = new QComboBox();
-        QLabel *databaseNameLabel        = new QLabel(i18n("Name"));
+        QLabel *databaseNameLabel        = new QLabel(i18n("Schema Name"));
         databaseName                  = new QLineEdit();
+        QLabel *databaseNameThumbnailsLabel = new QLabel(i18n("Thumbnails Schema \
Name")); +        databaseNameThumbnails        = new QLineEdit();
         QLabel *hostNameLabel            = new QLabel(i18n("Host Name"));
         hostName                      = new QLineEdit();
         QLabel *hostPortLabel            = new QLabel(i18n("Port"));
@@ -105,6 +107,7 @@
         expertSettinglayout->addRow(hostNameLabel, hostName);
         expertSettinglayout->addRow(hostPortLabel, hostPort);
         expertSettinglayout->addRow(databaseNameLabel, databaseName);
+        expertSettinglayout->addRow(databaseNameThumbnailsLabel, \
databaseNameThumbnails);  expertSettinglayout->addRow(userNameLabel, userName);
         expertSettinglayout->addRow(passwordLabel, password);
         expertSettinglayout->addRow(connectionOptionsLabel, connectionOptions);
--- branches/extragear/graphics/digikam/1.0-databaseext/libs/widgets/common/databasewidget.h \
#1052137:1052138 @@ -59,6 +59,7 @@
     QLabel                  *databasePathLabel;
     QComboBox               *databaseType;
     QLineEdit               *databaseName;
+    QLineEdit               *databaseNameThumbnails;
     QLineEdit               *hostName;
     QSpinBox                *hostPort;
     QLineEdit               *connectionOptions;
--- branches/extragear/graphics/digikam/1.0-databaseext/utilities/setup/setupdatabase.cpp \
#1052137:1052138 @@ -114,6 +114,7 @@
         {
             settings->setDatabaseType(d->databaseWidget->databaseType->currentText());
  settings->setDatabaseName(newPath);
+            settings->setDatabaseNameThumbnails(newPath);
 
             // clear other fields
             settings->setDatabaseConnectoptions("");
@@ -127,6 +128,7 @@
     }else{
         settings->setDatabaseType(d->databaseWidget->databaseType->currentText());
         settings->setDatabaseName(d->databaseWidget->databaseName->text());
+        settings->setDatabaseNameThumbnails(d->databaseWidget->databaseNameThumbnails->text());
                
         settings->setDatabaseConnectoptions(d->databaseWidget->connectionOptions->text());
                
         settings->setDatabaseHostName(d->databaseWidget->hostName->text());
         settings->setDatabasePort(d->databaseWidget->hostPort->text().toInt());


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