Skip to content
Permalink
Browse files

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

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@14703 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Nov 17, 2010
1 parent 2d16bae commit c2a400ae9fe8f67bd18b78d9298760e591a89960
Showing with 162 additions and 150 deletions.
  1. +1 −1 src/app/qgisapp.cpp
  2. +161 −149 src/ui/qgslabelingguibase.ui
@@ -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 );

0 comments on commit c2a400a

Please sign in to comment.
You can’t perform that action at this time.