fix #2852

jef · jef · commit 6ddd5e941337 · 2010-06-30T16:03:42.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@13853 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4866,7 +4866,7 @@ void QgisApp::showGpsTool()
   }
   else
   {
-    mpGpsDock->toggleViewAction();
+    mpGpsDock->setVisible( mpGpsDock->isHidden() );
   }
 #endif
 }
@@ -4885,15 +4885,15 @@ void QgisApp::showTileScale()
     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* ) ) );
 
   }
   else
   {
-    mpTileScaleDock->toggleViewAction();
+    mpTileScaleDock->setVisible( mpTileScaleDock->isHidden() );
   }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -4866,7 +4866,7 @@ void QgisApp::showGpsTool()`
`4866`	`4866`	`}`
`4867`	`4867`	`else`
`4868`	`4868`	`{`
`4869`		`- mpGpsDock->toggleViewAction();`
	`4869`	`+ mpGpsDock->setVisible( mpGpsDock->isHidden() );`
`4870`	`4870`	`}`
`4871`	`4871`	`#endif`
`4872`	`4872`	`}`
`@@ -4885,15 +4885,15 @@ void QgisApp::showTileScale()`
`4885`	`4885`	`mPanelMenu->addAction( mpTileScaleDock->toggleViewAction() );`
`4886`	`4886`	`// now add our widget to the dock - ownership of the widget is passed to the dock`
`4887`	`4887`	`mpTileScaleDock->setWidget( mpTileScaleWidget );`
`4888`		`- mpTileScaleWidget->show();`
	`4888`	`+ mpTileScaleDock->show();`
`4889`	`4889`
`4890`	`4890`	`connect( mMapLegend, SIGNAL( currentLayerChanged( QgsMapLayer* ) ),`
`4891`	`4891`	`mpTileScaleWidget, SLOT( layerChanged( QgsMapLayer* ) ) );`
`4892`	`4892`
`4893`	`4893`	`}`
`4894`	`4894`	`else`
`4895`	`4895`	`{`
`4896`		`- mpTileScaleDock->toggleViewAction();`
	`4896`	`+ mpTileScaleDock->setVisible( mpTileScaleDock->isHidden() );`
`4897`	`4897`	`}`
`4898`	`4898`	`}`
`4899`	`4899`