[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-09-08 19:38:50
Message-ID: 20100908193850.B5381AC857 () svn ! kde ! org
[Download RAW message or body]

SVN commit 1173153 by mturkia:

Patch to display filter button correctly, enable collapsing super categories,
and copying with drag-drop categories (annotation dialog). Thanks to Reimar
Imhof for the patch.


 M  +4 -0      AnnotationDialog/ListSelect.cpp  
 M  +1 -1      CategoryListView/CheckDropItem.cpp  
 M  +6 -0      ChangeLog  
 M  +1 -1      ThumbnailView/SelectionInteraction.cpp  


--- trunk/extragear/graphics/kphotoalbum/AnnotationDialog/ListSelect.cpp #1173152:1173153
@@ -193,6 +193,7 @@
     } else {
         _and->hide();
         _or->hide();
+	_showSelectedOnly->show();
     }
     for ( Q3ListViewItemIterator itemIt( _listView ); *itemIt; ++itemIt )
         configureItem( dynamic_cast<CategoryListView::CheckDropItem*>(*itemIt) );
@@ -534,6 +535,7 @@
 {
     DB::CategoryItemPtr item = _category->itemsCategories();
 
+    _listView->setRootIsDecorated( true );
     addItems( item.data(), 0 );
     _listView->setSorting( 0 );
 }
@@ -542,6 +544,7 @@
 {
     QStringList items = _category->itemsInclCategories();
 
+    _listView->setRootIsDecorated( false );
     for( QStringList::ConstIterator itemIt = items.constBegin(); itemIt != items.constEnd(); ++itemIt ) \
                {
         CheckDropItem* item = new CheckDropItem( _listView, *itemIt, *itemIt );
         configureItem( item );
@@ -554,6 +557,7 @@
 {
     QStringList items = _category->itemsInclCategories();
 
+    _listView->setRootIsDecorated( false );
     int index = 100000; // This counter will be converted to a string, and compared, and we don't want \
                "1111" to be less than "2"
     for( QStringList::ConstIterator itemIt = items.constBegin(); itemIt != items.constEnd(); ++itemIt ) \
{  ++index;
--- trunk/extragear/graphics/kphotoalbum/CategoryListView/CheckDropItem.cpp #1173152:1173153
@@ -81,7 +81,7 @@
 
         memberMap.addMemberToGroup( _listView->category()->name(), newParent, child );
 
-        if ( !oldParent.isEmpty() )
+        if ( !oldParent.isEmpty() && e->dropAction()!=Qt::CopyAction )
             memberMap.removeMemberFromGroup( _listView->category()->name(), oldParent, child );
     }
 
--- trunk/extragear/graphics/kphotoalbum/ChangeLog #1173152:1173153
@@ -1,3 +1,9 @@
+2010-09-08  Miika Turkia <miika.turkia@gmail.com>
+
+	* Patch to display filter button correctly, enable collapsing super
+	categories, and copying with drag-drop categories (annotation dialog).
+	Thanks to Reimar Imhof for the patch.
+
 2010-09-07  Miika Turkia <miika.turkia@gmail.com>
 
 	* bugfix: Autostack set to ignore images with no exact timestamp
--- trunk/extragear/graphics/kphotoalbum/ThumbnailView/SelectionInteraction.cpp #1173152:1173153
@@ -42,7 +42,7 @@
 {
     _mousePressPos = event->pos();
     DB::ResultId mediaId = widget()->mediaIdUnderCursor();
-    _isMouseDragOperation = widget()->isSelected( mediaId ) & !( event->modifiers() );
+    _isMouseDragOperation = widget()->isSelected( mediaId ) && !( event->modifiers() );
     return _isMouseDragOperation;
 
 #ifdef KDAB_TEMPORARILY_REMOVED


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