@@ -151,8 +151,8 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
151
151
mRecenterAction ->setEnabled ( false );
152
152
mCreateFeatureAction ->setEnabled ( false );
153
153
mAddTrackVertexAction ->setEnabled ( false );
154
- delete mLocationButton ;
155
- mLocationButton = nullptr ;
154
+ delete mInformationButton ;
155
+ mInformationButton = nullptr ;
156
156
break ;
157
157
case Qgis::GpsConnectionStatus::Connecting:
158
158
whileBlocking ( mConnectAction )->setChecked ( true );
@@ -162,8 +162,8 @@ QgsGpsToolBar::QgsGpsToolBar( QgsAppGpsConnection *connection, QgsMapCanvas *can
162
162
mRecenterAction ->setEnabled ( false );
163
163
mCreateFeatureAction ->setEnabled ( false );
164
164
mAddTrackVertexAction ->setEnabled ( false );
165
- delete mLocationButton ;
166
- mLocationButton = nullptr ;
165
+ delete mInformationButton ;
166
+ mInformationButton = nullptr ;
167
167
break ;
168
168
case Qgis::GpsConnectionStatus::Connected:
169
169
whileBlocking ( mConnectAction )->setChecked ( true );
@@ -206,12 +206,12 @@ void QgsGpsToolBar::updateLocationLabel()
206
206
const QgsPoint point = mConnection ->lastValidLocation ();
207
207
if ( point.isEmpty () )
208
208
{
209
- delete mLocationButton ;
210
- mLocationButton = nullptr ;
209
+ delete mInformationButton ;
210
+ mInformationButton = nullptr ;
211
211
}
212
212
else
213
213
{
214
- if ( !mLocationButton )
214
+ if ( !mInformationButton )
215
215
{
216
216
createLocationWidget ();
217
217
}
@@ -250,7 +250,7 @@ void QgsGpsToolBar::updateLocationLabel()
250
250
}
251
251
}
252
252
253
- mLocationButton ->setText ( parts.join ( ' ' ) );
253
+ mInformationButton ->setText ( parts.join ( ' ' ) );
254
254
}
255
255
256
256
// this is necessary to ensure that the toolbar in floating mode correctly resizes to fit the label!
@@ -375,10 +375,10 @@ void QgsGpsToolBar::destinationMenuAboutToShow()
375
375
376
376
void QgsGpsToolBar::createLocationWidget ()
377
377
{
378
- mLocationButton = new QToolButton ();
379
- mLocationButton ->setToolTip ( tr ( " Current GPS Location " ) );
378
+ mInformationButton = new QToolButton ();
379
+ mInformationButton ->setToolTip ( tr ( " Current GPS Information " ) );
380
380
381
- QMenu *locationMenu = new QMenu ( mLocationButton );
381
+ QMenu *locationMenu = new QMenu ( mInformationButton );
382
382
383
383
const Qgis::GpsInformationComponents visibleComponents = settingShowInToolbar.value ();
384
384
@@ -412,10 +412,10 @@ void QgsGpsToolBar::createLocationWidget()
412
412
} );
413
413
}
414
414
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 );
418
418
419
- insertWidget ( mSettingsMenuAction , mLocationButton );
419
+ insertWidget ( mSettingsMenuAction , mInformationButton );
420
420
}
421
421
0 commit comments