Skip to content

Commit 5ebe9d1

Browse files
nyalldawsonnyalldawson
committedJul 29, 2016
[gui] gray lock icon, and flat style for extent button
(cherry-picked from 6bd15ff)
·
ltr-2_18archive/master_2
1 parent b9f968d commit 5ebe9d1

File tree

4 files changed

+414
-1
lines changed

4 files changed

+414
-1
lines changed
 

‎images/images.qrc

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,7 @@
105105
<file>themes/default/join_round.png</file>
106106
<file>themes/default/join_style.svg</file>
107107
<file>themes/default/locked.svg</file>
108+
<file>themes/default/lockedGray.svg</file>
108109
<file>themes/default/mAction.svg</file>
109110
<file>themes/default/mActionAdd.png</file>
110111
<file>themes/default/mActionAdd.svg</file>

‎images/themes/default/lockedGray.svg

Lines changed: 411 additions & 0 deletions
Loading

‎src/app/qgsstatusbarcoordinateswidget.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ QgsStatusBarCoordinatesWidget::QgsStatusBarCoordinatesWidget( QWidget *parent )
6767
mToggleExtentsViewButton->setIcon( QgsApplication::getThemeIcon( "tracking.svg" ) );
6868
mToggleExtentsViewButton->setToolTip( tr( "Toggle extents and mouse position display" ) );
6969
mToggleExtentsViewButton->setCheckable( true );
70+
mToggleExtentsViewButton->setAutoRaise( true );
7071
connect( mToggleExtentsViewButton, SIGNAL( toggled( bool ) ), this, SLOT( extentsViewToggled( bool ) ) );
7172

7273
QHBoxLayout* layout = new QHBoxLayout( this );

‎src/app/qgsstatusbarscalewidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ QgsStatusBarScaleWidget::QgsStatusBarScaleWidget( QgsMapCanvas *canvas, QWidget
5050
mScale->setToolTip( tr( "Current map scale (formatted as x:y)" ) );
5151

5252
mLockButton = new QToolButton();
53-
mLockButton->setIcon( QIcon( QgsApplication::getThemeIcon( "/locked.svg" ) ) );
53+
mLockButton->setIcon( QIcon( QgsApplication::getThemeIcon( "/lockedGray.svg" ) ) );
5454
mLockButton->setToolTip( tr( "Lock the scale to use magnifier to zoom in or out." ) );
5555
mLockButton->setCheckable( true );
5656
mLockButton->setChecked( false );

0 commit comments

Comments
 (0)
Please sign in to comment.