Skip to content

Commit 61bcc17

Browse files
committedNov 8, 2022
Rename button
1 parent ef97a7f commit 61bcc17

File tree

2 files changed

+16
-16
lines changed

2 files changed

+16
-16
lines changed
 

‎src/app/gps/qgsgpstoolbar.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,8 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
151151
mRecenterAction->setEnabled( false );
152152
mCreateFeatureAction->setEnabled( false );
153153
mAddTrackVertexAction->setEnabled( false );
154-
delete mLocationButton;
155-
mLocationButton = nullptr;
154+
delete mInformationButton;
155+
mInformationButton = nullptr;
156156
break;
157157
case Qgis::GpsConnectionStatus::Connecting:
158158
whileBlocking( mConnectAction )->setChecked( true );
@@ -162,8 +162,8 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
162162
mRecenterAction->setEnabled( false );
163163
mCreateFeatureAction->setEnabled( false );
164164
mAddTrackVertexAction->setEnabled( false );
165-
delete mLocationButton;
166-
mLocationButton = nullptr;
165+
delete mInformationButton;
166+
mInformationButton = nullptr;
167167
break;
168168
case Qgis::GpsConnectionStatus::Connected:
169169
whileBlocking( mConnectAction )->setChecked( true );
@@ -206,12 +206,12 @@ void QgsGpsToolBar::updateLocationLabel()
206206
const QgsPoint point = mConnection->lastValidLocation();
207207
if ( point.isEmpty() )
208208
{
209-
delete mLocationButton;
210-
mLocationButton = nullptr;
209+
delete mInformationButton;
210+
mInformationButton = nullptr;
211211
}
212212
else
213213
{
214-
if ( !mLocationButton )
214+
if ( !mInformationButton )
215215
{
216216
createLocationWidget();
217217
}
@@ -250,7 +250,7 @@ void QgsGpsToolBar::updateLocationLabel()
250250
}
251251
}
252252

253-
mLocationButton->setText( parts.join( ' ' ) );
253+
mInformationButton->setText( parts.join( ' ' ) );
254254
}
255255

256256
// this is necessary to ensure that the toolbar in floating mode correctly resizes to fit the label!
@@ -375,10 +375,10 @@ void QgsGpsToolBar::destinationMenuAboutToShow()
375375

376376
void QgsGpsToolBar::createLocationWidget()
377377
{
378-
mLocationButton = new QToolButton();
379-
mLocationButton->setToolTip( tr( "Current GPS Location" ) );
378+
mInformationButton = new QToolButton();
379+
mInformationButton->setToolTip( tr( "Current GPS Information" ) );
380380

381-
QMenu *locationMenu = new QMenu( mLocationButton );
381+
QMenu *locationMenu = new QMenu( mInformationButton );
382382

383383
const Qgis::GpsInformationComponents visibleComponents = settingShowInToolbar.value();
384384

@@ -412,10 +412,10 @@ void QgsGpsToolBar::createLocationWidget()
412412
} );
413413
}
414414

415-
mLocationButton->setMenu( locationMenu );
416-
mLocationButton->setAutoRaise( true );
417-
mLocationButton->setPopupMode( QToolButton::ToolButtonPopupMode::InstantPopup );
415+
mInformationButton->setMenu( locationMenu );
416+
mInformationButton->setAutoRaise( true );
417+
mInformationButton->setPopupMode( QToolButton::ToolButtonPopupMode::InstantPopup );
418418

419-
insertWidget( mSettingsMenuAction, mLocationButton );
419+
insertWidget( mSettingsMenuAction, mInformationButton );
420420
}
421421

‎src/app/gps/qgsgpstoolbar.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class QgsGpsToolBar : public QToolBar
7878

7979
QMenu *mDestinationLayerMenu = nullptr;
8080

81-
QPointer< QToolButton > mLocationButton;
81+
QPointer< QToolButton > mInformationButton;
8282

8383
QgsCoordinateReferenceSystem mWgs84CRS;
8484
bool mEnableAddVertexButton = true;

0 commit comments

Comments
 (0)
Please sign in to comment.