Skip to content

Commit

Permalink
Add shortcut to GPS settings
Browse files Browse the repository at this point in the history
  • Loading branch information
nyalldawson committed Nov 4, 2022
1 parent a98b802 commit f0c45c0
Show file tree
Hide file tree
Showing 4 changed files with 36 additions and 0 deletions.
12 changes: 12 additions & 0 deletions src/app/gps/qgsappgpssettingsmenu.cpp
Expand Up @@ -15,6 +15,8 @@

#include "qgsappgpssettingsmenu.h"
#include "qgssettings.h"
#include "qgisapp.h"
#include "qgsapplication.h"

#include <QRadioButton>
#include <QButtonGroup>
Expand Down Expand Up @@ -141,6 +143,16 @@ QgsAppGpsSettingsMenu::QgsAppGpsSettingsMenu( QWidget *parent )

addSeparator();
addAction( rotateAction );

addSeparator();
QAction *settingsAction = new QAction( tr( "GPS Settings…" ), this );
settingsAction->setIcon( QgsApplication::getThemeIcon( QStringLiteral( "/mActionOptions.svg" ) ) );
connect( settingsAction, &QAction::triggered, this, [ = ]
{
QgisApp::instance()->showOptionsDialog( QgisApp::instance(), QStringLiteral( "mGpsOptions" ) );
} );

addAction( settingsAction );
}

bool QgsAppGpsSettingsMenu::locationMarkerVisible() const
Expand Down
6 changes: 6 additions & 0 deletions src/app/gps/qgsgpsinformationwidget.cpp
Expand Up @@ -41,6 +41,7 @@
#include "qgsgui.h"
#include "qgslinesymbol.h"
#include "qgssymbollayerutils.h"
#include "qgsappgpssettingsmenu.h"

// QWT Charting widget

Expand Down Expand Up @@ -84,6 +85,11 @@ QgsGpsInformationWidget::QgsGpsInformationWidget( QgsAppGpsConnection *connectio
connect( mBtnCloseFeature, &QPushButton::clicked, this, &QgsGpsInformationWidget::mBtnCloseFeature_clicked );
connect( mBtnResetFeature, &QToolButton::clicked, this, &QgsGpsInformationWidget::mBtnResetFeature_clicked );

mBtnPopupOptions->setAutoRaise( true );
mBtnPopupOptions->setToolTip( tr( "Settings" ) );
mBtnPopupOptions->setMenu( QgisApp::instance()->gpsSettingsMenu() );
mBtnPopupOptions->setPopupMode( QToolButton::InstantPopup );

mLogFilename->setDialogTitle( tr( "GPS Log File" ) );
mLogFilename->setStorageMode( QgsFileWidget::SaveFile );
mLogFilename->setFilter( tr( "NMEA files" ) + " (*.nmea)" );
Expand Down
1 change: 1 addition & 0 deletions src/app/options/qgsgpsoptions.cpp
Expand Up @@ -35,6 +35,7 @@ QgsGpsOptionsWidget::QgsGpsOptionsWidget( QWidget *parent )
: QgsOptionsPageWidget( parent )
{
setupUi( this );
setObjectName( "mGpsOptions" );

connect( mRadAutodetect, &QRadioButton::toggled, mCboDevices, &QWidget::setDisabled );
connect( mRadAutodetect, &QRadioButton::toggled, mGpsdHost, &QWidget::setDisabled );
Expand Down
17 changes: 17 additions & 0 deletions src/ui/qgsgpsinformationwidgetbase.ui
Expand Up @@ -888,6 +888,23 @@ gray = no data
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mBtnPopupOptions">
<property name="toolTip">
<string>Options</string>
</property>
<property name="text">
<string>…</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/mActionOptions.svg</normaloff>:/images/themes/default/mActionOptions.svg</iconset>
</property>
<property name="autoRaise">
<bool>true</bool>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
Expand Down

0 comments on commit f0c45c0

Please sign in to comment.