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

[Jörn Ahrens]

SVN commit 437731 by jahrens:

Deleted AlbumFolderView_Deprecated and AlbumFolderItem_Deprecated.
This is done by the new AlbumFolderView and AlbumFolderViewItem now.
Therefor the tab "Album (old)" isn't shown in the left sidebar anymore.

CCMAIL: digikam-devel at kde.org



 M  +1 -2      Makefile.am  
 D             albumfolderitem_deprecated.cpp  
 D             albumfolderitem_deprecated.h  
 M  +1 -1      albumfolderview.cpp  
 M  +2 -2      albumfolderview.h  
 D             albumfolderview_deprecated.cpp  
 D             albumfolderview_deprecated.h  
 M  +1 -5      digikamview.cpp  
 M  +0 -2      digikamview.h  


--- trunk/extragear/graphics/digikam/digikam/Makefile.am #437730:437731
@@ -26,8 +26,7 @@
 			listview.cpp listitem.cpp \
 			iconview.cpp icongroupitem.cpp iconitem.cpp \
 			digikamapp.cpp digikamview.cpp \
-		        albumfolderview.cpp albumfolderitem_deprecated.cpp \
-			albumfolderview_deprecated.cpp \
+		        albumfolderview.cpp \
 		        albumiconview.cpp albumicongroupitem.cpp albumiconitem.cpp \
 		        albumpropsedit.cpp imagedescedit.cpp \
 		        albumsettings.cpp imageproperties.cpp \
--- trunk/extragear/graphics/digikam/digikam/albumfolderview.cpp #437730:437731
@@ -517,7 +517,7 @@
     AlbumSettings* settings = AlbumSettings::instance();
     if(!settings)
     {
-        kdWarning() << "AlbumFolderView_Deprecated: Couldn't get Album Settings" << endl;
+        kdWarning() << "AlbumFolderView: Couldn't get Album Settings" << endl;
         return;
     }
 
--- trunk/extragear/graphics/digikam/digikam/albumfolderview.h #437730:437731
@@ -50,6 +50,8 @@
     void albumDelete();
     void albumEdit();
     
+    void setAlbumThumbnail(PAlbum *album);    
+    
 private slots:
 
     void slotGotThumbnailFromIcon(const KURL& url, const QPixmap& thumbnail);
@@ -75,8 +77,6 @@
    
 private:
 
-    void setAlbumThumbnail(PAlbum *album);
-
     void albumNew(AlbumFolderViewItem *item);
     void albumEdit(AlbumFolderViewItem *item);    
     void albumDelete(AlbumFolderViewItem *item);
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #437730:437731
@@ -49,9 +49,7 @@
 #include "albummanager.h"
 #include "album.h"
 
-#include "albumfolderview_deprecated.h"
 #include "albumfolderview.h"
-#include "albumfolderitem_deprecated.h"
 #include "albumiconview.h"
 #include "albumiconitem.h"
 #include "albumsettings.h"
@@ -85,14 +83,12 @@
     mRightSidebar = new Sidebar(this, Sidebar::Right);    
     mRightSidebar->setSplitter(mSplitter);    
     
-    mFolderView_Deprecated = new AlbumFolderView_Deprecated(this);
     mFolderView = new AlbumFolderView(this);
     mDateFolderView = new DateFolderView(this);
     mTagFolderView = new TagFolderView(this);
     mSearchFolderView = new SearchFolderView(this);
     mTagFilterView = new TagFilterView(this);    
     
-    mMainSidebar->appendTab(mFolderView_Deprecated, SmallIcon("folder"), i18n("Albums (Old)"));
     mMainSidebar->appendTab(mFolderView, SmallIcon("folder"), i18n("Albums"));    
     mMainSidebar->appendTab(mDateFolderView, SmallIcon("date"), i18n("Dates"));
     mMainSidebar->appendTab(mTagFolderView, SmallIcon("tag"), i18n("Tags"));    
@@ -592,7 +588,7 @@
     if (!album || !album->type() == Album::PHYSICAL)
         return;
 
-    mFolderView_Deprecated->albumHighlight(dynamic_cast<PAlbum*>(album));
+    mFolderView->setAlbumThumbnail(dynamic_cast<PAlbum*>(album));
 }
 
 void DigikamView::slot_imageCopyResult(KIO::Job* job)
--- trunk/extragear/graphics/digikam/digikam/digikamview.h #437730:437731
@@ -39,7 +39,6 @@
 class KURL;
 
 class DigikamApp;
-class AlbumFolderView_Deprecated;
 class AlbumFolderView;
 class AlbumIconView;
 class AlbumIconItem;
@@ -76,7 +75,6 @@
 private:
 
     DigikamApp               *mParent;
-    AlbumFolderView_Deprecated          *mFolderView_Deprecated;
     AlbumFolderView          *mFolderView;    
     AlbumIconView            *mIconView;
     AlbumManager             *mAlbumMan;