Skip to content

Commit aa65d7a

Browse files
author
jef
committedNov 14, 2010
show snapping menu entry also when docked
git-svn-id: http://svn.osgeo.org/qgis/trunk@14652 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bd13504 commit aa65d7a

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed
 

‎src/app/qgisapp.cpp

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
431431
addDockWidget( Qt::LeftDockWidgetArea, mUndoWidget );
432432
mUndoWidget->hide();
433433

434-
mSnappingDialog = new QgsSnappingDialog( this, mMapCanvas );
434+
mSnappingDialog = new QgsSnappingDialog( this, mMapCanvas );
435435
mSnappingDialog->setObjectName( "SnappingOption" );
436436

437437
mInternalClipboard = new QgsClipboard; // create clipboard
@@ -1450,18 +1450,11 @@ void QgisApp::createMenus()
14501450
mEditMenu->addAction( mActionNodeTool );
14511451
mEditMenu->addAction( mActionRotatePointSymbols );
14521452

1453-
QSettings myQsettings;
1454-
bool myDockFlag = myQsettings.value( "/qgis/dockSnapping", false ).toBool();
1455-
if ( !myDockFlag )
1456-
{
1457-
mActionEditSeparator4 = mEditMenu->addSeparator();
1458-
mEditMenu->addAction( mActionSnappingOptions );
1459-
}
1460-
14611453
if ( layout == QDialogButtonBox::GnomeLayout || layout == QDialogButtonBox::MacLayout )
14621454
{
14631455
mActionEditSeparator3 = mEditMenu->addSeparator();
14641456
mEditMenu->addAction( mActionOptions );
1457+
mEditMenu->addAction( mActionSnappingOptions );
14651458
mEditMenu->addAction( mActionConfigureShortcuts );
14661459
mEditMenu->addAction( mActionStyleManagerV2 );
14671460
mEditMenu->addAction( mActionCustomProjection );
@@ -1587,6 +1580,7 @@ void QgisApp::createMenus()
15871580
mSettingsMenu->addAction( mActionStyleManagerV2 );
15881581
mSettingsMenu->addAction( mActionConfigureShortcuts );
15891582
mSettingsMenu->addAction( mActionOptions );
1583+
mSettingsMenu->addAction( mActionSnappingOptions );
15901584
}
15911585
#endif
15921586

@@ -1737,6 +1731,7 @@ void QgisApp::createToolBars()
17371731
mAttributesToolBar->addAction( mActionIdentify );
17381732

17391733
QToolButton *bt = new QToolButton( mAttributesToolBar );
1734+
bt->setObjectName( "SelectTool" );
17401735
bt->setPopupMode( QToolButton::MenuButtonPopup );
17411736
bt->addAction( mActionSelect );
17421737
bt->addAction( mActionSelectRectangle );
@@ -1775,6 +1770,7 @@ void QgisApp::createToolBars()
17751770
mAttributesToolBar->addAction( mActionOpenTable );
17761771

17771772
bt = new QToolButton( mAttributesToolBar );
1773+
bt->setObjectName( "MeasureTool" );
17781774
bt->setPopupMode( QToolButton::MenuButtonPopup );
17791775
bt->addAction( mActionMeasure );
17801776
bt->addAction( mActionMeasureArea );
@@ -1804,6 +1800,7 @@ void QgisApp::createToolBars()
18041800

18051801
// Annotation tools
18061802
bt = new QToolButton();
1803+
bt->setObjectName( "AnnotationTool" );
18071804
bt->setPopupMode( QToolButton::MenuButtonPopup );
18081805
bt->addAction( mActionTextAnnotation );
18091806
bt->addAction( mActionFormAnnotation );

‎src/app/qgisapp.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,6 @@ class QgisApp : public QMainWindow
245245
QAction *actionNodeTool() { return mActionNodeTool; }
246246
QAction *actionEditSeparator2() { return mActionEditSeparator2; }
247247
QAction *actionSnappingOptions() { return mActionSnappingOptions; }
248-
QAction *actionEditSeparator4() { return mActionEditSeparator4; }
249248

250249
QAction *actionPan() { return mActionPan; }
251250
QAction *actionZoomIn() { return mActionZoomIn; }
@@ -914,7 +913,6 @@ class QgisApp : public QMainWindow
914913
QAction *mActionRotatePointSymbols;
915914
QAction *mActionEditSeparator3;
916915
QAction *mActionSnappingOptions;
917-
QAction *mActionEditSeparator4;
918916

919917
QAction *mActionPan;
920918
QAction *mActionZoomIn;

‎src/app/qgssnappingdialog.cpp

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class QgsSnappingDock : public QDockWidget
4545

4646
};
4747

48-
QgsSnappingDialog::QgsSnappingDialog( QWidget* parent, QgsMapCanvas* canvas ): QDialog( parent ), mMapCanvas( canvas )
48+
QgsSnappingDialog::QgsSnappingDialog( QWidget* parent, QgsMapCanvas* canvas ): QDialog( parent ), mMapCanvas( canvas ), mDock( 0 )
4949
{
5050
setupUi( this );
5151

@@ -90,7 +90,7 @@ void QgsSnappingDialog::closeEvent( QCloseEvent* event )
9090
{
9191
QDialog::closeEvent( event );
9292

93-
if ( mDock == NULL )
93+
if ( !mDock )
9494
{
9595
QSettings settings;
9696
settings.setValue( "/Windows/BetterSnapping/geometry", saveGeometry() );
@@ -219,3 +219,11 @@ void QgsSnappingDialog::apply()
219219
QgsProject::instance()->writeEntry( "Digitizing", "/LayerSnappingToleranceUnitList", toleranceUnitList );
220220
QgsProject::instance()->writeEntry( "Digitizing", "/LayerSnappingEnabledList", enabledList );
221221
}
222+
223+
void QgsSnappingDialog::show()
224+
{
225+
if( mDock )
226+
mDock->setVisible( true );
227+
else
228+
QDialog::show();
229+
}

‎src/app/qgssnappingdialog.h

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,16 +38,14 @@ class QgsSnappingDialog: public QDialog, private Ui::QgsSnappingDialogBase
3838
~QgsSnappingDialog();
3939

4040
public slots:
41-
/**
42-
* apply the changes
43-
*/
41+
//! apply the changes
4442
void apply();
45-
/**
46-
* update the Dialog
47-
*/
48-
void update();
4943

44+
//! update the Dialog
45+
void update();
5046

47+
//! show dialog or dock
48+
void show();
5149

5250
protected:
5351
/**Constructor

0 commit comments

Comments
 (0)