diff --git a/sflphone-gtk/pixmaps/Makefile.am b/sflphone-gtk/pixmaps/Makefile.am
index 5cc6713898b5cfde0d403048b01f1b14e33a60f9..eef66c35fdac7f6da714352982ed20afca0b6a50 100644
--- a/sflphone-gtk/pixmaps/Makefile.am
+++ b/sflphone-gtk/pixmaps/Makefile.am
@@ -1,6 +1,6 @@
icondir = $(datadir)/pixmaps
icon_DATA = sflphone.png
-buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg speaker.svg fail.svg
+buttons_DATA = accept.svg current.svg transfert.svg hang_up.svg hold.svg unhold.svg refuse.svg call.svg ring.svg dial.svg mic.svg mic_25.svg mic_50.svg mic_75.svg speaker.svg speaker_25.svg speaker_50.svg speaker_75.svg fail.svg
buttonsdir = $(datadir)/sflphone
EXTRA_DIST = $(icon_DATA) $(buttons_DATA)
diff --git a/sflphone-gtk/pixmaps/mic.svg b/sflphone-gtk/pixmaps/mic.svg
index ec1ba1afbc794eb580d59abad311f01cabe4facc..9d8538330ff979298ebd167649a3abc9b81c4e3e 100644
--- a/sflphone-gtk/pixmaps/mic.svg
+++ b/sflphone-gtk/pixmaps/mic.svg
@@ -13,14 +13,25 @@
height="16"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45"
+ inkscape:version="0.45.1"
version="1.0"
- sodipodi:docbase="/home/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
- sodipodi:docname="mic.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true">
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docname="mic_25 (copy).svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3404">
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:1;"
+ offset="0"
+ id="stop3406" />
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:0;"
+ offset="1"
+ id="stop3408" />
+ </linearGradient>
<linearGradient
id="linearGradient3370">
<stop
@@ -253,25 +264,36 @@
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient3362"
- id="linearGradient3368"
+ id="linearGradient5436"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)"
x1="16.037382"
y1="3.6340783"
x2="0.9781428"
- y2="5.2185812"
- gradientUnits="userSpaceOnUse"
- gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)" />
+ y2="5.2185812" />
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient3370"
- id="radialGradient3392"
+ id="radialGradient5438"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)"
+ spreadMethod="pad"
cx="5.5446553"
cy="6.5377574"
fx="5.5446553"
fy="6.5377574"
- r="3.7829957"
+ r="3.7829957" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3404"
+ id="radialGradient5440"
gradientUnits="userSpaceOnUse"
- spreadMethod="pad"
- gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)" />
+ gradientTransform="matrix(1,0,0,0.2214765,0,4.4397305)"
+ cx="-3.5797281"
+ cy="5.7027574"
+ fx="-3.5797281"
+ fy="5.7027574"
+ r="6.5849319" />
</defs>
<sodipodi:namedview
id="base"
@@ -280,9 +302,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="1"
- inkscape:cx="24.480574"
- inkscape:cy="2.8150254"
+ inkscape:zoom="11.313708"
+ inkscape:cx="20.635709"
+ inkscape:cy="3.1660007"
inkscape:document-units="px"
inkscape:current-layer="layer1"
width="16px"
@@ -292,7 +314,7 @@
inkscape:window-width="1014"
inkscape:window-height="691"
inkscape:window-x="336"
- inkscape:window-y="282">
+ inkscape:window-y="209">
<sodipodi:guide
orientation="vertical"
position="24.821428"
@@ -313,24 +335,43 @@
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
- <path
- style="fill:url(#linearGradient3368);fill-opacity:1;stroke:#1d1d1d;stroke-width:1.11289036;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
- d="M 6.568759,4.9630825 C 7.2693093,6.8053873 8.4265615,8.0680324 10.145908,8.5402313 C 10.269766,8.6640898 10.269766,8.8635147 10.145907,8.9873732 L 3.3591104,14.57972 C 3.2352519,14.703578 3.035827,14.703579 2.9119685,14.579721 C 1.9658464,14.102742 1.1190897,13.352509 0.66979388,12.47807 C 0.54593545,12.354211 0.54593521,12.154785 0.66979373,12.030927 L 6.1216164,4.9630825 C 6.245475,4.839224 6.4449005,4.8392241 6.568759,4.9630825 z "
- id="rect2382"
- sodipodi:nodetypes="ccccccccc" />
- <path
- sodipodi:type="arc"
- style="opacity:1;fill:url(#radialGradient3392);fill-opacity:1;stroke:#4c4c4c;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="path2231"
- sodipodi:cx="7.2604713"
- sodipodi:cy="7.9187799"
- sodipodi:rx="3.2829957"
- sodipodi:ry="3.2829957"
- d="M 10.543467 7.9187799 A 3.2829957 3.2829957 0 1 1 3.9774756,7.9187799 A 3.2829957 3.2829957 0 1 1 10.543467 7.9187799 z"
- transform="matrix(1.1871826,0,0,1.1871826,1.6577923,-4.7200553)" />
+ <g
+ id="g5430"
+ transform="matrix(0.6104795,0,0,0.6104795,0.2795615,3.6094944)">
+ <path
+ sodipodi:nodetypes="ccccccccc"
+ id="rect2382"
+ d="M 6.568759,4.9630825 C 7.2693093,6.8053873 8.4265615,8.0680324 10.145908,8.5402313 C 10.269766,8.6640898 10.269766,8.8635147 10.145907,8.9873732 L 3.3591104,14.57972 C 3.2352519,14.703578 3.035827,14.703579 2.9119685,14.579721 C 1.9658464,14.102742 1.1190897,13.352509 0.66979388,12.47807 C 0.54593545,12.354211 0.54593521,12.154785 0.66979373,12.030927 L 6.1216164,4.9630825 C 6.245475,4.839224 6.4449005,4.8392241 6.568759,4.9630825 z "
+ style="fill:url(#linearGradient5436);fill-opacity:1;stroke:#1d1d1d;stroke-width:1.11289036;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(1.1871826,0,0,1.1871826,1.6577923,-4.7200553)"
+ d="M 10.543467 7.9187799 A 3.2829957 3.2829957 0 1 1 3.9774756,7.9187799 A 3.2829957 3.2829957 0 1 1 10.543467 7.9187799 z"
+ sodipodi:ry="3.2829957"
+ sodipodi:rx="3.2829957"
+ sodipodi:cy="7.9187799"
+ sodipodi:cx="7.2604713"
+ id="path2231"
+ style="opacity:1;fill:url(#radialGradient5438);fill-opacity:1;stroke:#4c4c4c;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3394"
+ d="M 4.3165626,13.206731 C 3.3222944,12.70548 2.4324481,11.917069 1.9602886,10.998132"
+ style="fill:none;fill-opacity:1;stroke:#1d1d1d;stroke-width:1.05088782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(0.9463087,0,0,1,9.0885763,9.1039998)"
+ d="M 3.0052037 5.7027574 A 6.5849319 1.4584078 0 1 1 -10.16466,5.7027574 A 6.5849319 1.4584078 0 1 1 3.0052037 5.7027574 z"
+ sodipodi:ry="1.4584078"
+ sodipodi:rx="6.5849319"
+ sodipodi:cy="5.7027574"
+ sodipodi:cx="-3.5797281"
+ id="path2433"
+ style="opacity:0.36908515;fill:url(#radialGradient5440);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
<g
id="g3398"
- transform="matrix(1.0416412,0,0,1.0416412,-0.3396375,-0.3598217)">
+ transform="matrix(1.0416412,0,0,1.0416412,-0.3443542,-0.5656934)">
<rect
ry="0.82081318"
rx="0.82081318"
@@ -361,10 +402,5 @@
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
</g>
</g>
- <path
- style="fill:none;fill-opacity:1;stroke:#1d1d1d;stroke-width:1.05088782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- d="M 4.3165626,13.206731 C 3.3222944,12.70548 2.4324481,11.917069 1.9602886,10.998132"
- id="path3394"
- sodipodi:nodetypes="cc" />
</g>
</svg>
diff --git a/sflphone-gtk/pixmaps/mic_25.svg b/sflphone-gtk/pixmaps/mic_25.svg
new file mode 100644
index 0000000000000000000000000000000000000000..87011aea83a3556c480e9152c345397eb9a4a611
--- /dev/null
+++ b/sflphone-gtk/pixmaps/mic_25.svg
@@ -0,0 +1,378 @@
+<?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://web.resource.org/cc/"
+ 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"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docname="mic_25.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3404">
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:1;"
+ offset="0"
+ id="stop3406" />
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:0;"
+ offset="1"
+ id="stop3408" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3370">
+ <stop
+ style="stop-color:#d7d7d7;stop-opacity:1;"
+ offset="0"
+ id="stop3372" />
+ <stop
+ style="stop-color:#7c7c7c;stop-opacity:1;"
+ offset="1"
+ id="stop3374" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3362">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3364" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3366" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4045">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4047" />
+ <stop
+ style="stop-color:#fcfbcb;stop-opacity:1"
+ offset="1"
+ id="stop4049" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4269">
+ <stop
+ style="stop-color:#1db000;stop-opacity:1;"
+ offset="0"
+ id="stop4271" />
+ <stop
+ style="stop-color:#1db000;stop-opacity:0;"
+ offset="1"
+ id="stop4273" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4183">
+ <stop
+ id="stop4185"
+ offset="0"
+ style="stop-color:#1db000;stop-opacity:1;" />
+ <stop
+ id="stop4187"
+ offset="1"
+ style="stop-color:#0f5f00;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4167">
+ <stop
+ style="stop-color:#80000e;stop-opacity:1;"
+ offset="0"
+ id="stop4169" />
+ <stop
+ style="stop-color:#b00014;stop-opacity:0;"
+ offset="1"
+ id="stop4171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient2224"
+ x1="16.826796"
+ y1="6.7288713"
+ x2="27.5625"
+ y2="22.512505"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
+ <linearGradient
+ gradientTransform="matrix(1.62913,0,0,-1.62913,-10.06608,39.71987)"
+ gradientUnits="userSpaceOnUse"
+ y2="6.6770978"
+ x2="15.806232"
+ y1="22.874208"
+ x1="15.630395"
+ id="linearGradient4275"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1388"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(0.426158,-2.762136)"
+ gradientUnits="userSpaceOnUse"
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ id="linearGradient1386"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="10.576721"
+ x2="14.013638"
+ y1="2.7028866"
+ x1="15.647213"
+ id="linearGradient1384"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-0.947018,-0.885198)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.535715"
+ x2="31.31678"
+ y1="12.535715"
+ x1="24.397505"
+ id="linearGradient1382"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(1.262691,-1.100752)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.825893"
+ x2="7.9239235"
+ y1="12.825893"
+ x1="1.0046476"
+ id="linearGradient1380"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient1374">
+ <stop
+ id="stop1376"
+ offset="0"
+ style="stop-color:#80000e;stop-opacity:1;" />
+ <stop
+ id="stop1378"
+ offset="1"
+ style="stop-color:#b00014;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1368">
+ <stop
+ style="stop-color:#26b000;stop-opacity:1;"
+ offset="0"
+ id="stop1370" />
+ <stop
+ style="stop-color:#145f00;stop-opacity:1;"
+ offset="1"
+ id="stop1372" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1362">
+ <stop
+ id="stop1364"
+ offset="0"
+ style="stop-color:#26b000;stop-opacity:1;" />
+ <stop
+ id="stop1366"
+ offset="1"
+ style="stop-color:#26b000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1406"
+ gradientUnits="userSpaceOnUse"
+ x1="15.647213"
+ y1="2.7028866"
+ x2="14.013638"
+ y2="10.576721" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1408"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.262691,-1.100752)"
+ x1="10.57493"
+ y1="12.115559"
+ x2="-0.68574232"
+ y2="12.115559" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1410"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.947018,-0.885198)"
+ x1="31.692968"
+ y1="11.264216"
+ x2="23.888865"
+ y2="13.35532" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1412"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.426158,-2.762136)"
+ x1="7.8517423"
+ y1="15.912388"
+ x2="7.1114841"
+ y2="11.597325" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1414"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ x1="2.0651877"
+ y1="12.625902"
+ x2="6.8378897"
+ y2="13.920053" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4045"
+ id="radialGradient4051"
+ cx="19.285715"
+ cy="9.8571424"
+ fx="19.285715"
+ fy="9.8571424"
+ r="10.885714"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="matrix(0.418975,0,0,0.418975,11.20548,5.727248)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3362"
+ id="linearGradient5436"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)"
+ x1="16.037382"
+ y1="3.6340783"
+ x2="0.9781428"
+ y2="5.2185812" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="radialGradient5438"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)"
+ spreadMethod="pad"
+ cx="5.5446553"
+ cy="6.5377574"
+ fx="5.5446553"
+ fy="6.5377574"
+ r="3.7829957" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3404"
+ id="radialGradient5440"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2214765,0,4.4397305)"
+ cx="-3.5797281"
+ cy="5.7027574"
+ fx="-3.5797281"
+ fy="5.7027574"
+ r="6.5849319" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="20.635709"
+ inkscape:cy="3.1660007"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="16px"
+ height="16px"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1014"
+ inkscape:window-height="691"
+ inkscape:window-x="336"
+ inkscape:window-y="209">
+ <sodipodi:guide
+ orientation="vertical"
+ position="24.821428"
+ id="guide3146" />
+ </sodipodi:namedview>
+ <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" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g5430"
+ transform="matrix(0.6104795,0,0,0.6104795,0.2795615,3.6094944)">
+ <path
+ sodipodi:nodetypes="ccccccccc"
+ id="rect2382"
+ d="M 6.568759,4.9630825 C 7.2693093,6.8053873 8.4265615,8.0680324 10.145908,8.5402313 C 10.269766,8.6640898 10.269766,8.8635147 10.145907,8.9873732 L 3.3591104,14.57972 C 3.2352519,14.703578 3.035827,14.703579 2.9119685,14.579721 C 1.9658464,14.102742 1.1190897,13.352509 0.66979388,12.47807 C 0.54593545,12.354211 0.54593521,12.154785 0.66979373,12.030927 L 6.1216164,4.9630825 C 6.245475,4.839224 6.4449005,4.8392241 6.568759,4.9630825 z "
+ style="fill:url(#linearGradient5436);fill-opacity:1;stroke:#1d1d1d;stroke-width:1.11289036;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(1.1871826,0,0,1.1871826,1.6577923,-4.7200553)"
+ d="M 10.543467 7.9187799 A 3.2829957 3.2829957 0 1 1 3.9774756,7.9187799 A 3.2829957 3.2829957 0 1 1 10.543467 7.9187799 z"
+ sodipodi:ry="3.2829957"
+ sodipodi:rx="3.2829957"
+ sodipodi:cy="7.9187799"
+ sodipodi:cx="7.2604713"
+ id="path2231"
+ style="opacity:1;fill:url(#radialGradient5438);fill-opacity:1;stroke:#4c4c4c;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3394"
+ d="M 4.3165626,13.206731 C 3.3222944,12.70548 2.4324481,11.917069 1.9602886,10.998132"
+ style="fill:none;fill-opacity:1;stroke:#1d1d1d;stroke-width:1.05088782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(0.9463087,0,0,1,9.0885763,9.1039998)"
+ d="M 3.0052037 5.7027574 A 6.5849319 1.4584078 0 1 1 -10.16466,5.7027574 A 6.5849319 1.4584078 0 1 1 3.0052037 5.7027574 z"
+ sodipodi:ry="1.4584078"
+ sodipodi:rx="6.5849319"
+ sodipodi:cy="5.7027574"
+ sodipodi:cx="-3.5797281"
+ id="path2433"
+ style="opacity:0.36908515;fill:url(#radialGradient5440);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3488"
+ d="M 10.542589,12.383445 C 11.004591,11.293108 11.288527,9.7854478 11.288527,8.1334412 C 11.288527,6.4814347 11.004591,4.9737749 10.542589,3.8834374"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+</svg>
diff --git a/sflphone-gtk/pixmaps/mic_50.svg b/sflphone-gtk/pixmaps/mic_50.svg
new file mode 100644
index 0000000000000000000000000000000000000000..20999f20b1c8adfc58da283a957fd2eec1becd5d
--- /dev/null
+++ b/sflphone-gtk/pixmaps/mic_50.svg
@@ -0,0 +1,383 @@
+<?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://web.resource.org/cc/"
+ 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"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docname="mic_50.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3404">
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:1;"
+ offset="0"
+ id="stop3406" />
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:0;"
+ offset="1"
+ id="stop3408" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3370">
+ <stop
+ style="stop-color:#d7d7d7;stop-opacity:1;"
+ offset="0"
+ id="stop3372" />
+ <stop
+ style="stop-color:#7c7c7c;stop-opacity:1;"
+ offset="1"
+ id="stop3374" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3362">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3364" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3366" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4045">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4047" />
+ <stop
+ style="stop-color:#fcfbcb;stop-opacity:1"
+ offset="1"
+ id="stop4049" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4269">
+ <stop
+ style="stop-color:#1db000;stop-opacity:1;"
+ offset="0"
+ id="stop4271" />
+ <stop
+ style="stop-color:#1db000;stop-opacity:0;"
+ offset="1"
+ id="stop4273" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4183">
+ <stop
+ id="stop4185"
+ offset="0"
+ style="stop-color:#1db000;stop-opacity:1;" />
+ <stop
+ id="stop4187"
+ offset="1"
+ style="stop-color:#0f5f00;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4167">
+ <stop
+ style="stop-color:#80000e;stop-opacity:1;"
+ offset="0"
+ id="stop4169" />
+ <stop
+ style="stop-color:#b00014;stop-opacity:0;"
+ offset="1"
+ id="stop4171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient2224"
+ x1="16.826796"
+ y1="6.7288713"
+ x2="27.5625"
+ y2="22.512505"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
+ <linearGradient
+ gradientTransform="matrix(1.62913,0,0,-1.62913,-10.06608,39.71987)"
+ gradientUnits="userSpaceOnUse"
+ y2="6.6770978"
+ x2="15.806232"
+ y1="22.874208"
+ x1="15.630395"
+ id="linearGradient4275"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1388"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(0.426158,-2.762136)"
+ gradientUnits="userSpaceOnUse"
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ id="linearGradient1386"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="10.576721"
+ x2="14.013638"
+ y1="2.7028866"
+ x1="15.647213"
+ id="linearGradient1384"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-0.947018,-0.885198)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.535715"
+ x2="31.31678"
+ y1="12.535715"
+ x1="24.397505"
+ id="linearGradient1382"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(1.262691,-1.100752)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.825893"
+ x2="7.9239235"
+ y1="12.825893"
+ x1="1.0046476"
+ id="linearGradient1380"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient1374">
+ <stop
+ id="stop1376"
+ offset="0"
+ style="stop-color:#80000e;stop-opacity:1;" />
+ <stop
+ id="stop1378"
+ offset="1"
+ style="stop-color:#b00014;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1368">
+ <stop
+ style="stop-color:#26b000;stop-opacity:1;"
+ offset="0"
+ id="stop1370" />
+ <stop
+ style="stop-color:#145f00;stop-opacity:1;"
+ offset="1"
+ id="stop1372" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1362">
+ <stop
+ id="stop1364"
+ offset="0"
+ style="stop-color:#26b000;stop-opacity:1;" />
+ <stop
+ id="stop1366"
+ offset="1"
+ style="stop-color:#26b000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1406"
+ gradientUnits="userSpaceOnUse"
+ x1="15.647213"
+ y1="2.7028866"
+ x2="14.013638"
+ y2="10.576721" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1408"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.262691,-1.100752)"
+ x1="10.57493"
+ y1="12.115559"
+ x2="-0.68574232"
+ y2="12.115559" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1410"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.947018,-0.885198)"
+ x1="31.692968"
+ y1="11.264216"
+ x2="23.888865"
+ y2="13.35532" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1412"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.426158,-2.762136)"
+ x1="7.8517423"
+ y1="15.912388"
+ x2="7.1114841"
+ y2="11.597325" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1414"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ x1="2.0651877"
+ y1="12.625902"
+ x2="6.8378897"
+ y2="13.920053" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4045"
+ id="radialGradient4051"
+ cx="19.285715"
+ cy="9.8571424"
+ fx="19.285715"
+ fy="9.8571424"
+ r="10.885714"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="matrix(0.418975,0,0,0.418975,11.20548,5.727248)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3362"
+ id="linearGradient5436"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)"
+ x1="16.037382"
+ y1="3.6340783"
+ x2="0.9781428"
+ y2="5.2185812" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="radialGradient5438"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)"
+ spreadMethod="pad"
+ cx="5.5446553"
+ cy="6.5377574"
+ fx="5.5446553"
+ fy="6.5377574"
+ r="3.7829957" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3404"
+ id="radialGradient5440"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2214765,0,4.4397305)"
+ cx="-3.5797281"
+ cy="5.7027574"
+ fx="-3.5797281"
+ fy="5.7027574"
+ r="6.5849319" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="20.635709"
+ inkscape:cy="3.1660007"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="16px"
+ height="16px"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1014"
+ inkscape:window-height="691"
+ inkscape:window-x="336"
+ inkscape:window-y="209">
+ <sodipodi:guide
+ orientation="vertical"
+ position="24.821428"
+ id="guide3146" />
+ </sodipodi:namedview>
+ <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" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g5430"
+ transform="matrix(0.6104795,0,0,0.6104795,0.2795615,3.6094944)">
+ <path
+ sodipodi:nodetypes="ccccccccc"
+ id="rect2382"
+ d="M 6.568759,4.9630825 C 7.2693093,6.8053873 8.4265615,8.0680324 10.145908,8.5402313 C 10.269766,8.6640898 10.269766,8.8635147 10.145907,8.9873732 L 3.3591104,14.57972 C 3.2352519,14.703578 3.035827,14.703579 2.9119685,14.579721 C 1.9658464,14.102742 1.1190897,13.352509 0.66979388,12.47807 C 0.54593545,12.354211 0.54593521,12.154785 0.66979373,12.030927 L 6.1216164,4.9630825 C 6.245475,4.839224 6.4449005,4.8392241 6.568759,4.9630825 z "
+ style="fill:url(#linearGradient5436);fill-opacity:1;stroke:#1d1d1d;stroke-width:1.11289036;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(1.1871826,0,0,1.1871826,1.6577923,-4.7200553)"
+ d="M 10.543467 7.9187799 A 3.2829957 3.2829957 0 1 1 3.9774756,7.9187799 A 3.2829957 3.2829957 0 1 1 10.543467 7.9187799 z"
+ sodipodi:ry="3.2829957"
+ sodipodi:rx="3.2829957"
+ sodipodi:cy="7.9187799"
+ sodipodi:cx="7.2604713"
+ id="path2231"
+ style="opacity:1;fill:url(#radialGradient5438);fill-opacity:1;stroke:#4c4c4c;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3394"
+ d="M 4.3165626,13.206731 C 3.3222944,12.70548 2.4324481,11.917069 1.9602886,10.998132"
+ style="fill:none;fill-opacity:1;stroke:#1d1d1d;stroke-width:1.05088782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(0.9463087,0,0,1,9.0885763,9.1039998)"
+ d="M 3.0052037 5.7027574 A 6.5849319 1.4584078 0 1 1 -10.16466,5.7027574 A 6.5849319 1.4584078 0 1 1 3.0052037 5.7027574 z"
+ sodipodi:ry="1.4584078"
+ sodipodi:rx="6.5849319"
+ sodipodi:cy="5.7027574"
+ sodipodi:cx="-3.5797281"
+ id="path2433"
+ style="opacity:0.36908515;fill:url(#radialGradient5440);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3488"
+ d="M 10.542589,12.383445 C 11.004591,11.293108 11.288527,9.7854478 11.288527,8.1334412 C 11.288527,6.4814347 11.004591,4.9737749 10.542589,3.8834374"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 12.431882,13.812413 C 13.049223,12.355474 13.428625,10.340896 13.428625,8.1334387 C 13.428625,5.9259814 13.049223,3.911404 12.431882,2.4544647"
+ id="path3494"
+ sodipodi:nodetypes="csc" />
+ </g>
+</svg>
diff --git a/sflphone-gtk/pixmaps/mic_75.svg b/sflphone-gtk/pixmaps/mic_75.svg
new file mode 100644
index 0000000000000000000000000000000000000000..52a576e1280942a3c8d512e0a7b3cb08263ef022
--- /dev/null
+++ b/sflphone-gtk/pixmaps/mic_75.svg
@@ -0,0 +1,388 @@
+<?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://web.resource.org/cc/"
+ 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"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docname="mic_75.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3404">
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:1;"
+ offset="0"
+ id="stop3406" />
+ <stop
+ style="stop-color:#2d2d2d;stop-opacity:0;"
+ offset="1"
+ id="stop3408" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3370">
+ <stop
+ style="stop-color:#d7d7d7;stop-opacity:1;"
+ offset="0"
+ id="stop3372" />
+ <stop
+ style="stop-color:#7c7c7c;stop-opacity:1;"
+ offset="1"
+ id="stop3374" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3362">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3364" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3366" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4045">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4047" />
+ <stop
+ style="stop-color:#fcfbcb;stop-opacity:1"
+ offset="1"
+ id="stop4049" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4269">
+ <stop
+ style="stop-color:#1db000;stop-opacity:1;"
+ offset="0"
+ id="stop4271" />
+ <stop
+ style="stop-color:#1db000;stop-opacity:0;"
+ offset="1"
+ id="stop4273" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4183">
+ <stop
+ id="stop4185"
+ offset="0"
+ style="stop-color:#1db000;stop-opacity:1;" />
+ <stop
+ id="stop4187"
+ offset="1"
+ style="stop-color:#0f5f00;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4167">
+ <stop
+ style="stop-color:#80000e;stop-opacity:1;"
+ offset="0"
+ id="stop4169" />
+ <stop
+ style="stop-color:#b00014;stop-opacity:0;"
+ offset="1"
+ id="stop4171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient2224"
+ x1="16.826796"
+ y1="6.7288713"
+ x2="27.5625"
+ y2="22.512505"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
+ <linearGradient
+ gradientTransform="matrix(1.62913,0,0,-1.62913,-10.06608,39.71987)"
+ gradientUnits="userSpaceOnUse"
+ y2="6.6770978"
+ x2="15.806232"
+ y1="22.874208"
+ x1="15.630395"
+ id="linearGradient4275"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1388"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(0.426158,-2.762136)"
+ gradientUnits="userSpaceOnUse"
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ id="linearGradient1386"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="10.576721"
+ x2="14.013638"
+ y1="2.7028866"
+ x1="15.647213"
+ id="linearGradient1384"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-0.947018,-0.885198)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.535715"
+ x2="31.31678"
+ y1="12.535715"
+ x1="24.397505"
+ id="linearGradient1382"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(1.262691,-1.100752)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.825893"
+ x2="7.9239235"
+ y1="12.825893"
+ x1="1.0046476"
+ id="linearGradient1380"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient1374">
+ <stop
+ id="stop1376"
+ offset="0"
+ style="stop-color:#80000e;stop-opacity:1;" />
+ <stop
+ id="stop1378"
+ offset="1"
+ style="stop-color:#b00014;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1368">
+ <stop
+ style="stop-color:#26b000;stop-opacity:1;"
+ offset="0"
+ id="stop1370" />
+ <stop
+ style="stop-color:#145f00;stop-opacity:1;"
+ offset="1"
+ id="stop1372" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1362">
+ <stop
+ id="stop1364"
+ offset="0"
+ style="stop-color:#26b000;stop-opacity:1;" />
+ <stop
+ id="stop1366"
+ offset="1"
+ style="stop-color:#26b000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1406"
+ gradientUnits="userSpaceOnUse"
+ x1="15.647213"
+ y1="2.7028866"
+ x2="14.013638"
+ y2="10.576721" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1408"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.262691,-1.100752)"
+ x1="10.57493"
+ y1="12.115559"
+ x2="-0.68574232"
+ y2="12.115559" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1410"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.947018,-0.885198)"
+ x1="31.692968"
+ y1="11.264216"
+ x2="23.888865"
+ y2="13.35532" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1412"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.426158,-2.762136)"
+ x1="7.8517423"
+ y1="15.912388"
+ x2="7.1114841"
+ y2="11.597325" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1414"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ x1="2.0651877"
+ y1="12.625902"
+ x2="6.8378897"
+ y2="13.920053" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4045"
+ id="radialGradient4051"
+ cx="19.285715"
+ cy="9.8571424"
+ fx="19.285715"
+ fy="9.8571424"
+ r="10.885714"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="matrix(0.418975,0,0,0.418975,11.20548,5.727248)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3362"
+ id="linearGradient5436"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)"
+ x1="16.037382"
+ y1="3.6340783"
+ x2="0.9781428"
+ y2="5.2185812" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="radialGradient5438"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)"
+ spreadMethod="pad"
+ cx="5.5446553"
+ cy="6.5377574"
+ fx="5.5446553"
+ fy="6.5377574"
+ r="3.7829957" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3404"
+ id="radialGradient5440"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1,0,0,0.2214765,0,4.4397305)"
+ cx="-3.5797281"
+ cy="5.7027574"
+ fx="-3.5797281"
+ fy="5.7027574"
+ r="6.5849319" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="11.313708"
+ inkscape:cx="20.635709"
+ inkscape:cy="3.1660007"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="16px"
+ height="16px"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1014"
+ inkscape:window-height="691"
+ inkscape:window-x="336"
+ inkscape:window-y="209">
+ <sodipodi:guide
+ orientation="vertical"
+ position="24.821428"
+ id="guide3146" />
+ </sodipodi:namedview>
+ <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" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g5430"
+ transform="matrix(0.6104795,0,0,0.6104795,0.2795615,3.6094944)">
+ <path
+ sodipodi:nodetypes="ccccccccc"
+ id="rect2382"
+ d="M 6.568759,4.9630825 C 7.2693093,6.8053873 8.4265615,8.0680324 10.145908,8.5402313 C 10.269766,8.6640898 10.269766,8.8635147 10.145907,8.9873732 L 3.3591104,14.57972 C 3.2352519,14.703578 3.035827,14.703579 2.9119685,14.579721 C 1.9658464,14.102742 1.1190897,13.352509 0.66979388,12.47807 C 0.54593545,12.354211 0.54593521,12.154785 0.66979373,12.030927 L 6.1216164,4.9630825 C 6.245475,4.839224 6.4449005,4.8392241 6.568759,4.9630825 z "
+ style="fill:url(#linearGradient5436);fill-opacity:1;stroke:#1d1d1d;stroke-width:1.11289036;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(1.1871826,0,0,1.1871826,1.6577923,-4.7200553)"
+ d="M 10.543467 7.9187799 A 3.2829957 3.2829957 0 1 1 3.9774756,7.9187799 A 3.2829957 3.2829957 0 1 1 10.543467 7.9187799 z"
+ sodipodi:ry="3.2829957"
+ sodipodi:rx="3.2829957"
+ sodipodi:cy="7.9187799"
+ sodipodi:cx="7.2604713"
+ id="path2231"
+ style="opacity:1;fill:url(#radialGradient5438);fill-opacity:1;stroke:#4c4c4c;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ <path
+ sodipodi:nodetypes="cc"
+ id="path3394"
+ d="M 4.3165626,13.206731 C 3.3222944,12.70548 2.4324481,11.917069 1.9602886,10.998132"
+ style="fill:none;fill-opacity:1;stroke:#1d1d1d;stroke-width:1.05088782;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
+ <path
+ transform="matrix(0.9463087,0,0,1,9.0885763,9.1039998)"
+ d="M 3.0052037 5.7027574 A 6.5849319 1.4584078 0 1 1 -10.16466,5.7027574 A 6.5849319 1.4584078 0 1 1 3.0052037 5.7027574 z"
+ sodipodi:ry="1.4584078"
+ sodipodi:rx="6.5849319"
+ sodipodi:cy="5.7027574"
+ sodipodi:cx="-3.5797281"
+ id="path2433"
+ style="opacity:0.36908515;fill:url(#radialGradient5440);fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ sodipodi:type="arc" />
+ </g>
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3488"
+ d="M 10.542589,12.383445 C 11.004591,11.293108 11.288527,9.7854478 11.288527,8.1334412 C 11.288527,6.4814347 11.004591,4.9737749 10.542589,3.8834374"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 12.431882,13.812413 C 13.049223,12.355474 13.428625,10.340896 13.428625,8.1334387 C 13.428625,5.9259814 13.049223,3.911404 12.431882,2.4544647"
+ id="path3494"
+ sodipodi:nodetypes="csc" />
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3496"
+ d="M 14.269542,15.829782 C 15.106183,13.855286 15.620362,11.125061 15.620362,8.1334367 C 15.620362,5.1418134 15.106183,2.4115874 14.269542,0.43709227"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+</svg>
diff --git a/sflphone-gtk/pixmaps/speaker.svg b/sflphone-gtk/pixmaps/speaker.svg
index d5191cde06e9f6b6a5f21317d72ea54eee8b9f11..ea9aaf6f11fc8b7c69c45eab51d7b4c897a771dc 100644
--- a/sflphone-gtk/pixmaps/speaker.svg
+++ b/sflphone-gtk/pixmaps/speaker.svg
@@ -13,12 +13,11 @@
height="16"
id="svg2"
sodipodi:version="0.32"
- inkscape:version="0.45"
+ inkscape:version="0.45.1"
version="1.0"
- sodipodi:docbase="/home/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
sodipodi:docname="speaker.svg"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- sodipodi:modified="true">
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
<defs
id="defs4">
<linearGradient
@@ -342,7 +341,7 @@
inkscape:window-width="1014"
inkscape:window-height="691"
inkscape:window-x="336"
- inkscape:window-y="282">
+ inkscape:window-y="209">
<sodipodi:guide
orientation="vertical"
position="24.821428"
@@ -363,24 +362,6 @@
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1">
- <g
- id="g3425"
- transform="matrix(0.8938767,0,0,0.8938767,-0.7849478,0.2391309)"
- style="stroke:#3a3a3a;stroke-opacity:1">
- <path
- id="path3406"
- d="M 8.2992212,14.492981 C 6.403097,12.241903 4.5069721,9.9908266 2.6108471,7.7397495 C 4.5069721,5.4886726 6.4030966,3.2375952 8.2992208,0.98651768 C 8.2992208,5.4886717 8.2992212,9.9908266 8.2992212,14.492981 z "
- style="opacity:1;fill:url(#linearGradient3429);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <rect
- ry="0.23693162"
- rx="0.23693162"
- y="4.8959994"
- x="1.9375"
- height="5.6875"
- width="3"
- id="rect3404"
- style="opacity:1;fill:url(#linearGradient3431);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- </g>
<g
id="g3398"
transform="matrix(1.0416412,0,0,1.0416412,-0.3396375,-0.3598217)">
@@ -414,10 +395,32 @@
style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:2.56729817;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
</g>
</g>
- <path
- style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:0.62258136;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1"
- d="M 4.0668759,5.5560217 L 6.1678675,3.589381 L 6.1678675,6.1765082 L 4.0447788,7.2813625 L 4.0668759,5.5560217 z "
- id="rect2217"
- sodipodi:nodetypes="ccccc" />
+ <g
+ id="g4455"
+ transform="translate(0,0.8424875)">
+ <g
+ style="stroke:#3a3a3a;stroke-opacity:1"
+ transform="matrix(0.8938767,0,0,0.8938767,-0.7849478,0.2391309)"
+ id="g3425">
+ <path
+ style="opacity:1;fill:url(#linearGradient3429);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 8.2992212,14.492981 C 6.403097,12.241903 4.5069721,9.9908266 2.6108471,7.7397495 C 4.5069721,5.4886726 6.4030966,3.2375952 8.2992208,0.98651768 C 8.2992208,5.4886717 8.2992212,9.9908266 8.2992212,14.492981 z "
+ id="path3406" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient3431);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3404"
+ width="3"
+ height="5.6875"
+ x="1.9375"
+ y="4.8959994"
+ rx="0.23693162"
+ ry="0.23693162" />
+ </g>
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="rect2217"
+ d="M 4.0668759,5.5560217 L 6.1678675,3.589381 L 6.1678675,6.1765082 L 4.0447788,7.2813625 L 4.0668759,5.5560217 z "
+ style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:0.62258136;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
</g>
</svg>
diff --git a/sflphone-gtk/pixmaps/speaker_25.svg b/sflphone-gtk/pixmaps/speaker_25.svg
new file mode 100644
index 0000000000000000000000000000000000000000..4935e9b77d0d81ca51baa30a4c4d0a14240a04df
--- /dev/null
+++ b/sflphone-gtk/pixmaps/speaker_25.svg
@@ -0,0 +1,398 @@
+<?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://web.resource.org/cc/"
+ 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"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docname="speaker_25.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3417">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3419" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3421" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3370">
+ <stop
+ style="stop-color:#d7d7d7;stop-opacity:1;"
+ offset="0"
+ id="stop3372" />
+ <stop
+ style="stop-color:#7c7c7c;stop-opacity:1;"
+ offset="1"
+ id="stop3374" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3362">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3364" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3366" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4045">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4047" />
+ <stop
+ style="stop-color:#fcfbcb;stop-opacity:1"
+ offset="1"
+ id="stop4049" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4269">
+ <stop
+ style="stop-color:#1db000;stop-opacity:1;"
+ offset="0"
+ id="stop4271" />
+ <stop
+ style="stop-color:#1db000;stop-opacity:0;"
+ offset="1"
+ id="stop4273" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4183">
+ <stop
+ id="stop4185"
+ offset="0"
+ style="stop-color:#1db000;stop-opacity:1;" />
+ <stop
+ id="stop4187"
+ offset="1"
+ style="stop-color:#0f5f00;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4167">
+ <stop
+ style="stop-color:#80000e;stop-opacity:1;"
+ offset="0"
+ id="stop4169" />
+ <stop
+ style="stop-color:#b00014;stop-opacity:0;"
+ offset="1"
+ id="stop4171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient2224"
+ x1="16.826796"
+ y1="6.7288713"
+ x2="27.5625"
+ y2="22.512505"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
+ <linearGradient
+ gradientTransform="matrix(1.62913,0,0,-1.62913,-10.06608,39.71987)"
+ gradientUnits="userSpaceOnUse"
+ y2="6.6770978"
+ x2="15.806232"
+ y1="22.874208"
+ x1="15.630395"
+ id="linearGradient4275"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1388"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(0.426158,-2.762136)"
+ gradientUnits="userSpaceOnUse"
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ id="linearGradient1386"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="10.576721"
+ x2="14.013638"
+ y1="2.7028866"
+ x1="15.647213"
+ id="linearGradient1384"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-0.947018,-0.885198)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.535715"
+ x2="31.31678"
+ y1="12.535715"
+ x1="24.397505"
+ id="linearGradient1382"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(1.262691,-1.100752)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.825893"
+ x2="7.9239235"
+ y1="12.825893"
+ x1="1.0046476"
+ id="linearGradient1380"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient1374">
+ <stop
+ id="stop1376"
+ offset="0"
+ style="stop-color:#80000e;stop-opacity:1;" />
+ <stop
+ id="stop1378"
+ offset="1"
+ style="stop-color:#b00014;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1368">
+ <stop
+ style="stop-color:#26b000;stop-opacity:1;"
+ offset="0"
+ id="stop1370" />
+ <stop
+ style="stop-color:#145f00;stop-opacity:1;"
+ offset="1"
+ id="stop1372" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1362">
+ <stop
+ id="stop1364"
+ offset="0"
+ style="stop-color:#26b000;stop-opacity:1;" />
+ <stop
+ id="stop1366"
+ offset="1"
+ style="stop-color:#26b000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1406"
+ gradientUnits="userSpaceOnUse"
+ x1="15.647213"
+ y1="2.7028866"
+ x2="14.013638"
+ y2="10.576721" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1408"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.262691,-1.100752)"
+ x1="10.57493"
+ y1="12.115559"
+ x2="-0.68574232"
+ y2="12.115559" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1410"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.947018,-0.885198)"
+ x1="31.692968"
+ y1="11.264216"
+ x2="23.888865"
+ y2="13.35532" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1412"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.426158,-2.762136)"
+ x1="7.8517423"
+ y1="15.912388"
+ x2="7.1114841"
+ y2="11.597325" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1414"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ x1="2.0651877"
+ y1="12.625902"
+ x2="6.8378897"
+ y2="13.920053" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4045"
+ id="radialGradient4051"
+ cx="19.285715"
+ cy="9.8571424"
+ fx="19.285715"
+ fy="9.8571424"
+ r="10.885714"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="matrix(0.418975,0,0,0.418975,11.20548,5.727248)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3362"
+ id="linearGradient3368"
+ x1="16.037382"
+ y1="3.6340783"
+ x2="0.9781428"
+ y2="5.2185812"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="radialGradient3392"
+ cx="5.5446553"
+ cy="6.5377574"
+ fx="5.5446553"
+ fy="6.5377574"
+ r="3.7829957"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad"
+ gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="linearGradient3415"
+ x1="2.3125"
+ y1="4.3125"
+ x2="3.8125"
+ y2="11.78125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8.349934e-2)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3417"
+ id="linearGradient3423"
+ x1="8.2358475"
+ y1="15.55225"
+ x2="4.424221"
+ y2="3.4272494"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3417"
+ id="linearGradient3429"
+ gradientUnits="userSpaceOnUse"
+ x1="8.2358475"
+ y1="15.55225"
+ x2="4.2843809"
+ y2="2.2386067" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="linearGradient3431"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8.349934e-2)"
+ x1="2.3125"
+ y1="4.3125"
+ x2="3.8125"
+ y2="11.78125" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="2.7222828"
+ inkscape:cy="3.2854021"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="16px"
+ height="16px"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1014"
+ inkscape:window-height="691"
+ inkscape:window-x="336"
+ inkscape:window-y="209">
+ <sodipodi:guide
+ orientation="vertical"
+ position="24.821428"
+ id="guide3146" />
+ </sodipodi:namedview>
+ <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" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g4455"
+ transform="translate(0,0.8424875)">
+ <g
+ style="stroke:#3a3a3a;stroke-opacity:1"
+ transform="matrix(0.8938767,0,0,0.8938767,-0.7849478,0.2391309)"
+ id="g3425">
+ <path
+ style="opacity:1;fill:url(#linearGradient3429);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 8.2992212,14.492981 C 6.403097,12.241903 4.5069721,9.9908266 2.6108471,7.7397495 C 4.5069721,5.4886726 6.4030966,3.2375952 8.2992208,0.98651768 C 8.2992208,5.4886717 8.2992212,9.9908266 8.2992212,14.492981 z "
+ id="path3406" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient3431);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3404"
+ width="3"
+ height="5.6875"
+ x="1.9375"
+ y="4.8959994"
+ rx="0.23693162"
+ ry="0.23693162" />
+ </g>
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="rect2217"
+ d="M 4.0668759,5.5560217 L 6.1678675,3.589381 L 6.1678675,6.1765082 L 4.0447788,7.2813625 L 4.0668759,5.5560217 z "
+ style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:0.62258136;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3488"
+ d="M 10.523613,12.125008 C 10.985616,11.034671 11.269551,9.527011 11.269551,7.8750044 C 11.269551,6.2229979 10.985616,4.7153381 10.523613,3.6250006"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+</svg>
diff --git a/sflphone-gtk/pixmaps/speaker_50.svg b/sflphone-gtk/pixmaps/speaker_50.svg
new file mode 100644
index 0000000000000000000000000000000000000000..e71a571929c4d50bd0149e2812945aa4a6beeb95
--- /dev/null
+++ b/sflphone-gtk/pixmaps/speaker_50.svg
@@ -0,0 +1,403 @@
+<?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://web.resource.org/cc/"
+ 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"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docname="speaker_50.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3417">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3419" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3421" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3370">
+ <stop
+ style="stop-color:#d7d7d7;stop-opacity:1;"
+ offset="0"
+ id="stop3372" />
+ <stop
+ style="stop-color:#7c7c7c;stop-opacity:1;"
+ offset="1"
+ id="stop3374" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3362">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3364" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3366" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4045">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4047" />
+ <stop
+ style="stop-color:#fcfbcb;stop-opacity:1"
+ offset="1"
+ id="stop4049" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4269">
+ <stop
+ style="stop-color:#1db000;stop-opacity:1;"
+ offset="0"
+ id="stop4271" />
+ <stop
+ style="stop-color:#1db000;stop-opacity:0;"
+ offset="1"
+ id="stop4273" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4183">
+ <stop
+ id="stop4185"
+ offset="0"
+ style="stop-color:#1db000;stop-opacity:1;" />
+ <stop
+ id="stop4187"
+ offset="1"
+ style="stop-color:#0f5f00;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4167">
+ <stop
+ style="stop-color:#80000e;stop-opacity:1;"
+ offset="0"
+ id="stop4169" />
+ <stop
+ style="stop-color:#b00014;stop-opacity:0;"
+ offset="1"
+ id="stop4171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient2224"
+ x1="16.826796"
+ y1="6.7288713"
+ x2="27.5625"
+ y2="22.512505"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
+ <linearGradient
+ gradientTransform="matrix(1.62913,0,0,-1.62913,-10.06608,39.71987)"
+ gradientUnits="userSpaceOnUse"
+ y2="6.6770978"
+ x2="15.806232"
+ y1="22.874208"
+ x1="15.630395"
+ id="linearGradient4275"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1388"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(0.426158,-2.762136)"
+ gradientUnits="userSpaceOnUse"
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ id="linearGradient1386"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="10.576721"
+ x2="14.013638"
+ y1="2.7028866"
+ x1="15.647213"
+ id="linearGradient1384"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-0.947018,-0.885198)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.535715"
+ x2="31.31678"
+ y1="12.535715"
+ x1="24.397505"
+ id="linearGradient1382"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(1.262691,-1.100752)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.825893"
+ x2="7.9239235"
+ y1="12.825893"
+ x1="1.0046476"
+ id="linearGradient1380"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient1374">
+ <stop
+ id="stop1376"
+ offset="0"
+ style="stop-color:#80000e;stop-opacity:1;" />
+ <stop
+ id="stop1378"
+ offset="1"
+ style="stop-color:#b00014;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1368">
+ <stop
+ style="stop-color:#26b000;stop-opacity:1;"
+ offset="0"
+ id="stop1370" />
+ <stop
+ style="stop-color:#145f00;stop-opacity:1;"
+ offset="1"
+ id="stop1372" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1362">
+ <stop
+ id="stop1364"
+ offset="0"
+ style="stop-color:#26b000;stop-opacity:1;" />
+ <stop
+ id="stop1366"
+ offset="1"
+ style="stop-color:#26b000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1406"
+ gradientUnits="userSpaceOnUse"
+ x1="15.647213"
+ y1="2.7028866"
+ x2="14.013638"
+ y2="10.576721" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1408"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.262691,-1.100752)"
+ x1="10.57493"
+ y1="12.115559"
+ x2="-0.68574232"
+ y2="12.115559" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1410"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.947018,-0.885198)"
+ x1="31.692968"
+ y1="11.264216"
+ x2="23.888865"
+ y2="13.35532" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1412"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.426158,-2.762136)"
+ x1="7.8517423"
+ y1="15.912388"
+ x2="7.1114841"
+ y2="11.597325" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1414"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ x1="2.0651877"
+ y1="12.625902"
+ x2="6.8378897"
+ y2="13.920053" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4045"
+ id="radialGradient4051"
+ cx="19.285715"
+ cy="9.8571424"
+ fx="19.285715"
+ fy="9.8571424"
+ r="10.885714"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="matrix(0.418975,0,0,0.418975,11.20548,5.727248)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3362"
+ id="linearGradient3368"
+ x1="16.037382"
+ y1="3.6340783"
+ x2="0.9781428"
+ y2="5.2185812"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="radialGradient3392"
+ cx="5.5446553"
+ cy="6.5377574"
+ fx="5.5446553"
+ fy="6.5377574"
+ r="3.7829957"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad"
+ gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="linearGradient3415"
+ x1="2.3125"
+ y1="4.3125"
+ x2="3.8125"
+ y2="11.78125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8.349934e-2)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3417"
+ id="linearGradient3423"
+ x1="8.2358475"
+ y1="15.55225"
+ x2="4.424221"
+ y2="3.4272494"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3417"
+ id="linearGradient3429"
+ gradientUnits="userSpaceOnUse"
+ x1="8.2358475"
+ y1="15.55225"
+ x2="4.2843809"
+ y2="2.2386067" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="linearGradient3431"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8.349934e-2)"
+ x1="2.3125"
+ y1="4.3125"
+ x2="3.8125"
+ y2="11.78125" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="2.7222828"
+ inkscape:cy="3.2854021"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="16px"
+ height="16px"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1014"
+ inkscape:window-height="691"
+ inkscape:window-x="336"
+ inkscape:window-y="209">
+ <sodipodi:guide
+ orientation="vertical"
+ position="24.821428"
+ id="guide3146" />
+ </sodipodi:namedview>
+ <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" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g4455"
+ transform="translate(0,0.8424875)">
+ <g
+ style="stroke:#3a3a3a;stroke-opacity:1"
+ transform="matrix(0.8938767,0,0,0.8938767,-0.7849478,0.2391309)"
+ id="g3425">
+ <path
+ style="opacity:1;fill:url(#linearGradient3429);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 8.2992212,14.492981 C 6.403097,12.241903 4.5069721,9.9908266 2.6108471,7.7397495 C 4.5069721,5.4886726 6.4030966,3.2375952 8.2992208,0.98651768 C 8.2992208,5.4886717 8.2992212,9.9908266 8.2992212,14.492981 z "
+ id="path3406" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient3431);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3404"
+ width="3"
+ height="5.6875"
+ x="1.9375"
+ y="4.8959994"
+ rx="0.23693162"
+ ry="0.23693162" />
+ </g>
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="rect2217"
+ d="M 4.0668759,5.5560217 L 6.1678675,3.589381 L 6.1678675,6.1765082 L 4.0447788,7.2813625 L 4.0668759,5.5560217 z "
+ style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:0.62258136;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3488"
+ d="M 10.523613,12.125008 C 10.985616,11.034671 11.269551,9.527011 11.269551,7.8750044 C 11.269551,6.2229979 10.985616,4.7153381 10.523613,3.6250006"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 12.412906,13.553976 C 13.030247,12.097037 13.409649,10.082459 13.409649,7.8750019 C 13.409649,5.6675446 13.030247,3.6529672 12.412906,2.1960279"
+ id="path3494"
+ sodipodi:nodetypes="csc" />
+ </g>
+</svg>
diff --git a/sflphone-gtk/pixmaps/speaker_75.svg b/sflphone-gtk/pixmaps/speaker_75.svg
new file mode 100644
index 0000000000000000000000000000000000000000..0ac62951983330b2b60b2be79480dec9c5e3c58a
--- /dev/null
+++ b/sflphone-gtk/pixmaps/speaker_75.svg
@@ -0,0 +1,408 @@
+<?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://web.resource.org/cc/"
+ 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"
+ width="16"
+ height="16"
+ id="svg2"
+ sodipodi:version="0.32"
+ inkscape:version="0.45.1"
+ version="1.0"
+ sodipodi:docbase="/home-local/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps"
+ sodipodi:docname="speaker_75.svg"
+ inkscape:output_extension="org.inkscape.output.svg.inkscape">
+ <defs
+ id="defs4">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient3417">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3419" />
+ <stop
+ style="stop-color:#000000;stop-opacity:0;"
+ offset="1"
+ id="stop3421" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3370">
+ <stop
+ style="stop-color:#d7d7d7;stop-opacity:1;"
+ offset="0"
+ id="stop3372" />
+ <stop
+ style="stop-color:#7c7c7c;stop-opacity:1;"
+ offset="1"
+ id="stop3374" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient3362">
+ <stop
+ style="stop-color:#000000;stop-opacity:1;"
+ offset="0"
+ id="stop3364" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="1"
+ id="stop3366" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4045">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0"
+ offset="0"
+ id="stop4047" />
+ <stop
+ style="stop-color:#fcfbcb;stop-opacity:1"
+ offset="1"
+ id="stop4049" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4269">
+ <stop
+ style="stop-color:#1db000;stop-opacity:1;"
+ offset="0"
+ id="stop4271" />
+ <stop
+ style="stop-color:#1db000;stop-opacity:0;"
+ offset="1"
+ id="stop4273" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4183">
+ <stop
+ id="stop4185"
+ offset="0"
+ style="stop-color:#1db000;stop-opacity:1;" />
+ <stop
+ id="stop4187"
+ offset="1"
+ style="stop-color:#0f5f00;stop-opacity:1;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient4167">
+ <stop
+ style="stop-color:#80000e;stop-opacity:1;"
+ offset="0"
+ id="stop4169" />
+ <stop
+ style="stop-color:#b00014;stop-opacity:0;"
+ offset="1"
+ id="stop4171" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient2224"
+ x1="16.826796"
+ y1="6.7288713"
+ x2="27.5625"
+ y2="22.512505"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" />
+ <linearGradient
+ gradientTransform="matrix(1.62913,0,0,-1.62913,-10.06608,39.71987)"
+ gradientUnits="userSpaceOnUse"
+ y2="6.6770978"
+ x2="15.806232"
+ y1="22.874208"
+ x1="15.630395"
+ id="linearGradient4275"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ gradientUnits="userSpaceOnUse"
+ id="linearGradient1388"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(0.426158,-2.762136)"
+ gradientUnits="userSpaceOnUse"
+ y2="13.920053"
+ x2="6.8378897"
+ y1="12.625902"
+ x1="2.0651877"
+ id="linearGradient1386"
+ xlink:href="#linearGradient4269"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientUnits="userSpaceOnUse"
+ y2="10.576721"
+ x2="14.013638"
+ y1="2.7028866"
+ x1="15.647213"
+ id="linearGradient1384"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(-0.947018,-0.885198)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.535715"
+ x2="31.31678"
+ y1="12.535715"
+ x1="24.397505"
+ id="linearGradient1382"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ gradientTransform="translate(1.262691,-1.100752)"
+ gradientUnits="userSpaceOnUse"
+ y2="12.825893"
+ x2="7.9239235"
+ y1="12.825893"
+ x1="1.0046476"
+ id="linearGradient1380"
+ xlink:href="#linearGradient4183"
+ inkscape:collect="always" />
+ <linearGradient
+ id="linearGradient1374">
+ <stop
+ id="stop1376"
+ offset="0"
+ style="stop-color:#80000e;stop-opacity:1;" />
+ <stop
+ id="stop1378"
+ offset="1"
+ style="stop-color:#b00014;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1368">
+ <stop
+ style="stop-color:#26b000;stop-opacity:1;"
+ offset="0"
+ id="stop1370" />
+ <stop
+ style="stop-color:#145f00;stop-opacity:1;"
+ offset="1"
+ id="stop1372" />
+ </linearGradient>
+ <linearGradient
+ id="linearGradient1362">
+ <stop
+ id="stop1364"
+ offset="0"
+ style="stop-color:#26b000;stop-opacity:1;" />
+ <stop
+ id="stop1366"
+ offset="1"
+ style="stop-color:#26b000;stop-opacity:0;" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1406"
+ gradientUnits="userSpaceOnUse"
+ x1="15.647213"
+ y1="2.7028866"
+ x2="14.013638"
+ y2="10.576721" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1408"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(1.262691,-1.100752)"
+ x1="10.57493"
+ y1="12.115559"
+ x2="-0.68574232"
+ y2="12.115559" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4183"
+ id="linearGradient1410"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(-0.947018,-0.885198)"
+ x1="31.692968"
+ y1="11.264216"
+ x2="23.888865"
+ y2="13.35532" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1412"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0.426158,-2.762136)"
+ x1="7.8517423"
+ y1="15.912388"
+ x2="7.1114841"
+ y2="11.597325" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4269"
+ id="linearGradient1414"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)"
+ x1="2.0651877"
+ y1="12.625902"
+ x2="6.8378897"
+ y2="13.920053" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4045"
+ id="radialGradient4051"
+ cx="19.285715"
+ cy="9.8571424"
+ fx="19.285715"
+ fy="9.8571424"
+ r="10.885714"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="reflect"
+ gradientTransform="matrix(0.418975,0,0,0.418975,11.20548,5.727248)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3362"
+ id="linearGradient3368"
+ x1="16.037382"
+ y1="3.6340783"
+ x2="0.9781428"
+ y2="5.2185812"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.7869324,0.7869324,-0.7869324,0.7869324,-2.5317345,-1.0086642)" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="radialGradient3392"
+ cx="5.5446553"
+ cy="6.5377574"
+ fx="5.5446553"
+ fy="6.5377574"
+ r="3.7829957"
+ gradientUnits="userSpaceOnUse"
+ spreadMethod="pad"
+ gradientTransform="matrix(0.6570643,0.4203728,-0.5183425,0.810196,5.2902577,-1.0899297)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="linearGradient3415"
+ x1="2.3125"
+ y1="4.3125"
+ x2="3.8125"
+ y2="11.78125"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8.349934e-2)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3417"
+ id="linearGradient3423"
+ x1="8.2358475"
+ y1="15.55225"
+ x2="4.424221"
+ y2="3.4272494"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3417"
+ id="linearGradient3429"
+ gradientUnits="userSpaceOnUse"
+ x1="8.2358475"
+ y1="15.55225"
+ x2="4.2843809"
+ y2="2.2386067" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient3370"
+ id="linearGradient3431"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,8.349934e-2)"
+ x1="2.3125"
+ y1="4.3125"
+ x2="3.8125"
+ y2="11.78125" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="16"
+ inkscape:cx="2.7222828"
+ inkscape:cy="8.2854021"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ width="16px"
+ height="16px"
+ showguides="true"
+ inkscape:guide-bbox="true"
+ inkscape:window-width="1014"
+ inkscape:window-height="691"
+ inkscape:window-x="336"
+ inkscape:window-y="209">
+ <sodipodi:guide
+ orientation="vertical"
+ position="24.821428"
+ id="guide3146" />
+ </sodipodi:namedview>
+ <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" />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <g
+ id="g4455"
+ transform="translate(0,0.8424875)">
+ <g
+ style="stroke:#3a3a3a;stroke-opacity:1"
+ transform="matrix(0.8938767,0,0,0.8938767,-0.7849478,0.2391309)"
+ id="g3425">
+ <path
+ style="opacity:1;fill:url(#linearGradient3429);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ d="M 8.2992212,14.492981 C 6.403097,12.241903 4.5069721,9.9908266 2.6108471,7.7397495 C 4.5069721,5.4886726 6.4030966,3.2375952 8.2992208,0.98651768 C 8.2992208,5.4886717 8.2992212,9.9908266 8.2992212,14.492981 z "
+ id="path3406" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient3431);fill-opacity:1;stroke:#3a3a3a;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+ id="rect3404"
+ width="3"
+ height="5.6875"
+ x="1.9375"
+ y="4.8959994"
+ rx="0.23693162"
+ ry="0.23693162" />
+ </g>
+ <path
+ sodipodi:nodetypes="ccccc"
+ id="rect2217"
+ d="M 4.0668759,5.5560217 L 6.1678675,3.589381 L 6.1678675,6.1765082 L 4.0447788,7.2813625 L 4.0668759,5.5560217 z "
+ style="fill:#f5f5f5;fill-opacity:1;stroke:none;stroke-width:0.62258136;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" />
+ </g>
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3488"
+ d="M 10.523613,12.125008 C 10.985616,11.034671 11.269551,9.527011 11.269551,7.8750044 C 11.269551,6.2229979 10.985616,4.7153381 10.523613,3.6250006"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ <path
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
+ d="M 12.412906,13.553976 C 13.030247,12.097037 13.409649,10.082459 13.409649,7.8750019 C 13.409649,5.6675446 13.030247,3.6529672 12.412906,2.1960279"
+ id="path3494"
+ sodipodi:nodetypes="csc" />
+ <path
+ sodipodi:nodetypes="csc"
+ id="path3496"
+ d="M 14.250566,15.571345 C 15.087207,13.596849 15.601386,10.866624 15.601386,7.8749999 C 15.601386,4.8833766 15.087207,2.1531506 14.250566,0.1786555"
+ style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#3c77cb;stroke-width:0.50367486;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
+ </g>
+</svg>
diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c
index ea0abe2d804ecbc8bbd141dda6ef7ccdc49f478d..07e37a8105ce4387f3a0e835121ab0fb4eb77180 100644
--- a/sflphone-gtk/src/calltree.c
+++ b/sflphone-gtk/src/calltree.c
@@ -21,6 +21,7 @@
#include <actions.h>
#include <calltree.h>
#include <calllist.h>
+#include <menus.h>
#include <dbus.h>
GtkListStore * store;
@@ -39,6 +40,19 @@ guint transfertButtonConnId; //The button toggled signal connection ID
// should be used to set a default account to make output calls
GtkWidget *accounts_list;
+/**
+ * Show popup menu
+ */
+gboolean
+popup_menu (GtkWidget *widget,
+ gpointer user_data)
+{
+ g_print("POPIP");
+ show_popup_menu(widget, NULL);
+ return TRUE;
+}
+
+
/**
* Make a call
*/
@@ -260,7 +274,7 @@ create_toolbar (){
image = gtk_image_new_from_file( ICONS_DIR "/call.svg");
callButton = gtk_menu_tool_button_new (image, "Place a Call");
- gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(callButton), GTK_MENU(accounts_list));
+ gtk_menu_tool_button_set_menu(GTK_MENU_TOOL_BUTTON(callButton), GTK_WIDGET(accounts_list));
g_signal_connect (G_OBJECT (callButton), "clicked",
G_CALLBACK (call_button), NULL);
gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(callButton), -1);
@@ -304,7 +318,6 @@ create_toolbar (){
G_CALLBACK (transfert), NULL);
gtk_toolbar_insert(GTK_TOOLBAR(ret), GTK_TOOL_ITEM(transfertButton), -1);
-
return ret;
}
@@ -337,6 +350,11 @@ create_call_tree (){
G_CALLBACK (row_activated),
NULL);
+ // Connect the popup menu
+ g_signal_connect (G_OBJECT (view), "popup-menu",
+ G_CALLBACK (popup_menu),
+ NULL);
+
rend = gtk_cell_renderer_pixbuf_new();
col = gtk_tree_view_column_new_with_attributes ("Icon",
rend,
diff --git a/sflphone-gtk/src/configwindow.c b/sflphone-gtk/src/configwindow.c
index 2a3bf2a1091bf4ce0baf7b4ecf6221982df4b851..0e55fba13ac9dda8d2b81d604badc5e2c78bffd8 100644
--- a/sflphone-gtk/src/configwindow.c
+++ b/sflphone-gtk/src/configwindow.c
@@ -105,6 +105,7 @@ add_account( GtkWidget *widget, gpointer data )
/*
* Should mark the account as default
*/
+void
default_account(GtkWidget *widget, gpointer data)
{
// set account as default
@@ -115,7 +116,7 @@ default_account(GtkWidget *widget, gpointer data)
}
/* Call back when the user click on an account in the list */
- static void
+static void
select_account(GtkTreeSelection *sel, GtkTreeModel *model)
{
GtkTreeIter iter;
diff --git a/sflphone-gtk/src/menus.c b/sflphone-gtk/src/menus.c
index a24c3f6038ed7772933a65463031ae6243d00f91..25a630fb1b51a41805d8cfd955e3d7e56da9325a 100644
--- a/sflphone-gtk/src/menus.c
+++ b/sflphone-gtk/src/menus.c
@@ -18,11 +18,15 @@
*/
#include <menus.h>
-#include <config.h>
-#include <calllist.h>
#include <actions.h>
-#include <mainwindow.h>
+#include <calllist.h>
+#include <calltree.h>
+#include <config.h>
#include <configwindow.h>
+#include <dbus.h>
+#include <mainwindow.h>
+#include <screen.h>
+#include <gtk/gtk.h>
#include <string.h> // for strlen
@@ -493,3 +497,46 @@ create_menus ( )
return menu_bar;
}
+/* ----------------------------------------------------------------- */
+
+void
+show_popup_menu (GtkWidget *my_widget, GdkEventButton *event)
+{
+ g_print("Popup\n");
+ GtkWidget *menu;
+ int button, event_time;
+ GtkWidget * menu_items;
+
+ menu = gtk_menu_new ();
+ g_signal_connect (menu, "deactivate",
+ G_CALLBACK (gtk_widget_destroy), NULL);
+
+ menu_items = gtk_image_menu_item_new_from_stock( GTK_STOCK_COPY, get_accel_group());
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
+ g_signal_connect_swapped (G_OBJECT (menu_items), "activate",
+ G_CALLBACK (edit_copy),
+ NULL);
+ gtk_widget_show (copyMenu);
+
+ menu_items = gtk_image_menu_item_new_from_stock( GTK_STOCK_PASTE, get_accel_group());
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), menu_items);
+ g_signal_connect_swapped (G_OBJECT (menu_items), "activate",
+ G_CALLBACK (edit_paste),
+ NULL);
+ gtk_widget_show (pasteMenu);
+ if (event)
+ {
+ button = event->button;
+ event_time = event->time;
+ }
+ else
+ {
+ button = 0;
+ event_time = gtk_get_current_event_time ();
+ }
+
+ gtk_menu_attach_to_widget (GTK_MENU (menu), my_widget, NULL);
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL, NULL, NULL,
+ button, event_time);
+}
+
diff --git a/sflphone-gtk/src/menus.h b/sflphone-gtk/src/menus.h
index e204ebe3239f09c8f854af2c30dd0c25f53cdeab..12ffa88b75789c366df2c1b8c1d737f6c6818d88 100644
--- a/sflphone-gtk/src/menus.h
+++ b/sflphone-gtk/src/menus.h
@@ -26,5 +26,6 @@
*/
GtkWidget * create_menus();
void update_menus();
+void show_popup_menu (GtkWidget *my_widget, GdkEventButton *event);
#endif
diff --git a/sflphone-gtk/src/sliders.c b/sflphone-gtk/src/sliders.c
index 5b6a497aa16d60c62830af48629b244ba50f1b70..7f6383d02863b0c2af457204e85e6cf08b10255a 100644
--- a/sflphone-gtk/src/sliders.c
+++ b/sflphone-gtk/src/sliders.c
@@ -21,56 +21,80 @@
#include <dbus.h>
#include <string.h>
-gdouble speakerValue;
-gdouble micValue;
+gdouble value[2];
+GtkWidget * slider[2];
+GtkWidget * button[2];
-GtkWidget * speakerSlider;
-GtkWidget * micSlider;
-GtkWidget * micMuteButton;
-GtkWidget * speakerMuteButton;
+// icons
+GtkWidget * images[2][4];
+enum device_t {
+ SPEAKER = 0,
+ MIKE,
+ DEVICE_COUNT
+} ;
-guint speakerToggledConnId; //The button toggled signal connection ID
-guint micToggledConnId; //The button toggled signal connection ID
+enum volume_t {
+ MUTED = 0,
+ VOL25,
+ VOL50,
+ VOL75
+} ;
-guint speakerMovedConnId; //The slider_moved signal connection ID
-guint micMovedConnId; //The slider_moved signal connection ID
+guint toggledConnId[2]; // The button toggled signal connection ID
+guint movedConnId[2]; // The slider_moved signal connection ID
-void slider_moved(GtkRange *range,
- gchar * device){
+void
+update_icons (int dev)
+{
+ float val = gtk_range_get_value(GTK_RANGE(slider[dev]));
+ if(button[dev])
+ {
+ int icon = MUTED;
+ if(val == 0)
+ icon = MUTED;
+ else if( val < 0.33)
+ icon = VOL25;
+ else if( val < 0.66)
+ icon = VOL50;
+ else if( val <= 1)
+ icon = VOL75;
+ gtk_button_set_image(GTK_BUTTON(button[dev]), GTK_WIDGET(images[dev][icon]));
+ }
+}
+
+void
+slider_moved(GtkRange* range, gchar* device)
+{
gdouble value = gtk_range_get_value(range);
- g_print("Volume changed for %s: %f\n ",device, value);
+ g_print("Volume changed for %s: %f\n ", device, value);
dbus_set_volume(device, value);
+ if(strcmp(device, "speaker") == 0)
+ update_icons(SPEAKER);
+ else
+ update_icons(MIKE);
}
static void
mute_cb( GtkWidget *widget, gchar* device )
{
+ int dev;
+ if(strcmp(device, "speaker") == 0)
+ dev = SPEAKER;
+ else
+ dev = MIKE;
+
if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget)))
{ // Save value
g_print("Save");
- if(strcmp(device, "speaker") == 0)
- {
- speakerValue = gtk_range_get_value(GTK_RANGE(speakerSlider));
- }
- else if (strcmp(device, "mic")== 0)
- {
- micValue = gtk_range_get_value(GTK_RANGE(micSlider));
- }
+ value[dev] = gtk_range_get_value(GTK_RANGE(slider[dev]));
dbus_set_volume(device, 0);
}
else
{ //Restore value
g_print("Restore");
- if(strcmp(device, "speaker") == 0)
- {
- dbus_set_volume(device, speakerValue);
- }
- else if (strcmp(device, "mic")== 0)
- {
- dbus_set_volume(device, micValue);
- }
+ dbus_set_volume(device, value[dev]);
}
-
+ update_icons (dev);
}
/** This function updates the sliders without sending the value to the server.
@@ -80,103 +104,74 @@ mute_cb( GtkWidget *widget, gchar* device )
* @param value The value to set [0, 1.0]
*/
void
-set_slider(const gchar * device, gdouble value)
+set_slider(const gchar * device, gdouble newval)
{
- GtkWidget * slider;
- GtkWidget * mute;
- guint * movedConnId;
- guint * toggledConnId;
+ int dev;
if(strcmp(device, "speaker") == 0)
- {
- slider = speakerSlider;
- mute = speakerMuteButton;
- movedConnId = &speakerMovedConnId;
- toggledConnId = &speakerToggledConnId;
- }
- else if (strcmp(device, "mic")== 0)
- {
- slider = micSlider;
- mute = micMuteButton;
- movedConnId = &micMovedConnId;
- toggledConnId = &micToggledConnId;
- }
- gtk_signal_handler_block(GTK_OBJECT(slider),*movedConnId);
- gtk_range_set_value(GTK_RANGE(slider), value);
- gtk_signal_handler_unblock(slider, *movedConnId);
+ dev = SPEAKER;
+ else
+ dev = MIKE;
+
+ gtk_signal_handler_block(GTK_OBJECT(slider[dev]), movedConnId[dev]);
+ gtk_range_set_value(GTK_RANGE(slider[dev]), newval);
+ gtk_signal_handler_unblock(slider[dev], movedConnId[dev]);
+
+ gtk_signal_handler_block(GTK_OBJECT(button[dev]),toggledConnId[dev]);
+ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button[dev]), (newval == 0 ? TRUE: FALSE));
+ gtk_signal_handler_unblock(button[dev], toggledConnId[dev]);
- gtk_signal_handler_block(GTK_OBJECT(mute),*toggledConnId);
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(mute), (value == 0 ? TRUE: FALSE));
- gtk_signal_handler_unblock(mute, *toggledConnId);
+ update_icons (dev);
}
/** Generates the speaker slider and mute button */
GtkWidget *
create_slider(const gchar * device)
{
+ // Increment the references count for the images
+ // When the image is removed from a button, if the ref count = 0, then it is destroyed
+ // which we don't want ;)
+
GtkWidget * ret;
- GtkWidget * slider;
- GtkWidget * button;
- GtkWidget * image;
- //GtkIconTheme * icon_theme;
- //GdkPixbuf * pixbuf = NULL;
- //GError * error = NULL;
- guint * movedConnId = NULL;
- guint * toggledConnId = NULL;
+ int dev;
if(strcmp(device, "speaker") == 0)
{
- movedConnId = &speakerMovedConnId;
- toggledConnId = &speakerToggledConnId;
- image = gtk_image_new_from_file( ICONS_DIR "/speaker.svg");
- //icon_theme = gtk_icon_theme_get_default ();
- //pixbuf = gtk_icon_theme_load_icon (icon_theme,
- // "audio-volume-muted", /* icon name */
- // 16, /* size */
- // 0, /* flags */
- // &error);
- //image = gtk_image_new_from_pixbuf(pixbuf);
+ dev = SPEAKER;
+ images[SPEAKER][MUTED] = gtk_image_new_from_file( ICONS_DIR "/speaker.svg");
+ images[SPEAKER][VOL25] = gtk_image_new_from_file( ICONS_DIR "/speaker_25.svg");
+ images[SPEAKER][VOL50] = gtk_image_new_from_file( ICONS_DIR "/speaker_50.svg");
+ images[SPEAKER][VOL75] = gtk_image_new_from_file( ICONS_DIR "/speaker_75.svg");
+ g_object_ref(images[SPEAKER][MUTED]);
+ g_object_ref(images[SPEAKER][VOL25]);
+ g_object_ref(images[SPEAKER][VOL50]);
+ g_object_ref(images[SPEAKER][VOL75]);
}
else if (strcmp(device, "mic") == 0)
{
- movedConnId = &micMovedConnId;
- toggledConnId = &micToggledConnId;
- image = gtk_image_new_from_file( ICONS_DIR "/mic.svg");
+ dev = MIKE;
+ images[MIKE][MUTED] = gtk_image_new_from_file( ICONS_DIR "/mic.svg");
+ images[MIKE][VOL25] = gtk_image_new_from_file( ICONS_DIR "/mic_25.svg");
+ images[MIKE][VOL50] = gtk_image_new_from_file( ICONS_DIR "/mic_50.svg");
+ images[MIKE][VOL75] = gtk_image_new_from_file( ICONS_DIR "/mic_75.svg");
+ g_object_ref(images[MIKE][MUTED]);
+ g_object_ref(images[MIKE][VOL25]);
+ g_object_ref(images[MIKE][VOL50]);
+ g_object_ref(images[MIKE][VOL75]);
}
-
ret = gtk_hbox_new ( FALSE /*homogeneous*/, 5 /*spacing*/);
- button = gtk_toggle_button_new();
- gtk_box_pack_start (GTK_BOX (ret), button, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
- *toggledConnId = g_signal_connect (G_OBJECT (button), "toggled",
+ button[dev] = gtk_toggle_button_new();
+ gtk_box_pack_start (GTK_BOX (ret), button[dev], FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+ toggledConnId[dev] = g_signal_connect (G_OBJECT (button[dev]), "toggled",
G_CALLBACK (mute_cb), (gpointer)device);
- if (image)
- {
- gtk_button_set_image(GTK_BUTTON(button), image);
- }
- else
- {
- g_warning ("Couldn't load icon");
- }
-
- slider = gtk_hscale_new_with_range(0, 1, 0.05);
- gtk_scale_set_draw_value(GTK_SCALE(slider), FALSE);
+ slider[dev] = gtk_hscale_new_with_range(0, 1, 0.05);
+ gtk_scale_set_draw_value(GTK_SCALE(slider[dev]), FALSE);
//gtk_range_set_update_policy(GTK_RANGE(slider), GTK_UPDATE_DELAYED);
- *movedConnId = g_signal_connect (G_OBJECT (slider), "value_changed",
+ movedConnId[dev] = g_signal_connect (G_OBJECT (slider[dev]), "value_changed",
G_CALLBACK (slider_moved), (gpointer)device);
- gtk_box_pack_start (GTK_BOX (ret), slider, TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
-
- if(strcmp(device, "speaker") == 0)
- {
- speakerSlider = slider;
- speakerMuteButton = button;
- }
- else if (strcmp(device, "mic") == 0)
- {
- micSlider = slider;
- micMuteButton = button;
- }
+ gtk_box_pack_start (GTK_BOX (ret), slider[dev], TRUE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
set_slider(device, dbus_get_volume(device));