[QGIS Commit] r10286 - in trunk/qgis: python/gui src/app src/gui

[svn_qgis at osgeo.org]

Author: wonder
Date: 2009-03-16 10:22:07 -0400 (Mon, 16 Mar 2009)
New Revision: 10286

Modified:
   trunk/qgis/python/gui/qgisinterface.sip
   trunk/qgis/src/app/qgisappinterface.cpp
   trunk/qgis/src/app/qgisappinterface.h
   trunk/qgis/src/gui/qgisinterface.h
Log:
Applied patch from Andrej Krutak - added removeDockWidget() to interface.


Modified: trunk/qgis/python/gui/qgisinterface.sip
===================================================================
--- trunk/qgis/python/gui/qgisinterface.sip	2009-03-16 14:03:24 UTC (rev 10285)
+++ trunk/qgis/python/gui/qgisinterface.sip	2009-03-16 14:22:07 UTC (rev 10286)
@@ -87,6 +87,9 @@
     /** Add a dock widget to the main window */
     virtual void addDockWidget ( Qt::DockWidgetArea area, QDockWidget * dockwidget )=0;
 
+	/** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
+	virtual void removeDockWidget ( QDockWidget * dockwidget )=0;
+
     /** refresh legend of a layer */
     virtual void refreshLegend( QgsMapLayer * layer )=0;
 

Modified: trunk/qgis/src/app/qgisappinterface.cpp
===================================================================
--- trunk/qgis/src/app/qgisappinterface.cpp	2009-03-16 14:03:24 UTC (rev 10285)
+++ trunk/qgis/src/app/qgisappinterface.cpp	2009-03-16 14:22:07 UTC (rev 10286)
@@ -162,6 +162,11 @@
   qgis->addDockWidget( area, dockwidget );
 }
 
+void QgisAppInterface::removeDockWidget( QDockWidget * dockwidget )
+{
+  qgis->removeDockWidget( dockwidget );
+}
+
 void QgisAppInterface::refreshLegend( QgsMapLayer *l )
 {
   if ( l && qgis && qgis->legend() )

Modified: trunk/qgis/src/app/qgisappinterface.h
===================================================================
--- trunk/qgis/src/app/qgisappinterface.h	2009-03-16 14:03:24 UTC (rev 10285)
+++ trunk/qgis/src/app/qgisappinterface.h	2009-03-16 14:22:07 UTC (rev 10286)
@@ -102,6 +102,9 @@
     /** Add a dock widget to the main window */
     void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget );
 
+	/** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
+	void removeDockWidget ( QDockWidget * dockwidget );
+
     virtual void refreshLegend( QgsMapLayer *l );
 
     /** Add window to Window menu. The action title is the window title

Modified: trunk/qgis/src/gui/qgisinterface.h
===================================================================
--- trunk/qgis/src/gui/qgisinterface.h	2009-03-16 14:03:24 UTC (rev 10285)
+++ trunk/qgis/src/gui/qgisinterface.h	2009-03-16 14:22:07 UTC (rev 10286)
@@ -118,6 +118,9 @@
     /** Add a dock widget to the main window */
     virtual void addDockWidget( Qt::DockWidgetArea area, QDockWidget * dockwidget ) = 0;
 
+	/** Remove specified dock widget from main window (doesn't delete it). Added in QGIS 1.1. */
+	virtual void removeDockWidget ( QDockWidget * dockwidget )=0;
+
     /** refresh the legend of a layer */
     virtual void refreshLegend( QgsMapLayer *l ) = 0;