[Digikam-devel] extragear/graphics/digikam

[Jörn Ahrens]

SVN commit 449417 by jahrens:


Moved the sidebar stuff into libs/widgets and removed the albummanager
dependency, so we can use the sidebar in image editor and showfoto too.

CCMAIL: digikam-devel at kde.org



 M  +1 -1      digikam/Makefile.am  
 M  +5 -2      digikam/digikamview.cpp  
 M  +7 -3      digikam/digikamview.h  
 D             digikam/sidebar.cpp  
 D             digikam/sidebar.h  
 M  +4 -2      libs/widgets/Makefile.am  
 A             libs/widgets/sidebar.cpp   digikam/sidebar.cpp#449277 [License: GPL]
 A             libs/widgets/sidebar.h   digikam/sidebar.h#449277 [License: GPL]


--- trunk/extragear/graphics/digikam/digikam/Makefile.am #449416:449417
@@ -36,7 +36,7 @@
 			kipiinterface.cpp tagcreatedlg.cpp \
 			albumfiletip.cpp tagspopupmenu.cpp \
 			syncjob.cpp albumhistory.cpp scanlib.cpp \
-			imageinfo.cpp sidebar.cpp \
+			imageinfo.cpp \
 			datefolderview.cpp pixmapmanager.cpp \
 			tagfolderview.cpp tagfilterview.cpp monthwidget.cpp \
 			searchfolderview.cpp dio.cpp \
--- trunk/extragear/graphics/digikam/digikam/digikamview.cpp #449416:449417
@@ -72,7 +72,7 @@
 
     mAlbumMan = AlbumManager::instance();
 
-    mMainSidebar = new Sidebar(this, Sidebar::Left);
+    mMainSidebar = new Digikam::Sidebar(this, Digikam::Sidebar::Left);
     
     mSplitter = new QSplitter(this);
     
@@ -80,7 +80,7 @@
     
     mIconView = new AlbumIconView(mSplitter);
     
-    mRightSidebar = new Sidebar(this, Sidebar::Right);    
+    mRightSidebar = new Digikam::Sidebar(this, Digikam::Sidebar::Right);    
     mRightSidebar->setSplitter(mSplitter);    
     
     mFolderView = new AlbumFolderView(this);
@@ -203,6 +203,9 @@
     loadViewState();
     Album *album = mAlbumMan->findAlbum(mInitialAlbumID);
     mAlbumMan->setCurrentAlbum(album);
+    
+    mMainSidebar->loadViewState();
+    mRightSidebar->loadViewState();
 }
 
 void DigikamView::slot_sortAlbums(int order)
--- trunk/extragear/graphics/digikam/digikam/digikamview.h #449416:449417
@@ -34,6 +34,11 @@
 class Job;
 }
 
+namespace Digikam
+{
+class Sidebar;
+};
+
 class QString;
 class QIconViewItem;
 class KURL;
@@ -46,7 +51,6 @@
 class AlbumManager;
 class Album;
 class AlbumHistory;
-class Sidebar;
 class DateFolderView;
 class TagFolderView;
 class TagFilterView;
@@ -79,11 +83,11 @@
     AlbumIconView            *mIconView;
     AlbumManager             *mAlbumMan;
     AlbumHistory             *mAlbumHistory;
-    Sidebar                  *mMainSidebar;
+    Digikam::Sidebar         *mMainSidebar;
     DateFolderView           *mDateFolderView;
     TagFolderView            *mTagFolderView;
     SearchFolderView         *mSearchFolderView;
-    Sidebar                  *mRightSidebar;
+    Digikam::Sidebar         *mRightSidebar;
     TagFilterView            *mTagFilterView;
     int                      mInitialAlbumID;
     QSplitter                *mSplitter;
--- trunk/extragear/graphics/digikam/libs/widgets/Makefile.am #449416:449417
@@ -4,7 +4,8 @@
 
 libwidgets_la_SOURCES = imageregionwidget.cpp imagepaniconwidget.cpp \
 			histogramwidget.cpp colorgradientwidget.cpp imageselectionwidget.cpp \
-			imageguidewidget.cpp curveswidget.cpp imagepannelwidget.cpp
+			imageguidewidget.cpp curveswidget.cpp imagepannelwidget.cpp \
+			sidebar.cpp
 
 libwidgets_la_LDFLAGS = $(all_libraries) $(KDE_RPATH)
 
@@ -17,6 +18,7 @@
 
 digikaminclude_HEADERS = imageregionwidget.h imagepaniconwidget.h \
 			 histogramwidget.h colorgradientwidget.h imageselectionwidget.h \
-			 imageguidewidget.h curveswidget.h imagepannelwidget.h 
+			 imageguidewidget.h curveswidget.h imagepannelwidget.h \
+			 sidebar.h
 
 digikamincludedir = $(includedir)/digikam