sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

[gui] gray lock icon, and flat style for extent button

Browse Source
This commit is contained in:
nirvn 2016-07-28 15:29:28 +07:00
parent bc73c56e14
commit 6bd15ff79e
4 changed files with 414 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
images/images.qrc
View File

@ -105,6 +105,7 @@
<file>themes/default/join_round.png</file>
<file>themes/default/join_style.svg</file>
<file>themes/default/locked.svg</file>
<file>themes/default/lockedGray.svg</file>
<file>themes/default/mAction.svg</file>
<file>themes/default/mActionAdd.png</file>
<file>themes/default/mActionAdd.svg</file>

411
images/themes/default/lockedGray.svg Normal file
View File

@ -0,0 +1,411 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 15.0.2, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.0"
id="svg5692"
sodipodi:docname="lockedGray.svg"
inkscape:version="0.91 r13725"
inkscape:export-filename="/mnt/home1/robert/svn/graphics/trunk/toolbar-icons/24x24/unlocked.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
x="0px"
y="0px"
width="16"
height="16"
viewBox="0 0 16 16"
enable-background="new 0 0 24 24"
xml:space="preserve"><metadata
id="metadata18"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
id="defs16"><linearGradient
id="linearGradient3965"><stop
id="stop3971"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" /><stop
style="stop-color:#959595;stop-opacity:1;"
offset="0.85191339"
id="stop3977" /><stop
id="stop3979"
offset="0.91825092"
style="stop-color:#6f6f6f;stop-opacity:1;" /><stop
style="stop-color:#4a4a4a;stop-opacity:1;"
offset="1"
id="stop3969" /></linearGradient><linearGradient
id="linearGradient3645"><stop
id="stop3647"
offset="0"
style="stop-color:#edd400;stop-opacity:1;" /><stop
id="stop3649"
offset="1"
style="stop-color:#fff17a;stop-opacity:1;" /></linearGradient><linearGradient
id="linearGradient3657"><stop
id="stop3659"
offset="0"
style="stop-color:#fce94f;stop-opacity:1;" /><stop
id="stop3661"
offset="1"
style="stop-color:#e7ce04;stop-opacity:1;" /></linearGradient><linearGradient
id="linearGradient2877"><stop
id="stop2879"
offset="0"
style="stop-color:#edd400;stop-opacity:1;" /><stop
id="stop2881"
offset="1"
style="stop-color:#c2ad00;stop-opacity:1;" /></linearGradient><linearGradient
id="linearGradient4042"><stop
id="stop4044"
offset="0"
style="stop-color:#f2d6a9;stop-opacity:1;" /><stop
id="stop4046"
offset="1"
style="stop-color:#e9b96e;stop-opacity:1;" /></linearGradient><linearGradient
id="linearGradient2843"><stop
id="stop2845"
offset="0"
style="stop-color:#eeeeec;stop-opacity:1;" /><stop
id="stop2847"
offset="1"
style="stop-color:#c8c8c2;stop-opacity:1;" /></linearGradient><linearGradient
id="linearGradient2835"><stop
id="stop2837"
offset="0"
style="stop-color:#ccf2a6;stop-opacity:1;" /><stop
id="stop2839"
offset="1"
style="stop-color:#8ae234;stop-opacity:1;" /></linearGradient><inkscape:perspective
id="perspective3257"
inkscape:persp3d-origin="16 : 10.666667 : 1"
inkscape:vp_z="32 : 16 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_x="0 : 16 : 1"
sodipodi:type="inkscape:persp3d" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective6979" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective7934" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective8023" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective8057" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective8095" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective8219" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective8279" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective3803" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective3869" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective3929" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective3968" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective4002" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective4032" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective4053" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective2905" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective2979" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective2842" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective2978" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective3238" /><radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
r="6.158739"
fy="17.838446"
fx="0.5"
cy="17.838446"
cx="0.5"
id="radialGradient4048"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective4058" /><radialGradient
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
r="6.1587391"
fy="3.8663561"
fx="8.5770311"
cy="3.8663561"
cx="8.5770311"
id="radialGradient4048-2"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
inkscape:collect="always"
xlink:href="#linearGradient4042"
id="radialGradient4067"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-8.4170292)"
cx="0.5"
cy="17.838446"
fx="0.5"
fy="17.838446"
r="6.1587391" /><radialGradient
r="6.1587391"
fy="3.8663561"
fx="8.5770311"
cy="3.8663561"
cx="8.5770311"
gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
gradientUnits="userSpaceOnUse"
id="radialGradient4094"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.1587391"
fy="3.8663561"
fx="8.5770311"
cy="3.8663561"
cx="8.5770311"
gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
gradientUnits="userSpaceOnUse"
id="radialGradient4097"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.1587391"
fy="3.8663561"
fx="8.5770311"
cy="3.8663561"
cx="8.5770311"
gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
gradientUnits="userSpaceOnUse"
id="radialGradient4100"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.1587391"
fy="3.8663561"
fx="8.5770311"
cy="3.8663561"
cx="8.5770311"
gradientTransform="matrix(0.81185454,1.1365964,-1.1707271,0.83623306,20.063146,-1.4817979)"
gradientUnits="userSpaceOnUse"
id="radialGradient4103"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.158739"
fy="17.838446"
fx="0.5"
cy="17.838446"
cx="0.5"
gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
gradientUnits="userSpaceOnUse"
id="radialGradient4106"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.158739"
fy="17.838446"
fx="0.5"
cy="17.838446"
cx="0.5"
gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
gradientUnits="userSpaceOnUse"
id="radialGradient4109"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.158739"
fy="17.838446"
fx="0.5"
cy="17.838446"
cx="0.5"
gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
gradientUnits="userSpaceOnUse"
id="radialGradient4112"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.158739"
fy="17.838446"
fx="0.5"
cy="17.838446"
cx="0.5"
gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
gradientUnits="userSpaceOnUse"
id="radialGradient4115"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><radialGradient
r="6.158739"
fy="17.838446"
fx="0.5"
cy="17.838446"
cx="0.5"
gradientTransform="matrix(0.8118545,0.97422537,-1.1052481,0.9210397,19.809981,-0.4170292)"
gradientUnits="userSpaceOnUse"
id="radialGradient4118"
xlink:href="#linearGradient4042"
inkscape:collect="always" /><inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 0.5 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="1 : 0.5 : 1"
inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
id="perspective8198" /><linearGradient
gradientUnits="userSpaceOnUse"
y2="18.5"
x2="13.5"
y1="10.5"
x1="10.5"
id="linearGradient3663"
xlink:href="#linearGradient3657"
inkscape:collect="always" /><linearGradient
gradientTransform="translate(0,-3)"
y2="18.5"
x2="13.5"
y1="10.5"
x1="10.5"
gradientUnits="userSpaceOnUse"
id="linearGradient3669"
xlink:href="#linearGradient3657"
inkscape:collect="always" /></defs><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1865"
inkscape:window-height="1056"
id="namedview14"
showgrid="true"
inkscape:zoom="2"
inkscape:cx="103.50277"
inkscape:cy="-40.814624"
inkscape:window-x="55"
inkscape:window-y="24"
inkscape:window-maximized="1"
inkscape:current-layer="layer4"><inkscape:grid
type="xygrid"
id="grid4151"
dotted="false" /></sodipodi:namedview><g
id="layer4"
transform="translate(0,-16)"
inkscape:groupmode="layer"
inkscape:label="1"><linearGradient
id="rect2912_1_"
gradientUnits="userSpaceOnUse"
x1="303.85739"
y1="-376.5"
x2="308.1431"
y2="-376.5"
gradientTransform="matrix(1,0,0,-1,-326.294,-350.383)"><stop
offset="0"
style="stop-color:#E9B96E"
id="stop9" /><stop
offset="1"
style="stop-color:#E19E36"
id="stop11" /></linearGradient><path
style="fill:none;stroke:#888a85;stroke-width:3;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0"
d="m 4.4067695,22.865202 c 0.118637,-3.818452 0.9490726,-5.54713 3.8198656,-5.314294 2.8704699,0.232276 3.5159769,2.078983 3.3968089,5.897741"
sodipodi:nodetypes="ccc"
id="path2932_1_-0-1" /><path
style="fill:none;stroke:#eeeeec;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
inkscape:connector-curvature="0"
d="m 4.2757863,25 0.1166762,-2.134798 c 0.118637,-3.818452 0.9490726,-5.591324 3.8198656,-5.358488 2.8704699,0.232276 3.5159769,2.123177 3.3968089,5.941935 L 11.523631,25"
sodipodi:nodetypes="ccc"
id="path2932_1_-2" /><rect
style="opacity:1;fill:#666666;fill-opacity:1;stroke:#666666;stroke-width:0.99999994;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
id="rect4170-2"
width="11"
height="7"
x="2.5"
y="24.5"
rx="0.84615386"
ry="1" /></g></svg>
Side by Side

After

Width:  |  Height:  |  Size: 16 KiB

1
src/app/qgsstatusbarcoordinateswidget.cpp
View File

@ -67,6 +67,7 @@ QgsStatusBarCoordinatesWidget::QgsStatusBarCoordinatesWidget( QWidget *parent )
mToggleExtentsViewButton->setIcon( QgsApplication::getThemeIcon( "tracking.svg" ) );
mToggleExtentsViewButton->setToolTip( tr( "Toggle extents and mouse position display" ) );
mToggleExtentsViewButton->setCheckable( true );
mToggleExtentsViewButton->setAutoRaise( true );
connect( mToggleExtentsViewButton, SIGNAL( toggled( bool ) ), this, SLOT( extentsViewToggled( bool ) ) );
QHBoxLayout* layout = new QHBoxLayout( this );

2
src/app/qgsstatusbarscalewidget.cpp
View File

@ -50,7 +50,7 @@ QgsStatusBarScaleWidget::QgsStatusBarScaleWidget( QgsMapCanvas *canvas, QWidget
mScale->setToolTip( tr( "Current map scale (formatted as x:y)" ) );
mLockButton = new QToolButton();
mLockButton->setIcon( QIcon( QgsApplication::getThemeIcon( "/locked.svg" ) ) );
mLockButton->setIcon( QIcon( QgsApplication::getThemeIcon( "/lockedGray.svg" ) ) );
mLockButton->setToolTip( tr( "Lock the scale to use magnifier to zoom in or out." ) );
mLockButton->setCheckable( true );
mLockButton->setChecked( false );