[meld] Add new version control icon for tabs, make themeable and adapt
- From: Kai Willadsen <kaiw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [meld] Add new version control icon for tabs, make themeable and adapt
- Date: Wed, 5 Feb 2014 21:42:00 +0000 (UTC)
commit 8de140246f94f4b7e8f0acd9480d33b91a59d162
Author: Kai Willadsen <kai willadsen gmail com>
Date: Sat Jan 4 10:48:27 2014 +1000
Add new version control icon for tabs, make themeable and adapt
data/icons/COPYING | 6 +-
.../hicolor/16x16/apps/meld-version-control.png | Bin 0 -> 876 bytes
.../48x48/apps/meld-version-control.png} | Bin 2521 -> 2521 bytes
data/icons/svg/meld-vc-icon-22.svg | 561 ++++++++++++++++++++
data/icons/vc-icon.png | Bin 2067 -> 0 bytes
data/ui/tab-placeholder.ui | 2 +-
meld/meldwindow.py | 3 +-
7 files changed, 564 insertions(+), 8 deletions(-)
---
diff --git a/data/icons/COPYING b/data/icons/COPYING
index 0a8e0aa..962f2d0 100644
--- a/data/icons/COPYING
+++ b/data/icons/COPYING
@@ -6,11 +6,7 @@ emblem-meld-newer-file.png is taken from the gnome-icon-theme project at
gnome/8x8/emblems/emblem-new.png and is licensed under the terms of the
Creative Commons BY-SA 3.0 license. See COPYING_CCBYSA3 for details.
-meld-vc-icon.svg is derived from a combination of appointment-soon and
+meld-version-control.svg is derived from a combination of appointment-soon and
emblem-documents icons taken from the gnome-icon-theme project and is
licensed under the terms of the Creative Commons BY-SA 3.0 license. See
COPYING_CCBYSA3 for details.
-
-meld-locked.png and meld-unlocked.png are taken from the gnome-colors project
-at gnome-colors/gnome-colors-common/16x16/status/locked.png and unlocked.png,
-and are licensed under the GPL v2.
diff --git a/data/icons/hicolor/16x16/apps/meld-version-control.png
b/data/icons/hicolor/16x16/apps/meld-version-control.png
new file mode 100644
index 0000000..c4f2b60
Binary files /dev/null and b/data/icons/hicolor/16x16/apps/meld-version-control.png differ
diff --git a/data/icons/svg/meld-vc-icon-22.svg b/data/icons/svg/meld-vc-icon-22.svg
new file mode 100644
index 0000000..f87d038
--- /dev/null
+++ b/data/icons/svg/meld-vc-icon-22.svg
@@ -0,0 +1,561 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<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";
+ inkscape:export-ydpi="90"
+ inkscape:export-xdpi="90"
+ inkscape:export-filename="/home/kaiw/Hacking/meld/data/icons/vc-icon.png"
+ sodipodi:docname="meld-vc-icon-small-22.svg"
+ inkscape:version="0.48.4 r9939"
+ sodipodi:version="0.32"
+ id="svg249"
+ height="16"
+ width="16"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape"
+ version="1.1">
+ <defs
+ id="defs3">
+ <linearGradient
+ id="linearGradient4204">
+ <stop
+ id="stop4206"
+ offset="0"
+ style="stop-color:#ecd300;stop-opacity:1;" />
+ <stop
+ id="stop4208"
+ offset="1"
+ style="stop-color:#fcea50;stop-opacity:1;" />
+ </linearGradient>
+ <inkscape:perspective
+ sodipodi:type="inkscape:persp3d"
+ inkscape:vp_x="0 : 24 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_z="48 : 24 : 1"
+ inkscape:persp3d-origin="24 : 16 : 1"
+ id="perspective78" />
+ <linearGradient
+ id="linearGradient5048">
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="0"
+ id="stop5050" />
+ <stop
+ id="stop5056"
+ offset="0.5"
+ style="stop-color:black;stop-opacity:1;" />
+ <stop
+ style="stop-color:black;stop-opacity:0;"
+ offset="1"
+ id="stop5052" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4542">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop4544" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop4546" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient15662">
+ <stop
+ id="stop15664"
+ offset="0.0000000"
+ style="stop-color:#ffffff;stop-opacity:1.0000000;" />
+ <stop
+ id="stop15666"
+ offset="1.0000000"
+ style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <radialGradient
+ id="aigrd3"
+ cx="20.892099"
+ cy="64.567902"
+ r="5.257"
+ fx="20.892099"
+ fy="64.567902"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ offset="0"
+ style="stop-color:#F0F0F0"
+ id="stop15573" />
+ <stop
+ offset="1.0000000"
+ style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+ id="stop15575" />
+ </radialGradient>
+ <radialGradient
+ id="aigrd2"
+ cx="20.892099"
+ cy="114.5684"
+ r="5.256"
+ fx="20.892099"
+ fy="114.5684"
+ gradientUnits="userSpaceOnUse">
+ <stop
+ offset="0"
+ style="stop-color:#F0F0F0"
+ id="stop15566" />
+ <stop
+ offset="1.0000000"
+ style="stop-color:#9a9a9a;stop-opacity:1.0000000;"
+ id="stop15568" />
+ </radialGradient>
+ <linearGradient
+ id="linearGradient269">
+ <stop
+ id="stop270"
+ offset="0.0000000"
+ style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
+ <stop
+ id="stop271"
+ offset="1.0000000"
+ style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient259">
+ <stop
+ id="stop260"
+ offset="0.0000000"
+ style="stop-color:#fafafa;stop-opacity:1.0000000;" />
+ <stop
+ id="stop261"
+ offset="1.0000000"
+ style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4542"
+ id="radialGradient4548"
+ cx="24.306795"
+ cy="42.07798"
+ fx="24.306795"
+ fy="42.07798"
+ r="15.821514"
+ gradientTransform="matrix(1,0,0,0.284916,0,30.08928)"
+ gradientUnits="userSpaceOnUse" />
+ <inkscape:perspective
+ id="perspective5974"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <inkscape:perspective
+ id="perspective6134"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ cx="16"
+ cy="27.875"
+ r="12.125"
+ fx="16"
+ fy="27.875"
+ id="radialGradient6175"
+ xlink:href="#linearGradient6917"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2886598,0,19.828608)" />
+ <linearGradient
+ id="linearGradient6917">
+ <stop
+ id="stop6919"
+ style="stop-color:#000000;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop6921"
+ style="stop-color:#000000;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ cx="10.78257"
+ cy="15.491104"
+ r="17.709194"
+ fx="10.78257"
+ fy="15.491104"
+ id="radialGradient6177"
+ xlink:href="#linearGradient2322"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4044676,0,0,0.427577,4.3012139,2.476585)" />
+ <linearGradient
+ id="linearGradient2322">
+ <stop
+ id="stop2324"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2326"
+ style="stop-color:#c1c7bc;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ cx="10.5"
+ cy="10.498917"
+ r="10.495841"
+ fx="10.5"
+ fy="10.498917"
+ id="radialGradient5981"
+ xlink:href="#linearGradient2276"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.147084,4.691471e-7,-4.692465e-7,2.147071,1.426465,0.43105)" />
+ <linearGradient
+ id="linearGradient2276">
+ <stop
+ id="stop2278"
+ style="stop-color:#f57900;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2280"
+ style="stop-color:#fcaf3e;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="7.2744212"
+ y1="7.1350532"
+ x2="9.814188"
+ y2="5.6588697"
+ id="linearGradient5978"
+ xlink:href="#linearGradient2276"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.742212,0,0,2.838566,-4.403543,-5.255819)" />
+ <linearGradient
+ id="linearGradient6151">
+ <stop
+ id="stop6153"
+ style="stop-color:#f57900;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop6155"
+ style="stop-color:#fcaf3e;stop-opacity:1"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="25.593685"
+ y1="20.92672"
+ x2="26.1399"
+ y2="51.027462"
+ id="linearGradient5971"
+ xlink:href="#linearGradient2789"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient2789">
+ <stop
+ id="stop2791"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop2793"
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <linearGradient
+ x1="21.347506"
+ y1="45.17091"
+ x2="21.347506"
+ y2="4.3226557"
+ id="linearGradient5969"
+ xlink:href="#linearGradient2789"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ id="linearGradient6162">
+ <stop
+ id="stop6164"
+ style="stop-color:#ffffff;stop-opacity:1"
+ offset="0" />
+ <stop
+ id="stop6166"
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="1" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2322"
+ id="radialGradient6361"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.4044676,0,0,0.427577,4.3012139,2.476585)"
+ cx="10.78257"
+ cy="15.491104"
+ fx="10.78257"
+ fy="15.491104"
+ r="17.709194" />
+ <inkscape:perspective
+ id="perspective4045"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7064"
+ id="radialGradient7170"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.3208752,0,0,2.7356835,-20.460224,-35.059491)"
+ cx="15.25"
+ cy="20.75"
+ fx="15.25"
+ fy="20.75"
+ r="12" />
+ <linearGradient
+ id="linearGradient7064">
+ <stop
+ id="stop7066"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1" />
+ <stop
+ id="stop7068"
+ offset="1"
+ style="stop-color:#e0e0e0;stop-opacity:1;" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective4045-7"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ id="linearGradient7064-5">
+ <stop
+ id="stop7066-3"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1" />
+ <stop
+ id="stop7068-0"
+ offset="1"
+ style="stop-color:#e0e0e0;stop-opacity:1;" />
+ </linearGradient>
+ <inkscape:perspective
+ id="perspective4045-2"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <linearGradient
+ id="linearGradient7064-8">
+ <stop
+ id="stop7066-35"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1" />
+ <stop
+ id="stop7068-9"
+ offset="1"
+ style="stop-color:#e0e0e0;stop-opacity:1;" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4204"
+ id="radialGradient4240"
+ cx="78.634651"
+ cy="2.1147892"
+ fx="78.634651"
+ fy="2.1147892"
+ r="21.970839"
+ gradientTransform="matrix(0.99999986,-0.99999919,0.99999929,0.99999995,-56.543431,99.375195)"
+ gradientUnits="userSpaceOnUse" />
+ <inkscape:perspective
+ id="perspective2935"
+ inkscape:persp3d-origin="0.5 : 0.33333333 : 1"
+ inkscape:vp_z="1 : 0.5 : 1"
+ inkscape:vp_y="0 : 1000 : 0"
+ inkscape:vp_x="0 : 0.5 : 1"
+ sodipodi:type="inkscape:persp3d" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient7064-7"
+ id="radialGradient7170-5"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(2.424483,0,0,2.8285635,-21.723365,-36.817693)"
+ cx="15.25"
+ cy="20.75"
+ fx="15.25"
+ fy="20.75"
+ r="12" />
+ <linearGradient
+ id="linearGradient7064-7">
+ <stop
+ id="stop7066-32"
+ offset="0"
+ style="stop-color:#ffffff;stop-opacity:1" />
+ <stop
+ id="stop7068-7"
+ offset="1"
+ style="stop-color:#e0e0e0;stop-opacity:1;" />
+ </linearGradient>
+ </defs>
+ <sodipodi:namedview
+ inkscape:window-y="27"
+ inkscape:window-x="0"
+ inkscape:window-height="1381"
+ inkscape:window-width="2560"
+ inkscape:document-units="px"
+ inkscape:grid-bbox="true"
+ showgrid="true"
+ inkscape:current-layer="g6139"
+ inkscape:cy="6.8208442"
+ inkscape:cx="4.2739745"
+ inkscape:zoom="45.254834"
+ inkscape:pageshadow="2"
+ inkscape:pageopacity="0.0"
+ borderopacity="0.25490196"
+ bordercolor="#666666"
+ pagecolor="#ffffff"
+ id="base"
+ inkscape:showpageshadow="false"
+ inkscape:window-maximized="1"
+ inkscape:snap-global="true"
+ inkscape:snap-grids="false"
+ showguides="false"
+ inkscape:guide-bbox="true"
+ inkscape:snap-to-guides="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid2924"
+ empspacing="5"
+ visible="true"
+ enabled="true"
+ snapvisiblegridlinesonly="true" />
+ <sodipodi:guide
+ orientation="0,1"
+ position="-1.09375,22.21875"
+ id="guide3680" />
+ <sodipodi:guide
+ orientation="1,0"
+ position="-3.90625,21"
+ id="guide3682" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata4">
+ <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></dc:title>
+ <dc:subject>
+ <rdf:Bag>
+ <rdf:li>text</rdf:li>
+ <rdf:li>plaintext</rdf:li>
+ <rdf:li>regular</rdf:li>
+ <rdf:li>document</rdf:li>
+ </rdf:Bag>
+ </dc:subject>
+ <cc:license
+ rdf:resource="http://creativecommons.org/licenses/publicdomain/"; />
+ <dc:creator>
+ <cc:Agent>
+ <dc:title>Jakub Steiner</dc:title>
+ </cc:Agent>
+ </dc:creator>
+ <dc:source>http://jimmac.musichall.cz</dc:source>
+ </cc:Work>
+ <cc:License
+ rdf:about="http://creativecommons.org/licenses/publicdomain/";>
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Reproduction"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#Distribution"; />
+ <cc:permits
+ rdf:resource="http://creativecommons.org/ns#DerivativeWorks"; />
+ </cc:License>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:groupmode="layer"
+ id="layer6"
+ inkscape:label="Shadow"
+ transform="translate(-0.00275697,-32.005826)">
+ <g
+ id="g7110"
+ transform="matrix(0.49767377,0,0,0.49767377,1.043641,33.029039)">
+ <g
+ id="g7044"
+ transform="translate(0.18666072,-0.06222024)">
+ <rect
+
style="color:#000000;fill:url(#radialGradient7170);fill-opacity:1;fill-rule:nonzero;stroke:#555555;stroke-width:2.00934839;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+ id="rect7046"
+ width="22.017118"
+ height="26.113417"
+ x="0.8134473"
+ y="1.0328218"
+ rx="1.9152783"
+ ry="1.9518089" />
+ <rect
+ ry="0.48799875"
+ rx="0.47803572"
+ y="2.4017584"
+ x="2.1860912"
+ height="23.378391"
+ width="19.274141"
+ id="rect7050"
+
style="color:#000000;fill:none;stroke:#ffffff;stroke-width:1.37424231;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:10.43299961;stroke-opacity:0.94117647;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
/>
+ </g>
+ </g>
+ </g>
+ <g
+ style="display:inline"
+ inkscape:groupmode="layer"
+ inkscape:label="Base"
+ id="layer1"
+ transform="translate(-0.00275697,-32.005826)" />
+ <g
+ inkscape:groupmode="layer"
+ id="layer5"
+ inkscape:label="Text"
+ style="display:inline"
+ transform="translate(-0.00275697,-32.005826)">
+ <g
+ style="display:inline"
+ transform="matrix(0.12604879,0,0,0.12604879,11.549477,30.970981)"
+ id="layer1-8">
+ <g
+ id="g6139"
+ transform="matrix(1.4909844,0,0,1.4909844,-46.290409,19.770117)">
+ <path
+ d="m 15.092248,10.078017 a 6.4298335,7.0996166 0 1 1 -12.8596669,0 6.4298335,7.0996166 0 1 1
12.8596669,0 z"
+ transform="matrix(2.7107753,0,0,2.464925,0.447975,-1.8415564)"
+ id="path6158"
+
style="fill:url(#radialGradient6361);fill-opacity:1;stroke:#babdb6;stroke-width:0.31875288;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="M 23.96875,5.3393085 C 14.464374,5.3393085 6.75,13.021982 6.75,22.52681 c 0,0.385641
0.037527,0.776928 0.0625,1.15625 0.6004186,-8.960167 8.044364,-16.0312515 17.15625,-16.0312515 9.111887,0
16.555831,7.0710855 17.15625,16.0312515 0.02497,-0.379322 0.0625,-0.770609 0.0625,-1.15625 0,-9.504827
-7.714373,-17.1875016 -17.21875,-17.1875015 z"
+ id="path6160"
+ style="opacity:0.11855672;fill:#000000;fill-opacity:1;stroke:none"
+ inkscape:connector-curvature="0" />
+ <path
+ d="M 23.400838,-1.2407136 C 10.622276,-0.47572997 0.10545275,10.260063 0.10545275,22.857892 c
0,12.597829 10.11507425,24.098605 24.10054125,24.098605 13.985467,0 24.10193,-10.920497 24.10193,-24.098605
0,-13.1781077 -12.61208,-23.9341775 -24.10193,-24.0986056 -6.557002,0.32885657 -0.530041,-0.010467
-0.805156,0 z m 0.716852,9.8649712 c 8.149446,0.1348683 14.410992,6.5191664 14.410992,14.6615654 0,8.142399
-5.330234,14.608508 -14.322691,14.748914 -8.992457,0.140406 -15.0361853,-6.879426 -15.0361853,-15.177011
0,-8.297585 6.7984383,-14.3683367 14.9478843,-14.2334684 z"
+ id="path6162"
+
style="fill:url(#radialGradient4240);fill-opacity:1;stroke:#c4a200;stroke-width:4.25675061;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:nodetypes="czzccczzzzz"
+ inkscape:connector-curvature="0" />
+ <path
+ d="M 20.740426,12.896172 19.337399,27.597583 32.487575,25.08461 21.573515,24.430182 z"
+ id="path6168"
+
style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:5.32093811;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+ sodipodi:nodetypes="ccccc"
+ inkscape:connector-curvature="0" />
+ <path
+ d="m 24.251188,26.473425 a 3.8632725,3.7456952 0 0 1 -7.726545,0 3.8632725,3.7456952 0 1 1
7.726545,0 z"
+ id="path6170"
+
style="fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.82395309;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+ inkscape:connector-curvature="0" />
+ </g>
+ </g>
+ </g>
+</svg>
diff --git a/data/ui/tab-placeholder.ui b/data/ui/tab-placeholder.ui
index 205b22d..a97b360 100644
--- a/data/ui/tab-placeholder.ui
+++ b/data/ui/tab-placeholder.ui
@@ -156,7 +156,7 @@
<object class="GtkImage" id="image3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">meld-vc-icon</property>
+ <property name="icon_name">meld-version-control</property>
<property name="icon-size">6</property>
</object>
<packing>
diff --git a/meld/meldwindow.py b/meld/meldwindow.py
index e591f15..e3d5e82 100644
--- a/meld/meldwindow.py
+++ b/meld/meldwindow.py
@@ -668,8 +668,7 @@ class MeldWindow(gnomeglade.Component):
def append_vcview(self, location, auto_compare=False):
doc = vcview.VcView()
- # FIXME: need a good themed VC icon
- self._append_page(doc, "vc-icon")
+ self._append_page(doc, "meld-version-control")
location = location[0] if isinstance(location, list) else location
doc.set_location(location)
if auto_compare:
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
