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

List:       kde-commits
Subject:    [digikam] /: better solution for syncing sort order to image editor
From:       Maik Qualmann <null () kde ! org>
Date:       2017-01-31 17:33:18
Message-ID: E1cYcIw-00081v-M5 () code ! kde ! org
[Download RAW message or body]

Git commit 19928f2ab0209e8cf4662fbfe2ea31a47085de56 by Maik Qualmann.
Committed on 31/01/2017 at 17:32.
Pushed by mqualmann into branch 'master'.

better solution for syncing sort order to image editor
CCBUGS: 375767

M  +2    -0    app/views/digikamview.cpp
M  +2    -4    utilities/imageeditor/main/imagewindow.cpp

https://commits.kde.org/digikam/19928f2ab0209e8cf4662fbfe2ea31a47085de56

diff --git a/app/views/digikamview.cpp b/app/views/digikamview.cpp
index c95ef76c03..3b16f21202 100644
--- a/app/views/digikamview.cpp
+++ b/app/views/digikamview.cpp
@@ -1993,6 +1993,7 @@ void DigikamView::slotSortImages(int sortRole)
 
     settings->setImageSortOrder(sortRole);
     d->iconView->imageFilterModel()->setSortRole((ImageSortSettings::SortRole) \
sortRole); +    settings->emitSetupChanged();
 }
 
 void DigikamView::slotSortImagesOrder(int order)
@@ -2006,6 +2007,7 @@ void DigikamView::slotSortImagesOrder(int order)
 
     settings->setImageSorting(order);
     d->iconView->imageFilterModel()->setSortOrder((ImageSortSettings::SortOrder) \
order); +    settings->emitSetupChanged();
 }
 
 void DigikamView::slotGroupImages(int categoryMode)
diff --git a/utilities/imageeditor/main/imagewindow.cpp \
b/utilities/imageeditor/main/imagewindow.cpp index 13b3ee41a8..db29106bf4 100644
--- a/utilities/imageeditor/main/imagewindow.cpp
+++ b/utilities/imageeditor/main/imagewindow.cpp
@@ -472,6 +472,8 @@ void ImageWindow::slotSetupChanged()
     toggleNonDestructiveActions();
 
     d->imageFilterModel->setStringTypeNatural(ApplicationSettings::instance()->isStringTypeNatural());
 +    d->imageFilterModel->setSortRole((ImageSortSettings::SortRole)ApplicationSettings::instance()->getImageSortOrder());
 +    d->imageFilterModel->setSortOrder((ImageSortSettings::SortOrder)ApplicationSettings::instance()->getImageSorting());
                
     d->rightSideBar->setStyle(ApplicationSettings::instance()->getSidebarTitleStyle());
  }
 
@@ -490,10 +492,6 @@ void ImageWindow::loadImageInfos(const ImageInfoList& \
imageInfoList, const Image  // We enable thumbbar as soon as indexes are available
     // If not, we load imageInfoCurrent, then the index 0, then again \
imageInfoCurrent  d->thumbBar->setEnabled(false);
-    // Update sort role and order from the icon view.
-    d->imageFilterModel->setSortRole((ImageSortSettings::SortRole)ApplicationSettings::instance()->getImageSortOrder());
                
-    d->imageFilterModel->setSortOrder((ImageSortSettings::SortOrder)ApplicationSettings::instance()->getImageSorting());
                
-
     d->imageInfoModel->setImageInfos(imageInfoList);
     d->setThumbBarToCurrent();
 


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