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

List:       kde-commits
Subject:    extragear/graphics/digikam/utilities/fuzzysearch
From:       Andi Clemens <andi.clemens () gmx ! net>
Date:       2009-06-11 9:23:17
Message-ID: 1244712197.167980.27582.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 980147 by aclemens:

Move setDefaultAlbumModels(), model creation and connection to a
dedicated slot, this should fix a crash when album database path is
changed while digikam is running.

 M  +6 -7      findduplicatesview.cpp  


--- trunk/extragear/graphics/digikam/utilities/fuzzysearch/findduplicatesview.cpp #980146:980147
@@ -136,7 +136,6 @@
 
     d->albumSelectCB = new AlbumSelectComboBox;
     d->albumSelectCB->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding);
-    d->albumSelectCB->setDefaultAlbumModels();
 
     QString albumSelectStr = i18n("Select all albums that should be included into the search.");
     d->albumSelectCB->setWhatsThis(albumSelectStr);
@@ -145,8 +144,6 @@
     d->includeAlbumsLabel = new QLabel(i18n("Search in:"));
     d->includeAlbumsLabel->setBuddy(d->albumSelectCB);
 
-    d->model = d->albumSelectCB->model();
-
     // ---------------------------------------------------------------
 
     grid->addWidget(d->listView,           0, 0, 1,-1);
@@ -193,9 +190,6 @@
 
     connect(d->progressBar, SIGNAL(signalCancelButtonPressed()),
             this, SLOT(slotCancelButtonPressed()));
-
-    connect(d->model, SIGNAL(checkStateChanged(Album*, Qt::CheckState)),
-            this, SLOT(slotExcludeSelectionChanged(Album*, Qt::CheckState)));
 }
 
 FindDuplicatesView::~FindDuplicatesView()
@@ -235,8 +229,13 @@
 
 void FindDuplicatesView::slotUpdateAlbumSelectBox()
 {
-    d->albumSelectCB->view()->expandToDepth(1);
+    d->albumSelectCB->setDefaultAlbumModels();
+    d->model = d->albumSelectCB->model();
+    d->albumSelectCB->view()->expandToDepth(0);
     d->albumSelectCB->setNoSelectionText(i18n("No albums selected"));
+
+    connect(d->model, SIGNAL(checkStateChanged(Album*, Qt::CheckState)),
+            this, SLOT(slotExcludeSelectionChanged(Album*, Qt::CheckState)));
 }
 
 void FindDuplicatesView::slotAlbumAdded(Album* a)
[prev in list] [next in list] [prev in thread] [next in thread]