Put label icon on label toolbar. Some cleanups for labelling ui

git-svn-id: http://svn.osgeo.org/qgis/trunk@14703 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Nov 17, 2010 · 523b7b7 · 523b7b7
1 parent 1ce443f
commit 523b7b7
Show file tree

Hide file tree

Showing 2 changed files with 162 additions and 150 deletions.
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -1823,7 +1823,6 @@ void QgisApp::createToolBars()
   mAttributesToolBar->addAction( mActionMapTips );
   mAttributesToolBar->addAction( mActionShowBookmarks );
   mAttributesToolBar->addAction( mActionNewBookmark );
-  mAttributesToolBar->addAction( mActionLabeling );
 
   // Annotation tools
   bt = new QToolButton();
@@ -1871,6 +1870,7 @@ void QgisApp::createToolBars()
   mLabelToolBar = addToolBar( tr( "Label" ) );
   mLabelToolBar->setIconSize( myIconSize );
   mLabelToolBar->setObjectName( "Label" );
+  mLabelToolBar->addAction( mActionLabeling );
   mLabelToolBar->addAction( mActionMoveLabel );
   mLabelToolBar->addAction( mActionRotateLabel );
   mLabelToolBar->addAction( mActionChangeLabelProperties );