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

Author: timlinux

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 );