[Digikam-devel] branches/extragear/kde3/graphics/digikam/digikam

[Gilles Caulier]

SVN commit 741739 by cgilles:

digiKAm from KDE3 branch : do not store all Icon View Filter settings between sessions, but only Rating Condition configuration.
CCMAIL: digikam-devel at kde.org


 M  +0 -44     albumsettings.cpp  
 M  +0 -9      albumsettings.h  
 M  +0 -7      digikamapp.cpp  


--- branches/extragear/kde3/graphics/digikam/digikam/albumsettings.cpp #741738:741739
@@ -103,8 +103,6 @@
 
     int                                  thumbnailSize;
     int                                  treeThumbnailSize;
-    int                                  mimeTypeFilter;
-    int                                  ratingFilterValue;
     int                                  ratingFilterCond;
 
     QString                              currentTheme;
@@ -117,7 +115,6 @@
     QString                              defaultMovieFilefilter;
     QString                              defaultAudioFilefilter;
     QString                              defaultRawFilefilter;
-    QString                              textFilter;
 
     QString                              author;
     QString                              authorTitle;
@@ -195,10 +192,6 @@
     d->thumbnailSize            = ThumbnailSize::Medium;
     d->treeThumbnailSize        = 32;
 
-    d->textFilter               = QString();
-    d->mimeTypeFilter           = MimeFilter::AllFiles;
-
-    d->ratingFilterValue        = 0;
     d->ratingFilterCond         = AlbumLister::GreaterEqualCondition;
 
     d->showToolTips             = true;
@@ -285,10 +278,6 @@
     d->treeThumbnailSize        = config->readNumEntry("Default Tree Icon Size", ThumbnailSize::Tiny);
     d->currentTheme             = config->readEntry("Theme", i18n("Default"));
 
-    d->textFilter               = config->readEntry("Text Filter", QString());
-    d->mimeTypeFilter           = config->readNumEntry("Mime Type Filter", MimeFilter::AllFiles);
-
-    d->ratingFilterValue        = config->readNumEntry("Rating Filter Value", 0);
     d->ratingFilterCond         = config->readNumEntry("Rating Filter Condition",
                                                        AlbumLister::GreaterEqualCondition);
 
@@ -379,9 +368,6 @@
     config->writeEntry("Raw File Filter", d->rawFilefilter);
     config->writeEntry("Default Icon Size", QString::number(d->thumbnailSize));
     config->writeEntry("Default Tree Icon Size", QString::number(d->treeThumbnailSize));
-    config->writeEntry("Text Filter", d->textFilter);
-    config->writeEntry("Mime Type Filter", d->mimeTypeFilter);
-    config->writeEntry("Rating Filter Value", d->ratingFilterValue);
     config->writeEntry("Rating Filter Condition", d->ratingFilterCond);
     config->writeEntry("Theme", d->currentTheme);
 
@@ -620,36 +606,6 @@
     return ((d->treeThumbnailSize < 8) || (d->treeThumbnailSize > 48)) ? 48 : d->treeThumbnailSize;
 }
 
-void AlbumSettings::setTextFilter(const QString& text)
-{
-    d->textFilter = text;
-}
-
-QString AlbumSettings::getTextFilter() const
-{
-    return d->textFilter;
-}
-
-void AlbumSettings::setMimeTypeFilter(int val)
-{
-    d->mimeTypeFilter = val;
-}
-
-int AlbumSettings::getMimeTypeFilter() const
-{
-    return d->mimeTypeFilter;
-}
-
-void AlbumSettings::setRatingFilterValue(int val)
-{
-    d->ratingFilterValue = val;
-}
-
-int AlbumSettings::getRatingFilterValue() const
-{
-    return d->ratingFilterValue;
-}
-
 void AlbumSettings::setRatingFilterCond(int val)
 {
     d->ratingFilterCond = val;
--- branches/extragear/kde3/graphics/digikam/digikam/albumsettings.h #741738:741739
@@ -119,15 +119,6 @@
     void setDefaultTreeIconSize(int val);
     int  getDefaultTreeIconSize() const;
 
-    void setTextFilter(const QString& text);
-    QString getTextFilter() const;
-
-    void setMimeTypeFilter(int val);
-    int  getMimeTypeFilter() const;
-
-    void setRatingFilterValue(int val);
-    int  getRatingFilterValue() const;
-
     void setRatingFilterCond(int val);
     int  getRatingFilterCond() const;
     
--- branches/extragear/kde3/graphics/digikam/digikam/digikamapp.cpp #741738:741739
@@ -200,10 +200,7 @@
 
     d->albumSettings->setRecurseAlbums(d->recurseAlbumsAction->isChecked());
     d->albumSettings->setRecurseTags(d->recurseTagsAction->isChecked());
-    d->albumSettings->setTextFilter(d->statusTextFilterBar->text());
-    d->albumSettings->setMimeTypeFilter(d->statusMimeFilterBar->mimeFilter());
     d->albumSettings->setRatingFilterCond(d->statusRatingFilterBar->ratingFilterCondition());
-    d->albumSettings->setRatingFilterValue(d->statusRatingFilterBar->rating());
     d->albumSettings->saveSettings();
     delete d->albumSettings;
 
@@ -1046,10 +1043,6 @@
     slotRecurseAlbums(d->recurseAlbumsAction->isChecked());
     slotRecurseTags(d->recurseTagsAction->isChecked());
 
-    d->statusTextFilterBar->setText(d->albumSettings->getTextFilter());
-    d->statusMimeFilterBar->setMimeFilter(d->albumSettings->getMimeTypeFilter());
-
-    d->statusRatingFilterBar->setRating(d->albumSettings->getRatingFilterValue());
     // Setting the filter condition also updates the tooltip.
     // (So `setRating` is called first, as otherwise the filter value is not respected).
     d->statusRatingFilterBar->setRatingFilterCondition((Digikam::AlbumLister::RatingCondition)