[QGIS Commit] r13853 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-06-30 16:03:42 +0000 (Wed, 30 Jun 2010)
New Revision: 13853

Modified:
   trunk/qgis/src/app/qgisapp.cpp
Log:
fix #2852

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2010-06-30 14:07:07 UTC (rev 13852)
+++ trunk/qgis/src/app/qgisapp.cpp	2010-06-30 16:03:42 UTC (rev 13853)
@@ -4866,7 +4866,7 @@
   }
   else
   {
-    mpGpsDock->toggleViewAction();
+    mpGpsDock->setVisible( mpGpsDock->isHidden() );
   }
 #endif
 }
@@ -4885,7 +4885,7 @@
     mPanelMenu->addAction( mpTileScaleDock->toggleViewAction() );
     // now add our widget to the dock - ownership of the widget is passed to the dock
     mpTileScaleDock->setWidget( mpTileScaleWidget );
-    mpTileScaleWidget->show();
+    mpTileScaleDock->show();
 
     connect( mMapLegend, SIGNAL( currentLayerChanged( QgsMapLayer* ) ),
              mpTileScaleWidget, SLOT( layerChanged( QgsMapLayer* ) ) );
@@ -4893,7 +4893,7 @@
   }
   else
   {
-    mpTileScaleDock->toggleViewAction();
+    mpTileScaleDock->setVisible( mpTileScaleDock->isHidden() );
   }
 }