Legend: allow swapping of legend layers between toplevel layers and layers in a group (motivated by ticket #148 'Legend groups capture legend items')

mhugent · mhugent · commit 863c74a38536 · 2006-07-12T09:32:58.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5586 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/legend/qgslegend.cpp b/src/legend/qgslegend.cpp
@@ -228,21 +228,21 @@ void QgsLegend::mouseMoveEvent(QMouseEvent * e)
 		    {
 		      if(origin->parent() != dest->parent())
 			{
-			  dest->parent()->insertChild(dest->parent()->childCount(), origin);
-			  origin->moveItem(dest);
-			  dest->moveItem(origin);
-		      }
+			  moveItem(origin, dest);
+			  moveItem(dest, origin);
+			}
 		      else
-		      {
-			  dest->moveItem(origin);
-		      }
-		  }
-	      }
+			{
+			  moveItem(dest, origin);
+			}
+		    }
+		}
 	      else //over top of item
 	      {
 		  if (mItemBeingMoved != dest->nextSibling())
 		  {
-		      origin->moveItem(dest);
+		    //origin->moveItem(dest);
+		    moveItem(origin, dest);
 		  } 
 	      }
 	      setCurrentItem(origin);
diff --git a/src/legend/qgslegenditem.h b/src/legend/qgslegenditem.h
@@ -85,7 +85,7 @@ class QgsLegendItem : public QTreeWidgetItem
     QgsLegendItem* nextSibling();
     /**Returns the younger sibling or 0 if this item is the first child of its parent*/
     QgsLegendItem* findYoungerSibling();
-    /**Moves this item after as an older sibling after another item*/
+    /**Moves this item after (as an older sibling) another item*/
     void moveItem(QgsLegendItem* after);
     /**Removes all the children of this item. This function is for qt-4.0.1 compatibility, where
      'takeChildren()' does not yet exist*/
diff --git a/src/legend/qgslegendlayer.cpp b/src/legend/qgslegendlayer.cpp
@@ -93,10 +93,10 @@ QgsLegendItem::DRAG_ACTION QgsLegendLayer::accept(const QgsLegendItem* li) const
       LEGEND_ITEM_TYPE type = li->type();
       if ( type == LEGEND_LAYER)
 	{
-	  if(parent() == li->parent())
-	    {
+	  //if(parent() == li->parent())
+	  //{
 	      return REORDER;
-	    }
+	      //}
 	}
       else if(type == LEGEND_GROUP)
 	{

Original file line number	Diff line number	Diff line change
`@@ -228,21 +228,21 @@ void QgsLegend::mouseMoveEvent(QMouseEvent * e)`
`228`	`228`	`{`
`229`	`229`	`if(origin->parent() != dest->parent())`
`230`	`230`	`{`
`231`		`- dest->parent()->insertChild(dest->parent()->childCount(), origin);`
`232`		`- origin->moveItem(dest);`
`233`		`- dest->moveItem(origin);`
`234`		`- }`
	`231`	`+ moveItem(origin, dest);`
	`232`	`+ moveItem(dest, origin);`
	`233`	`+ }`
`235`	`234`	`else`
`236`		`- {`
`237`		`- dest->moveItem(origin);`
`238`		`- }`
`239`		`- }`
`240`		`- }`
	`235`	`+ {`
	`236`	`+ moveItem(dest, origin);`
	`237`	`+ }`
	`238`	`+ }`
	`239`	`+ }`
`241`	`240`	`else //over top of item`
`242`	`241`	`{`
`243`	`242`	`if (mItemBeingMoved != dest->nextSibling())`
`244`	`243`	`{`
`245`		`- origin->moveItem(dest);`
	`244`	`+ //origin->moveItem(dest);`
	`245`	`+ moveItem(origin, dest);`
`246`	`246`	`}`
`247`	`247`	`}`
`248`	`248`	`setCurrentItem(origin);`
Original file line number	Diff line number	Diff line change
`@@ -93,10 +93,10 @@ QgsLegendItem::DRAG_ACTION QgsLegendLayer::accept(const QgsLegendItem* li) const`
`93`	`93`	`LEGEND_ITEM_TYPE type = li->type();`
`94`	`94`	`if ( type == LEGEND_LAYER)`
`95`	`95`	`{`
`96`		`- if(parent() == li->parent())`
`97`		`- {`
	`96`	`+ //if(parent() == li->parent())`
	`97`	`+ //{`
`98`	`98`	`return REORDER;`
`99`		`- }`
	`99`	`+ //}`
`100`	`100`	`}`
`101`	`101`	`else if(type == LEGEND_GROUP)`
`102`	`102`	`{`