Merge lp:~ochosi/xfpanel-switch/dedicated_icon into lp:~xfpanel-switch-dev/xfpanel-switch/trunk

[Simon Steinbeiß]

Add an icon for xfpanel-switch (in order to have full AppStream support) and rename the desktop file to "Xfce Panel Layouts"

TODO: Update the Makefile to install the icon files.

Unmerged revisions

62. By Simon Steinbeiß on 2017-01-07

Add dedicated icon for xfpanel-switch

61. By Simon Steinbeiß on 2017-01-07

Rename application from Switch to Layouts

=== added directory 'data/icons'
=== added directory 'data/icons/16x16'
=== added file 'data/icons/16x16/xfpanel-switch.png'
Binary files data/icons/16x16/xfpanel-switch.png	1970-01-01 00:00:00 +0000 and data/icons/16x16/xfpanel-switch.png	2017-01-07 21:33:02 +0000 differ
=== added directory 'data/icons/48x48'
=== added file 'data/icons/48x48/xfpanel-switch.png'
Binary files data/icons/48x48/xfpanel-switch.png	1970-01-01 00:00:00 +0000 and data/icons/48x48/xfpanel-switch.png	2017-01-07 21:33:02 +0000 differ
=== added directory 'data/icons/64x64'
=== added file 'data/icons/64x64/xfpanel-switch.png'
Binary files data/icons/64x64/xfpanel-switch.png	1970-01-01 00:00:00 +0000 and data/icons/64x64/xfpanel-switch.png	2017-01-07 21:33:02 +0000 differ
=== added directory 'data/icons/scalable'
=== added file 'data/icons/scalable/xfpanel-switch.svg'
--- data/icons/scalable/xfpanel-switch.svg	1970-01-01 00:00:00 +0000
+++ data/icons/scalable/xfpanel-switch.svg	2017-01-07 21:33:02 +0000
@@ -0,0 +1,269 @@
+<?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"
+   version="1.1"
+   width="64"
+   height="64"
+   id="svg1325"
+   inkscape:version="0.48.4 r9939"
+   sodipodi:docname="xfce4-panel.svg">
+  <metadata
+     id="metadata51">
+    <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>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1419"
+     inkscape:window-height="855"
+     id="namedview49"
+     showgrid="false"
+     inkscape:zoom="7.1889189"
+     inkscape:cx="7.1446738"
+     inkscape:cy="31.473423"
+     inkscape:window-x="229"
+     inkscape:window-y="197"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg1325" />
+  <defs
+     id="defs1327">
+    <linearGradient
+       id="linearGradient3958">
+      <stop
+         id="stop3960"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop3962"
+         style="stop-color:black;stop-opacity:1"
+         offset="0.51514298" />
+      <stop
+         id="stop3964"
+         style="stop-color:black;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       id="linearGradient2270">
+      <stop
+         id="stop2272"
+         style="stop-color:white;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2274"
+         style="stop-color:white;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="31.669502"
+       y1="17"
+       x2="31.653906"
+       y2="47"
+       id="linearGradient2268"
+       xlink:href="#linearGradient2181"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-8)" />
+    <linearGradient
+       x1="23.99696"
+       y1="18.375"
+       x2="23.787659"
+       y2="46"
+       id="linearGradient1341"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="translate(0,-8)" />
+    <linearGradient
+       id="linearGradient2181">
+      <stop
+         id="stop2183"
+         style="stop-color:#f0f0f0;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2185"
+         style="stop-color:#d3d3d3;stop-opacity:1"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="9.5"
+       cy="24"
+       r="5.5"
+       fx="9.5"
+       fy="24"
+       id="radialGradient3890"
+       xlink:href="#linearGradient2181"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.5177196,1.0726872e-7,-1.6705603e-7,2.3636362,-4.9183319,-32.727271)" />
+    <linearGradient
+       x1="9.5"
+       y1="12"
+       x2="9.5"
+       y2="36"
+       id="linearGradient3898"
+       xlink:href="#linearGradient2270"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       x1="44"
+       y1="24"
+       x2="50"
+       y2="24"
+       id="linearGradient3976"
+       xlink:href="#linearGradient3958"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       id="mask3972">
+      <rect
+         width="49"
+         height="32"
+         x="1"
+         y="8"
+         id="rect3974"
+         style="fill:url(#linearGradient3976);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       x1="44"
+       y1="24"
+       x2="50"
+       y2="24"
+       id="linearGradient3982"
+       xlink:href="#linearGradient3958"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       id="mask3978">
+      <rect
+         width="49"
+         height="32"
+         x="1"
+         y="8"
+         id="rect3980"
+         style="fill:url(#linearGradient3982);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       x1="44"
+       y1="24"
+       x2="50"
+       y2="24"
+       id="linearGradient3988"
+       xlink:href="#linearGradient3958"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       id="mask3984">
+      <rect
+         width="49"
+         height="32"
+         x="1"
+         y="8"
+         id="rect3986"
+         style="fill:url(#linearGradient3988);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       x1="44"
+       y1="24"
+       x2="50"
+       y2="24"
+       id="linearGradient3994"
+       xlink:href="#linearGradient3958"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       id="mask3990">
+      <rect
+         width="49"
+         height="32"
+         x="1"
+         y="8"
+         id="rect3992"
+         style="fill:url(#linearGradient3994);fill-opacity:1;stroke:none" />
+    </mask>
+    <linearGradient
+       x1="44"
+       y1="24"
+       x2="50"
+       y2="24"
+       id="linearGradient4000"
+       xlink:href="#linearGradient3958"
+       gradientUnits="userSpaceOnUse" />
+    <mask
+       id="mask3996">
+      <rect
+         width="49"
+         height="32"
+         x="1"
+         y="8"
+         id="rect3998"
+         style="fill:url(#linearGradient4000);fill-opacity:1;stroke:none" />
+    </mask>
+  </defs>
+  <rect
+     style="fill:url(#linearGradient2268);fill-opacity:1;stroke:#969696;stroke-width:0.77465439;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect1333"
+     mask="url(#mask3996)"
+     y="9.5"
+     x="2.5"
+     height="29"
+     width="46"
+     transform="matrix(1.2391304,0,0,1.3448276,-0.59782611,-0.2758624)" />
+  <rect
+     style="opacity:0.8;fill:none;stroke:url(#linearGradient1341);stroke-width:0.787135;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+     id="rect2210"
+     mask="url(#mask3990)"
+     y="10.5"
+     x="3.5"
+     height="27"
+     width="45"
+     transform="matrix(1.1777778,0,0,1.3703704,-0.62222222,-0.8888889)" />
+  <rect
+     style="color:#000000;fill:url(#radialGradient3890);fill-opacity:1;fill-rule:nonzero;stroke:#969696;stroke-width:0.84515423;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="rect1337"
+     mask="url(#mask3984)"
+     y="11.5"
+     x="4.5"
+     ry="1.625"
+     rx="1.625"
+     height="25"
+     width="10"
+     transform="matrix(1,0,0,1.4,0,-1.5999997)" />
+  <rect
+     style="opacity:0.7;color:#000000;fill:none;stroke:url(#linearGradient3898);stroke-width:0.83484709;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible"
+     id="rect2212"
+     mask="url(#mask3978)"
+     y="12.5"
+     x="5.5"
+     ry="0.5625"
+     rx="0.5625"
+     height="23"
+     width="8"
+     transform="matrix(1,0,0,1.4347826,0,-2.4347823)" />
+  <path
+     style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none"
+     id="path2214"
+     mask="url(#mask3972)"
+     d="M 8,23.5 11,21 11,26 8,23.5 z"
+     inkscape:connector-curvature="0"
+     transform="matrix(1.3333333,0,0,1.2,-3.6666664,3.8)" />
+  <path
+     id="path1881"
+     d="m 25.93357,39.329505 c -0.0286,-0.08162 0.04173,-0.46111 0.156279,-0.843318 0.22649,-0.755679 0.261925,-1.036342 0.140919,-1.116132 -0.04303,-0.02836 -0.305728,0.02731 -0.583795,0.12372 -0.580038,0.201114 -0.760985,0.16348 -0.75159,-0.15632 0.0069,-0.234784 0.22012,-0.544407 0.730132,-1.060222 l 0.298566,-0.301962 0.04481,-1.481648 c 0.03989,-1.31912 0.07191,-1.55334 0.291901,-2.135226 0.1359,-0.359467 0.373216,-0.84574 0.527369,-1.080608 0.154153,-0.234867 0.28154,-0.469997 0.283082,-0.522512 0.0015,-0.05251 -0.296721,-0.39722 -0.662808,-0.766013 -1.189915,-1.198705 -3.114717,-2.495805 -5.310079,-3.578395 -1.424454,-0.702436 -2.413263,-1.26143 -2.501589,-1.414203 -0.08918,-0.154249 0.111125,-0.08903 0.858816,0.279633 0.403045,0.198728 1.409345,0.606689 2.236221,0.906579 2.213385,0.802743 3.363184,1.483828 5.058618,2.996476 0.476388,0.42503 0.912523,0.80335 0.969187,0.840713 0.05667,0.03737 0.377589,-0.06048 0.713166,-0.21743 0.769311,-0.359806 1.107066,-0.348046 3.535889,0.123118 1.250015,0.242488 2.033964,0.34679 2.583189,0.343687 l 0.788531,-0.0044 0.42795,-0.725912 c 0.393578,-0.66761 0.42103,-0.754 0.341796,-1.075619 -0.204642,-0.83066 -0.0022,-1.769871 0.427596,-1.983905 0.487593,-0.242812 0.822354,0.04779 1.408775,1.22293 0.214367,0.429575 0.441779,0.763936 0.521168,0.766268 0.16675,0.0049 0.165131,-0.09627 -0.01357,-0.847856 -0.184906,-0.777668 -0.07709,-1.420022 0.297657,-1.773379 0.231636,-0.218417 0.331262,-0.25211 0.580667,-0.196384 0.580238,0.129646 0.821202,0.686008 0.906133,2.092159 0.0244,0.403869 0.08245,0.759427 0.129011,0.79013 0.04656,0.03071 0.579605,0.171474 1.184539,0.312826 3.008937,0.703085 4.222975,1.513571 4.185358,2.794129 -0.0085,0.289067 -0.08802,0.407075 -0.54384,0.806964 -0.53503,0.469382 -1.823734,1.195979 -3.477081,1.960448 -1.2504,0.578155 -1.298648,0.839291 -0.365539,1.978435 0.550936,0.672587 0.708029,1.001472 0.574838,1.203466 -0.08763,0.132892 -0.428961,0.07663 -1.474431,-0.243022 -1.061492,-0.324551 -1.171497,-0.241907 -0.625859,0.470193 0.706659,0.922238 0.83902,1.434204 0.402959,1.558635 -0.210947,0.0602 -0.988387,-0.225253 -2.432279,-0.893048 l -1.070143,-0.494935 -0.570196,0.09493 c -0.313609,0.05222 -1.59217,0.08581 -2.841247,0.07467 -2.171096,-0.01938 -2.325853,-0.0328 -3.516295,-0.304845 -1.197177,-0.273595 -1.253659,-0.27839 -1.463204,-0.124207 -0.119877,0.08821 -0.670269,0.518417 -1.223091,0.956026 -0.552823,0.437611 -1.032436,0.795242 -1.065808,0.794737 -0.03337,-4.71e-4 -0.08408,-0.06769 -0.112677,-0.149312 z m 16.374641,-6.046482 c 0.243393,-0.244201 0.188432,-0.553439 -0.07465,-0.420038 -0.302566,0.153422 -0.824417,0.723801 -0.761609,0.832435 0.07201,0.124544 0.522541,-0.09764 0.836261,-0.412397 z m -0.653943,-0.625671 c 0.259274,-0.10262 0.473123,-0.245029 0.475222,-0.316458 0.0051,-0.176797 -0.113762,-0.16726 -0.611296,0.04901 -0.874937,0.380317 -0.753264,0.61946 0.136074,0.26745 z m -0.905562,-1.517956 c 0.0014,-0.04775 -0.12345,-0.11841 -0.277452,-0.157007 -0.154003,-0.03859 -0.35789,-0.175409 -0.45308,-0.304026 -0.313822,-0.424012 -0.392325,-0.273663 -0.112957,0.216342 0.146392,0.256773 0.236623,0.313768 0.509423,0.32178 0.182336,0.0054 0.332666,-0.02933 0.33407,-0.07709 z m 0.387481,-0.957598 c 0.04917,-0.435826 -0.193863,-0.628259 -0.521436,-0.41287 -0.394247,0.259225 -0.217943,0.82062 0.245036,0.780255 0.19894,-0.01735 0.243603,-0.07671 0.2764,-0.367385 z m 3.918278,-0.929279 c 0.0036,-0.220453 0.57091,-1.325971 0.75362,-1.468758 0.282284,-0.220605 0.251432,0.01176 -0.08113,0.611039 -0.431919,0.778323 -0.676355,1.090088 -0.672488,0.857719 z m -0.64777,-0.472425 c 0.01194,-0.341347 0.121247,-0.652554 0.228116,-0.649414 0.05709,0.0016 0.06431,0.140496 0.01843,0.35456 -0.09147,0.426829 -0.258125,0.626143 -0.246546,0.294854 z M 18.000043,24.610528 c 0.0035,-0.120866 0.07034,-0.118905 0.141487,0.0042 0.03054,0.05281 0.01062,0.09472 -0.04437,0.0931 -0.05494,-0.0016 -0.09864,-0.04538 -0.09712,-0.09725 z"
+     style="fill:#030000;fill-opacity:1;stroke:none"
+     inkscape:connector-curvature="0" />
+</svg>

=== modified file 'xfpanel-switch.desktop.in'
--- xfpanel-switch.desktop.in	2015-08-12 22:53:37 +0000
+++ xfpanel-switch.desktop.in	2017-01-07 21:33:02 +0000
@@ -1,5 +1,5 @@
 [Desktop Entry]
-_Name=Xfce Panel Switch
+_Name=Xfce Panel Layouts
 _Comment=Backup and restore your panel configuration
 Exec=xfpanel-switch
 Terminal=false
@@ -8,4 +8,4 @@
 Categories=XFCE;GTK;Settings;DesktopSettings;X-XFCE;
 OnlyShowIn=XFCE;
 Keywords=Configuration;User;
-Icon=xfce4-panel
+Icon=xfpanel-switch