Skip to content
Permalink
Browse files

[ui] fix circular string button location and relocate undo/redo butto…

…ns (#3845)
  • Loading branch information
nirvn committed Dec 8, 2016
1 parent 01f2c44 commit c32be64ac8b999394696750a180cb977d9eb0480
Showing with 11 additions and 12 deletions.
  1. +9 −9 src/app/qgisapp.cpp
  2. +2 −3 src/ui/qgisapp.ui
@@ -2339,6 +2339,15 @@ void QgisApp::createToolBars()
layout->itemAt( i )->setAlignment( Qt::AlignLeft );
}

//circular string digitize tool button
QToolButton* tbAddCircularString = new QToolButton( mDigitizeToolBar );
tbAddCircularString->setPopupMode( QToolButton::MenuButtonPopup );
tbAddCircularString->addAction( mActionCircularStringCurvePoint );
tbAddCircularString->addAction( mActionCircularStringRadius );
tbAddCircularString->setDefaultAction( mActionCircularStringCurvePoint );
connect( tbAddCircularString, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
mDigitizeToolBar->insertWidget( mActionNodeTool, tbAddCircularString );

// move feature tool button
QToolButton* moveFeatureButton = new QToolButton( mDigitizeToolBar );
moveFeatureButton->setPopupMode( QToolButton::MenuButtonPopup );
@@ -2358,15 +2367,6 @@ void QgisApp::createToolBars()
connect( moveFeatureButton, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
mDigitizeToolBar->insertWidget( mActionNodeTool, moveFeatureButton );

//circular string digitize tool button
QToolButton* tbAddCircularString = new QToolButton( mDigitizeToolBar );
tbAddCircularString->setPopupMode( QToolButton::MenuButtonPopup );
tbAddCircularString->addAction( mActionCircularStringCurvePoint );
tbAddCircularString->addAction( mActionCircularStringRadius );
tbAddCircularString->setDefaultAction( mActionCircularStringCurvePoint );
connect( tbAddCircularString, SIGNAL( triggered( QAction * ) ), this, SLOT( toolButtonActionTriggered( QAction * ) ) );
mDigitizeToolBar->insertWidget( mActionMoveFeature, tbAddCircularString );

bt = new QToolButton();
bt->setPopupMode( QToolButton::MenuButtonPopup );
bt->addAction( mActionRotatePointSymbols );
@@ -374,6 +374,8 @@
<addaction name="mActionCutFeatures"/>
<addaction name="mActionCopyFeatures"/>
<addaction name="mActionPasteFeatures"/>
<addaction name="mActionUndo"/>
<addaction name="mActionRedo"/>
</widget>
<widget class="QToolBar" name="mAdvancedDigitizeToolBar">
<property name="windowTitle">
@@ -388,9 +390,6 @@
<attribute name="toolBarBreak">
<bool>false</bool>
</attribute>
<addaction name="mActionEnableTracing"/>
<addaction name="mActionUndo"/>
<addaction name="mActionRedo"/>
<addaction name="mActionRotateFeature"/>
<addaction name="mActionSimplifyFeature"/>
<addaction name="mActionAddRing"/>

0 comments on commit c32be64

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