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

List:       kde-commits
Subject:    extragear/graphics/kphotoalbum
From:       Miika Turkia <miika.turkia () gmail ! com>
Date:       2010-07-07 20:12:33
Message-ID: 20100707201233.65E5BAC8E9 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1147292 by mturkia:

Implemented automatic stacking of images. Images that are shot within specified
time frame are stacked together (supports also stacking of matching MD5 sum as
requested by someone on the IRC channel).


 M  +1 -0      CMakeLists.txt  
 M  +7 -0      ChangeLog  
 A             MainWindow/AutoStackImages.cpp   [License: GPL (v2+)]
 A             MainWindow/AutoStackImages.h   [License: GPL (v2+)]
 M  +10 -0     MainWindow/Window.cpp  
 M  +1 -0      MainWindow/Window.h  
 M  +2 -1      kphotoalbumui.rc  


--- trunk/extragear/graphics/kphotoalbum/CMakeLists.txt #1147291:1147292
@@ -163,6 +163,7 @@
 	${CMAKE_CURRENT_SOURCE_DIR}/MainWindow/RunDialog.cpp 
 	${CMAKE_CURRENT_SOURCE_DIR}/MainWindow/FeatureDialog.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/MainWindow/InvalidDateFinder.cpp 
+	${CMAKE_CURRENT_SOURCE_DIR}/MainWindow/AutoStackImages.cpp 
 	${CMAKE_CURRENT_SOURCE_DIR}/MainWindow/TokenEditor.cpp 
 	${CMAKE_CURRENT_SOURCE_DIR}/MainWindow/WelcomeDialog.cpp
 	${CMAKE_CURRENT_SOURCE_DIR}/MainWindow/Window.cpp 
--- trunk/extragear/graphics/kphotoalbum/ChangeLog #1147291:1147292
@@ -1,3 +1,10 @@
+2010-07-07  Miika Turkia <miika.turkia@gmail.com>
+
+	* Implemented automatic stacking of images. Images that are shot
+	within specified time frame are stacked together (supports also
+	stacking of matching MD5 sum as requested by someone on the IRC
+	channel).
+
 2010-07-03  Jesper K. Pedersen  <blackie@kdab.com>
 
 	* Continue reading info exif from files even if some fails. Thanks
--- trunk/extragear/graphics/kphotoalbum/MainWindow/Window.cpp #1147291:1147292
@@ -90,6 +90,7 @@
 #include "DateBar/DateBarWidget.h"
 #include "DB/ImageDateCollection.h"
 #include "InvalidDateFinder.h"
+#include "AutoStackImages.h"
 #include "DB/ImageInfo.h"
 #include "DB/ResultId.h"
 #include "DB/Result.h"
@@ -531,6 +532,12 @@
 #endif
 }
 
+void MainWindow::Window::slotAutoStackImages()
+{
+    AutoStackImages stacker( this );
+    if ( stacker.exec() == QDialog::Accepted )
+        showThumbNails();
+}
 
 DB::Result MainWindow::Window::selected()
 {
@@ -821,6 +828,9 @@
     a->setText( i18n("Read EXIF Info From Files...") );
 #endif
 
+    a = actionCollection()->addAction( QString::fromLatin1( "autoStack" ), this, \
SLOT ( slotAutoStackImages() ) ); +    a->setText( i18n("Automatically Stack \
Images...") ); +
 #ifdef SQLDB_SUPPORT
     a = actionCollection()->addAction( QString::fromLatin1("convertBackend"), this, \
SLOT( convertBackend() ) );  a->setText( i18n("Convert Backend...(Experimental!)" ) \
                );
--- trunk/extragear/graphics/kphotoalbum/MainWindow/Window.h #1147291:1147292
@@ -93,6 +93,7 @@
     void slotPasteInformation();
     void slotDeleteSelected();
     void slotReReadExifInfo();
+    void slotAutoStackImages();
     void slotSearch();
     void slotView( bool reuse = true, bool slideShow = false, bool random = false );
     void slotViewNewWindow();
--- trunk/extragear/graphics/kphotoalbum/kphotoalbumui.rc #1147291:1147292
@@ -1,5 +1,5 @@
 <!DOCTYPE kpartgui>
-<kpartgui name="kphotoalbum" version="39">
+<kpartgui name="kphotoalbum" version="40">
   <MenuBar>
     <Menu name="file">
       <Action name="exportHTML"/>
@@ -59,6 +59,7 @@
       <Action name="rescan"/>
       <Action name="recreateExifDB" />
       <Action name="reReadExifInfo" />
+      <Action name="autoStack" />
       <Action name="convertBackend" />
       <Separator/>
       <Action name="removeAllThumbs"/>


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