[Qgis-cvs-commits] qgis/src/legend qgslegend.cpp,1.25,1.26 qgslegenditem.h,1.6,1.7

[<mh...@us...>]

Update of /cvsroot/qgis/qgis/src/legend
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6765/src/legend

Modified Files:
	qgslegend.cpp qgslegenditem.h 
Log Message:
Changed definition of symbology compatibility for vector layers, some legend cleanups

Index: qgslegend.cpp
===================================================================
RCS file: /cvsroot/qgis/qgis/src/legend/qgslegend.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** qgslegend.cpp	3 Nov 2005 20:44:49 -0000	1.25
--- qgslegend.cpp	10 Nov 2005 22:22:28 -0000	1.26
***************
*** 323,368 ****
  	emit zOrderChanged(this);
        }
- 
-       /*QgsLegendItem::DRAG_ACTION daction= dest->accept(origin->type());
- 
-       if(dest && origin && getItemPos(dest) != mItemBeingMovedOrigPos)
-       {
- 	  if( daction == QgsLegendItem::INSERT )
- 	  {
- 	      dest->insert(origin);
- 	      placeCheckBoxes();
- 	  }
- 	  else if( daction == QgsLegendItem::REORDER)
- 	  {
- 	      if(!yCoordAboveCenter(dest, e->y())) //over bottom of item
- 	      {
- 		  if (mItemBeingMoved->nextSibling() != destItem)
- 		  {
- 		      if(origin->parent() != dest->parent())
- 		      {
- 			  dest->parent()->insertItem(origin);
- 			  mItemBeingMoved->moveItem(destItem);
- 			  destItem->moveItem(mItemBeingMoved);
- 		      }
- 		      else
- 		      {
- 			  destItem->moveItem(mItemBeingMoved);
- 		      }
- 		  }
- 	      }
- 	      else //over top of item
- 	      {
- 		  if (mItemBeingMoved != destItem->nextSibling())
- 		  {
- 		      mItemBeingMoved->moveItem(destItem);
- 		  } 
- 	      }
- 	      placeCheckBoxes();
- 	  }
- 	emit zOrderChanged(this);
- 	}*/
    }
    mMousePressedFlag = false;
!   mItemBeingMoved = NULL;
  }
  
--- 323,329 ----
  	emit zOrderChanged(this);
        }
    }
    mMousePressedFlag = false;
!   mItemBeingMoved = NULL; 
  }
  
***************
*** 565,569 ****
  	else
  	{
! 	    cbox->setGeometry(/*3*/2*treeStepSize()-14, ypos, 14, 14);
  	    cbox->show();
  	}
--- 526,530 ----
  	else
  	{
! 	    cbox->setGeometry(2*treeStepSize()-14, ypos, 14, 14);
  	    cbox->show();
  	}

Index: qgslegenditem.h
===================================================================
RCS file: /cvsroot/qgis/qgis/src/legend/qgslegenditem.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** qgslegenditem.h	3 Nov 2005 20:44:49 -0000	1.6
--- qgslegenditem.h	10 Nov 2005 22:22:28 -0000	1.7
***************
*** 78,82 ****
      virtual bool insert(QgsLegendItem* theItem, bool changesettings = true) {return false;}
      void print(QgsLegendItem * theItem);
!     /**Returns the younger sibling or 0 if this item is the first child*/
      QgsLegendItem* findYoungerSibling();
  protected:
--- 78,82 ----
      virtual bool insert(QgsLegendItem* theItem, bool changesettings = true) {return false;}
      void print(QgsLegendItem * theItem);
!     /**Returns the younger sibling or 0 if this item is the first child of its parent*/
      QgsLegendItem* findYoungerSibling();
  protected: