Statusbar: Zoom: set different icons via data.icon
Better to opt for a more minimal icon set for the zoom controls in the statusbar otherwise we end up remanding too much attention for what it should be instead a secondary control set. - Improve minus and plus svgs and use them instead of the normal (lc_zoomout and lc_zoomin) that are used in view tab - Create zoomreset icon to be also used only on the statusbar Signed-off-by: Pedro Pinto Silva <pedro.silva@collabora.com> Change-Id: I24afe1b9e8e6098d1cb93d6d9ad246af8381609d
This commit is contained in:
Pedro Pinto Silva
Szymon Kłos
parent
c9528f5f7a
commit
bd64dbe7aa
4 changed files with 8 additions and 122 deletions
|
|
@ -1,57 +1,2 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?xml-stylesheet type="text/css" href="icons.css" ?><svg
|
||||
viewBox="0 0 24 24"
|
||||
version="1.1"
|
||||
id="svg2440"
|
||||
sodipodi:docname="minus.svg"
|
||||
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<defs
|
||||
id="defs2444" />
|
||||
<sodipodi:namedview
|
||||
id="namedview2442"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
showguides="true"
|
||||
inkscape:zoom="27.812867"
|
||||
inkscape:cx="8.9347136"
|
||||
inkscape:cy="14.669469"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1020"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="32"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="path2624">
|
||||
<sodipodi:guide
|
||||
position="4,17.240539"
|
||||
orientation="1,0"
|
||||
id="guide3562"
|
||||
inkscape:locked="false" />
|
||||
<sodipodi:guide
|
||||
position="17,16.112385"
|
||||
orientation="1,0"
|
||||
id="guide3564"
|
||||
inkscape:locked="false" />
|
||||
</sodipodi:namedview>
|
||||
<g
|
||||
id="path2624">
|
||||
<path
|
||||
style="color:#000000;fill:#696969;fill-opacity:0.8;stroke-width:1.4;stroke-linecap:round;stroke-miterlimit:0;-inkscape-stroke:none"
|
||||
d="M 5,12 H 19"
|
||||
id="path3405" />
|
||||
<path
|
||||
style="color:#000000;fill:#3a3a38;fill-opacity:1;stroke-linecap:round;stroke-miterlimit:0;-inkscape-stroke:none"
|
||||
d="M 6.6992187,11.300781 C 6.3132292,11.301212 6.0004304,11.614011 6,12 c 4.304e-4,0.385989 0.3132292,0.698788 0.6992187,0.699219 H 17.298828 C 17.68558,12.699867 17.999569,12.386752 18,12 17.999569,11.613248 17.68558,11.300133 17.298828,11.300781 Z"
|
||||
id="path3407"
|
||||
sodipodi:nodetypes="ccccccc" />
|
||||
</g>
|
||||
</svg>
|
||||
<?xml-stylesheet type="text/css" href="icons.css" ?>
|
||||
<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke-linecap="round" stroke-miterlimit="0"><path d="m5 12h14" color="#000000" fill="#696969" fill-opacity=".8" stroke-width="1.4" style="-inkscape-stroke:none"/><path d="m6.5173 12h10.965" color="#000000" fill="#3a3a38" style="-inkscape-stroke:none"/><path d="m6.5 12c-0.27614 0-0.5 0.22386-0.5 0.5s0.22386 0.5 0.5 0.5h11c0.27614 0 0.5-0.22386 0.5-0.5s-0.22386-0.5-0.5-0.5z" color="#000000" style="-inkscape-stroke:none"/></g></svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 2 KiB After Width: | Height: | Size: 565 B |
|
|
@ -1,62 +1,2 @@
|
|||
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
|
||||
<?xml-stylesheet type="text/css" href="icons.css" ?><svg
|
||||
viewBox="0 0 24 24"
|
||||
version="1.1"
|
||||
id="svg2440"
|
||||
sodipodi:docname="plus.svg"
|
||||
inkscape:version="1.2.2 (b0a8486541, 2022-12-01)"
|
||||
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
|
||||
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
|
||||
xmlns="http://www.w3.org/2000/svg"
|
||||
xmlns:svg="http://www.w3.org/2000/svg">
|
||||
<defs
|
||||
id="defs2444" />
|
||||
<sodipodi:namedview
|
||||
id="namedview2442"
|
||||
pagecolor="#ffffff"
|
||||
bordercolor="#666666"
|
||||
borderopacity="1.0"
|
||||
inkscape:showpageshadow="2"
|
||||
inkscape:pageopacity="0.0"
|
||||
inkscape:pagecheckerboard="0"
|
||||
inkscape:deskcolor="#d1d1d1"
|
||||
showgrid="false"
|
||||
showguides="true"
|
||||
inkscape:zoom="27.812867"
|
||||
inkscape:cx="8.9347136"
|
||||
inkscape:cy="14.669469"
|
||||
inkscape:window-width="1920"
|
||||
inkscape:window-height="1020"
|
||||
inkscape:window-x="0"
|
||||
inkscape:window-y="32"
|
||||
inkscape:window-maximized="1"
|
||||
inkscape:current-layer="path2624">
|
||||
<sodipodi:guide
|
||||
position="4,17.240539"
|
||||
orientation="1,0"
|
||||
id="guide3562"
|
||||
inkscape:locked="false" />
|
||||
<sodipodi:guide
|
||||
position="17,16.112385"
|
||||
orientation="1,0"
|
||||
id="guide3564"
|
||||
inkscape:locked="false" />
|
||||
</sodipodi:namedview>
|
||||
<g
|
||||
id="path2624">
|
||||
<path
|
||||
style="color:#000000;fill:#696969;fill-opacity:0.8;stroke-width:1.4;stroke-linecap:round;stroke-miterlimit:0;-inkscape-stroke:none"
|
||||
d="M 5,12 H 19"
|
||||
id="path3405" />
|
||||
<path
|
||||
style="color:#000000;fill:#3a3a38;fill-opacity:1;stroke-linecap:round;stroke-miterlimit:0;-inkscape-stroke:none"
|
||||
d="M 6.6992187,11.300781 C 6.3132292,11.301212 6.0004304,11.614011 6,12 c 4.304e-4,0.385989 0.3132292,0.698788 0.6992187,0.699219 H 17.298828 C 17.68558,12.699867 17.999569,12.386752 18,12 17.999569,11.613248 17.68558,11.300133 17.298828,11.300781 Z"
|
||||
id="path3407"
|
||||
sodipodi:nodetypes="ccccccc" />
|
||||
<path
|
||||
style="color:#000000;fill:#3a3a38;fill-opacity:1;stroke-linecap:round;stroke-miterlimit:0;-inkscape-stroke:none"
|
||||
d="M 12.699219,6.6992187 C 12.698788,6.3132292 12.385989,6.0004304 12,6 11.614011,6.0004304 11.301212,6.3132292 11.300781,6.6992187 V 17.298828 C 11.300133,17.68558 11.613248,17.999569 12,18 c 0.386752,-4.31e-4 0.699867,-0.31442 0.699219,-0.701172 z"
|
||||
id="path3346"
|
||||
sodipodi:nodetypes="ccccccc" />
|
||||
</g>
|
||||
</svg>
|
||||
<?xml-stylesheet type="text/css" href="icons.css" ?>
|
||||
<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><g stroke-linecap="round" stroke-miterlimit="0"><path d="m5 12h14" color="#000000" fill="#696969" fill-opacity=".8" stroke-width="1.4" style="-inkscape-stroke:none"/><path d="m6.5173 12h10.965" color="#000000" fill="#3a3a38" style="-inkscape-stroke:none"/><path d="m6.5 12c-0.27614 0-0.5 0.22386-0.5 0.5s0.22386 0.5 0.5 0.5h11c0.27614 0 0.5-0.22386 0.5-0.5s-0.22386-0.5-0.5-0.5z" color="#000000" style="-inkscape-stroke:none"/><path d="m12.5 7c0-0.27614-0.22386-0.5-0.5-0.5s-0.5 0.22386-0.5 0.5v11c0 0.27614 0.22386 0.5 0.5 0.5s0.5-0.22386 0.5-0.5z" color="#000000" style="-inkscape-stroke:none"/></g></svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 2.4 KiB After Width: | Height: | Size: 735 B |
1
browser/images/zoomreset.svg
Normal file
1
browser/images/zoomreset.svg
Normal file
|
|
@ -0,0 +1 @@
|
|||
<svg version="1.1" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><path d="m19.5 19.5-5-5" fill="#3a3a38" stroke="#3a3a38" stroke-linecap="round" stroke-width="2"/><circle cx="12" cy="12" r="7" fill="#fafafa"/><path d="m12 4a8 8 0 0 0-8 8 8 8 0 0 0 8 8 8 8 0 0 0 8-8 8 8 0 0 0-8-8zm0 1a7 7 0 0 1 7 7 7 7 0 0 1-7 7 7 7 0 0 1-7-7 7 7 0 0 1 7-7z" fill="#3a3a38"/><path d="m10 15h2l0.0057-4.9956-0.0072-0.51072-1.1565 1.1007c-0.09712 0.08093-0.17951 0.12197-0.27258 0.09769-0.08902-0.02833-0.17717-0.14506-0.21359-0.19767l-0.3558-0.4944 2-2h1v7h1.2881v1h-4.2881z" fill="#1e8bcd"/></svg>
|
||||
|
After Width: | Height: | Size: 591 B |
|
|
@ -248,10 +248,10 @@ class StatusBar extends JSDialog.Toolbar {
|
|||
{type: 'customtoolitem', id: 'next', command: 'next', text: _UNO('.uno:PageDown', 'text')},
|
||||
{type: 'separator', id: 'prevnextbreak', orientation: 'vertical'},
|
||||
].concat(window.mode.isTablet() ? [] : [
|
||||
{type: 'customtoolitem', id: 'zoomreset', command: 'zoomreset', text: _('Reset zoom')},
|
||||
{type: 'customtoolitem', id: 'zoomout', command: 'zoomout', text: _UNO('.uno:ZoomMinus')},
|
||||
{type: 'customtoolitem', id: 'zoomreset', command: 'zoomreset', text: _('Reset zoom'), icon: 'zoomreset.svg'},
|
||||
{type: 'customtoolitem', id: 'zoomout', command: 'zoomout', text: _UNO('.uno:ZoomMinus'), icon: 'minus.svg'},
|
||||
{type: 'menubutton', id: 'zoom', text: '100', selected: 'zoom100', menu: this._generateZoomItems(), image: false},
|
||||
{type: 'customtoolitem', id: 'zoomin', command: 'zoomin', text: _UNO('.uno:ZoomPlus')}
|
||||
{type: 'customtoolitem', id: 'zoomin', command: 'zoomin', text: _UNO('.uno:ZoomPlus'), icon: 'plus.svg'}
|
||||
]);
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue