Commits

Anonymous committed 646d12f

Add icons for qguards and mq

  • Participants
  • Parent commits 11e5097

Comments (0)

Files changed (5)

File tortoisehg/hgqt/icons/mq.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="svg2"
+   viewBox="0 0 32 32"
+   height="100%"
+   width="100%"
+   version="1.0"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="qpush.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="642"
+     inkscape:window-height="485"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="7.375"
+     inkscape:cx="16"
+     inkscape:cy="15.728814"
+     inkscape:window-x="55"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <title
+     id="title3066">QPush</title>
+  <defs
+     id="defs4">
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective19" />
+    <linearGradient
+       id="linearGradient3703"
+       x1="15.891"
+       gradientUnits="userSpaceOnUse"
+       y1="3.6791"
+       gradientTransform="translate(1.045063,-0.90872269)"
+       x2="15.891"
+       y2="9.9421">
+      <stop
+         id="stop3689"
+         stop-color="#72d115"
+         offset="0" />
+      <stop
+         id="stop3691"
+         stop-color="#60b012"
+         offset="1" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective2835"
+       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="perspective2857"
+       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" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <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>QPush</dc:title>
+        <dc:date>2010-10-17</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peer Sommerlund</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:description>QPush icon for TortoiseHg</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:#eeeeec;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+     d="m 3.3336001,26.3321 19.9999999,0 5.3328,-5.3328 -19.9980003,0 -5.3347996,5.3328 z"
+     id="path3375-9-3" />
+  <path
+     style="fill:#eeeeec;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+     d="m 3.3335999,22.49925 20.0000001,0 5.3328,-5.3328 -19.9980001,0 -5.3348,5.3328 z"
+     id="path3375-9" />
+  <path
+     style="fill:#eeeeec;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+     d="m 3.3336,18.6664 20,0 5.3328,-5.3328 -19.998,0 -5.3348001,5.3328 z"
+     id="path3375" />
+  <path
+     style="fill:#eeeeec;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter"
+     d="m 3.3336,14.83355 20,0 5.3328,-5.3327999 -19.998,0 -5.3348001,5.3327999 z"
+     id="path3378" />
+  <g
+     id="patch-added"
+     transform="translate(-0.66400005,-8.3343)">
+    <path
+       id="path2865"
+       d="m 3.9976,19.335 20,0 5.3328,-5.3328 -19.998,0 -5.3348,5.3328 z"
+       style="fill:#b1cae4;stroke:#2e3436;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter" />
+  </g>
+</svg>

File tortoisehg/hgqt/icons/qguards.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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"
+   id="svg2"
+   viewBox="0 0 32 32"
+   height="100%"
+   width="100%"
+   version="1.0"
+   inkscape:version="0.47 r22583"
+   sodipodi:docname="qguards.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1385"
+     inkscape:window-height="875"
+     id="namedview17"
+     showgrid="false"
+     inkscape:zoom="10.429825"
+     inkscape:cx="4.8737295"
+     inkscape:cy="24.702506"
+     inkscape:window-x="55"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <title
+     id="title3066">QPush</title>
+  <defs
+     id="defs4">
+    <linearGradient
+       id="linearGradient3756">
+      <stop
+         style="stop-color:#cbc200;stop-opacity:1;"
+         offset="0"
+         id="stop3758" />
+      <stop
+         style="stop-color:#fffa80;stop-opacity:1;"
+         offset="1"
+         id="stop3760" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3748">
+      <stop
+         style="stop-color:#fff8ae;stop-opacity:1;"
+         offset="0"
+         id="stop3750" />
+      <stop
+         style="stop-color:#8f6a1b;stop-opacity:1;"
+         offset="1"
+         id="stop3752" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3734">
+      <stop
+         style="stop-color:#e4aa2d;stop-opacity:1;"
+         offset="0"
+         id="stop3736" />
+      <stop
+         style="stop-color:#ffed68;stop-opacity:1;"
+         offset="1"
+         id="stop3738" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3726">
+      <stop
+         style="stop-color:#ff0007;stop-opacity:1;"
+         offset="0"
+         id="stop3728" />
+      <stop
+         style="stop-color:#7d0003;stop-opacity:1;"
+         offset="1"
+         id="stop3730" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3714">
+      <stop
+         style="stop-color:#adff00;stop-opacity:1;"
+         offset="0"
+         id="stop3716" />
+      <stop
+         style="stop-color:#065a00;stop-opacity:1;"
+         offset="1"
+         id="stop3718" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient3643">
+      <stop
+         style="stop-color:#ffefa1;stop-opacity:1;"
+         offset="0"
+         id="stop3645" />
+      <stop
+         style="stop-color:#f7ee22;stop-opacity:1"
+         offset="1"
+         id="stop3647" />
+    </linearGradient>
+    <inkscape:perspective
+       sodipodi:type="inkscape:persp3d"
+       inkscape:vp_x="0 : 16 : 1"
+       inkscape:vp_y="0 : 1000 : 0"
+       inkscape:vp_z="32 : 16 : 1"
+       inkscape:persp3d-origin="16 : 10.666667 : 1"
+       id="perspective19" />
+    <linearGradient
+       id="linearGradient3703"
+       x1="15.891"
+       gradientUnits="userSpaceOnUse"
+       y1="3.6791"
+       gradientTransform="translate(1.045063,-0.90872269)"
+       x2="15.891"
+       y2="9.9421">
+      <stop
+         id="stop3689"
+         stop-color="#72d115"
+         offset="0" />
+      <stop
+         id="stop3691"
+         stop-color="#60b012"
+         offset="1" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective2835"
+       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="perspective2857"
+       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="perspective2854"
+       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="#linearGradient3643"
+       id="radialGradient3649"
+       cx="16"
+       cy="16"
+       fx="16"
+       fy="16"
+       r="13.006946"
+       gradientTransform="matrix(-1.0062903,0.83289722,-0.23484526,-0.28373552,35.85817,7.2134114)"
+       gradientUnits="userSpaceOnUse" />
+    <inkscape:perspective
+       id="perspective3659"
+       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="#linearGradient3643-4"
+       id="radialGradient3649-2"
+       cx="16"
+       cy="16"
+       fx="16"
+       fy="16"
+       r="13.006946"
+       gradientTransform="matrix(1,0,0,0.99478771,0,0.08339667)"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3643-4">
+      <stop
+         style="stop-color:#ffefa1;stop-opacity:1;"
+         offset="0"
+         id="stop3645-2" />
+      <stop
+         style="stop-color:#f7bf22;stop-opacity:1;"
+         offset="1"
+         id="stop3647-5" />
+    </linearGradient>
+    <inkscape:perspective
+       id="perspective3697"
+       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
+       inkscape:collect="always"
+       xlink:href="#linearGradient3714"
+       id="linearGradient3720"
+       x1="8.4119987"
+       y1="7.3709002"
+       x2="16"
+       y2="18.013456"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3726"
+       id="linearGradient3732"
+       x1="15.259119"
+       y1="11.026914"
+       x2="23.101662"
+       y2="23.217224"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3748"
+       id="linearGradient3754"
+       x1="8.8416662"
+       y1="5.6495795"
+       x2="23.63773"
+       y2="24.053825"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3756"
+       id="linearGradient3762"
+       x1="8.4119987"
+       y1="7.3709002"
+       x2="16"
+       y2="18.013456"
+       gradientUnits="userSpaceOnUse" />
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3643"
+       id="radialGradient3780"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(-1.0062903,0.83289722,-0.23484526,-0.28373552,35.85817,7.2134114)"
+       cx="16"
+       cy="16"
+       fx="16"
+       fy="16"
+       r="13.006946" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3748"
+       id="linearGradient3782"
+       gradientUnits="userSpaceOnUse"
+       x1="8.8416662"
+       y1="5.6495795"
+       x2="23.63773"
+       y2="24.053825" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3748"
+       id="linearGradient3788"
+       gradientUnits="userSpaceOnUse"
+       x1="26.147804"
+       y1="23.387173"
+       x2="5.2289853"
+       y2="5.4053836"
+       gradientTransform="translate(0,0.09375)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3748"
+       id="linearGradient3790"
+       x1="2.09375"
+       y1="15.90625"
+       x2="29.90625"
+       y2="15.90625"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,0.09375)" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3714"
+       id="linearGradient3806"
+       gradientUnits="userSpaceOnUse"
+       x1="8.4119987"
+       y1="7.3709002"
+       x2="16"
+       y2="18.013456" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3756"
+       id="linearGradient3808"
+       gradientUnits="userSpaceOnUse"
+       x1="8.4119987"
+       y1="7.3709002"
+       x2="16"
+       y2="18.013456" />
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3726"
+       id="linearGradient3810"
+       gradientUnits="userSpaceOnUse"
+       x1="15.259119"
+       y1="11.026914"
+       x2="23.101662"
+       y2="23.217224" />
+    <inkscape:perspective
+       id="perspective3822"
+       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="perspective3822-1"
+       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" />
+  </defs>
+  <metadata
+     id="metadata7">
+    <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>QPush</dc:title>
+        <dc:date>2010-10-17</dc:date>
+        <dc:creator>
+          <cc:Agent>
+            <dc:title>Peer Sommerlund</dc:title>
+          </cc:Agent>
+        </dc:creator>
+        <dc:description>QPush icon for TortoiseHg</dc:description>
+        <cc:license
+           rdf:resource="http://creativecommons.org/licenses/by-sa/3.0/" />
+      </cc:Work>
+      <cc:License
+         rdf:about="http://creativecommons.org/licenses/by-sa/3.0/">
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Reproduction" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#Distribution" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Notice" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#Attribution" />
+        <cc:permits
+           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
+        <cc:requires
+           rdf:resource="http://creativecommons.org/ns#ShareAlike" />
+      </cc:License>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="fill:url(#linearGradient3790);fill-opacity:1;stroke:url(#linearGradient3788);stroke-width:0.75;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     d="M 15.28125,3.0625 C 11.723173,6.0767363 7.1435452,8.1493369 2.46875,8.3125 2.9230173,17.309339 8.5564679,25.011902 16,29.625 23.454133,25.016735 29.075986,17.309968 29.53125,8.3125 24.552172,8.0919775 19.597376,5.8654381 16,2.375 l -0.71875,0.6875 z"
+     id="path2844-9" />
+  <g
+     id="g3792"
+     transform="matrix(0.92992534,0,0,0.92992534,1.1211946,1.2149445)">
+    <path
+       sodipodi:nodetypes="cscscscsc"
+       d="m 15.999999,28.31415 c 0,0 6.843131,-4.736212 9.387993,-9.472424 2.544861,-4.736212 2.993954,-9.6077419 2.993954,-9.6077419 0,0 -2.844257,-0.135321 -7.335188,-2.300446 C 16.555827,4.7684131 16.106733,3.6858502 16,3.6858502 c -0.106734,0 -0.555828,1.0825626 -5.04676,3.2476878 -4.4909298,2.1651254 -7.3351861,2.3004456 -7.3351861,2.3004456 0,0 0.4490932,4.8715304 2.9939543,9.6077424 2.544861,4.736212 9.3879908,9.472424 9.3879908,9.472424 z"
+       style="fill:url(#linearGradient3806);fill-opacity:1;stroke:url(#linearGradient3808);stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+       id="path2844-9-5" />
+    <path
+       id="path2844-9-5-6"
+       d="M 21.1875,7 C 19.322918,9.3834665 14.000362,16.232447 9.21875,22.375 12.208073,25.674051 16,28.3125 16,28.3125 c 0,0 6.830138,-4.732538 9.375,-9.46875 2.544861,-4.736212 3,-9.625 3,-9.625 0,0 -2.78837,-0.1264403 -7.1875,-2.21875 z"
+       style="fill:url(#linearGradient3810);fill-opacity:1;stroke:#e4aa2d;stroke-width:0;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+  </g>
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3812"
+     width="7.670311"
+     height="1.8696383"
+     x="6.6635823"
+     y="11.863305" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3812-6"
+     width="7.670311"
+     height="1.8696383"
+     x="16.44323"
+     y="15.914187" />
+  <rect
+     style="fill:#000000;fill-opacity:1;stroke:none"
+     id="rect3812-1"
+     width="7.670311"
+     height="1.8696383"
+     x="9.1307564"
+     y="-11.385618"
+     transform="matrix(0,1,-1,0,0,0)" />
+</svg>

File tortoisehg/hgqt/mq.py

         tb.setIcon(qtlib.geticon('qpush'))
         tb.setToolTip(_('Apply one patch'))
         self.setGuardsBtn = tb = QToolButton()
-        #tb.setIcon(qtlib.geticon('qpush'))
+        tb.setIcon(qtlib.geticon('qguards'))
         tb.setToolTip(_('Configure guards for selected patch'))
         self.qpushMoveBtn = tb = QToolButton()
         tb.setIcon(qtlib.geticon('qreorder'))

File tortoisehg/hgqt/workbench.py

         addtaskview('repobrowse', _("&Search..."))
         addtaskview('view-refresh', _("S&ynchronize..."))
         self.actionSelectTaskMQ = \
-                addtaskview('qreorder', _("Patch &Queue..."), 'mq')
+                addtaskview('mq', _("Patch &Queue..."), 'mq')
         self.actionSelectTaskPbranch = \
                 addtaskview('branch', _("&Patch Branch..."), 'pbranch')
         newseparator(menu='view')

File tortoisehg/hgqt/workbench.qrc

     <file>icons/qpopall.svg</file>
     <file>icons/qpushall.svg</file>
     <file>icons/qreorder.svg</file>
+    <file>icons/mq.svg</file>
+    <file>icons/qguards.svg</file>
     <file>icons/reviewboard.png</file>
     <file>icons/bookmark.png</file>
     <file>icons/extensions.svg</file>