diff --git a/sflphone-gtk/pixmaps/Makefile.am b/sflphone-gtk/pixmaps/Makefile.am index 2f1775b8b96ebd2c8dc0585eed55bf586d3575df..980d564221accdad36e58468368cb36274ac3771 100644 --- a/sflphone-gtk/pixmaps/Makefile.am +++ b/sflphone-gtk/pixmaps/Makefile.am @@ -1,3 +1,3 @@ pixmapsdir = $(datadir)/pixmaps -pixmaps_DATA = sflphone.png 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 +pixmaps_DATA = sflphone.png 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 EXTRA_DIST = $(pixmaps_DATA) diff --git a/sflphone-gtk/pixmaps/busy.svg b/sflphone-gtk/pixmaps/busy.svg new file mode 100644 index 0000000000000000000000000000000000000000..3f9adf3e27c52ad3c01af16ce290cf7faa7d7b72 --- /dev/null +++ b/sflphone-gtk/pixmaps/busy.svg @@ -0,0 +1,781 @@ +<?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="24" + height="24" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.45" + version="1.0" + sodipodi:docbase="/home/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps" + sodipodi:docname="current (copie).svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true"> + <defs + id="defs4"> + <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:#ff9e54;stop-opacity:1;" + offset="0" + id="stop4271" /> + <stop + style="stop-color:#903e00;stop-opacity:0;" + offset="1" + id="stop4273" /> + </linearGradient> + <linearGradient + id="linearGradient4183"> + <stop + id="stop4185" + offset="0" + style="stop-color:#903e00;stop-opacity:1;" /> + <stop + id="stop4187" + offset="1" + style="stop-color:#ff750c;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="linearGradient4181" + x1="10.57493" + y1="12.115559" + x2="-0.68574232" + y2="12.115559" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.262691,-1.100752)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient4195" + x1="31.692968" + y1="11.264216" + x2="23.888865" + y2="13.35532" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-0.947018,-0.885198)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient4203" + x1="15.647213" + y1="2.7028866" + x2="14.013638" + y2="10.576721" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient4256" + x1="7.8517423" + y1="15.912388" + x2="7.1114841" + y2="11.597325" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.426158,-2.762136)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient4260" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)" + x1="2.0651877" + y1="12.625902" + x2="6.8378897" + y2="13.920053" /> + <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 + 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="linearGradient2491" + xlink:href="#linearGradient4269" + inkscape:collect="always" /> + <linearGradient + y2="12.113755" + x2="7.293807" + y1="16.110582" + x1="11.408385" + gradientTransform="translate(0.426158,-2.762136)" + gradientUnits="userSpaceOnUse" + id="linearGradient2489" + xlink:href="#linearGradient4269" + inkscape:collect="always" /> + <linearGradient + y2="13.35532" + x2="23.888865" + y1="11.264216" + x1="31.692968" + gradientTransform="translate(-0.947018,-0.885198)" + gradientUnits="userSpaceOnUse" + id="linearGradient2487" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + y2="12.949513" + x2="2.7672646" + y1="12.115559" + x1="10.57493" + gradientTransform="translate(1.262691,-1.100752)" + gradientUnits="userSpaceOnUse" + id="linearGradient2485" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + y2="3.0470817" + x2="23.496424" + y1="10.387442" + x1="1.267894" + gradientUnits="userSpaceOnUse" + id="linearGradient2483" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + id="linearGradient2416"> + <stop + style="stop-color:#26b000;stop-opacity:1;" + offset="0" + id="stop2418" /> + <stop + style="stop-color:#26b000;stop-opacity:0;" + offset="1" + id="stop2420" /> + </linearGradient> + <linearGradient + id="linearGradient2422"> + <stop + id="stop2424" + offset="0" + style="stop-color:#26b000;stop-opacity:1;" /> + <stop + id="stop2426" + offset="1" + style="stop-color:#145f00;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient2428"> + <stop + style="stop-color:#80000e;stop-opacity:1;" + offset="0" + id="stop2430" /> + <stop + style="stop-color:#b00014;stop-opacity:0;" + offset="1" + id="stop2432" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2434" + x1="1.0046476" + y1="12.825893" + x2="7.9239235" + y2="12.825893" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.9220986,-1.100752)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2436" + x1="24.397505" + y1="12.535715" + x2="31.31678" + y2="12.535715" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-1.9107675,-0.885198)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2438" + x1="15.647213" + y1="2.7028866" + x2="14.013638" + y2="10.576721" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient2440" + x1="2.0651877" + y1="12.625902" + x2="6.8378897" + y2="13.920053" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.1362892,-2.762136)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient2442" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1,0,0,1,31.179578,-2.86473)" + x1="2.0651877" + y1="12.625902" + x2="6.8378897" + y2="13.920053" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient2444" + x1="15.630395" + y1="22.874208" + x2="15.630395" + y2="8.5305319" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.256521,0,0,-1.256521,-7.854319,28.773309)" /> + <radialGradient + gradientTransform="matrix(0.418975,2.444023e-18,-2.444023e-18,0.418975,11.20548,5.727248)" + spreadMethod="reflect" + gradientUnits="userSpaceOnUse" + r="10.885714" + fy="9.8571424" + fx="19.285715" + cy="9.8571424" + cx="19.285715" + id="radialGradient2342" + xlink:href="#linearGradient4045" + 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="linearGradient2340" + xlink:href="#linearGradient4269" + inkscape:collect="always" /> + <linearGradient + y2="11.597325" + x2="7.1114841" + y1="15.912388" + x1="7.8517423" + gradientTransform="translate(0.426158,-2.762136)" + gradientUnits="userSpaceOnUse" + id="linearGradient2338" + xlink:href="#linearGradient4269" + inkscape:collect="always" /> + <linearGradient + y2="13.35532" + x2="23.888865" + y1="11.264216" + x1="31.692968" + gradientTransform="translate(-0.947018,-0.885198)" + gradientUnits="userSpaceOnUse" + id="linearGradient2336" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + y2="12.115559" + x2="-0.68574232" + y1="12.115559" + x1="10.57493" + gradientTransform="translate(1.262691,-1.100752)" + gradientUnits="userSpaceOnUse" + id="linearGradient2334" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + y2="10.576721" + x2="14.013638" + y1="2.7028866" + x1="15.647213" + gradientUnits="userSpaceOnUse" + id="linearGradient2332" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + id="linearGradient2326"> + <stop + style="stop-color:#26b000;stop-opacity:1;" + offset="0" + id="stop2328" /> + <stop + style="stop-color:#26b000;stop-opacity:0;" + offset="1" + id="stop2330" /> + </linearGradient> + <linearGradient + id="linearGradient2320"> + <stop + id="stop2322" + offset="0" + style="stop-color:#26b000;stop-opacity:1;" /> + <stop + id="stop2324" + offset="1" + style="stop-color:#145f00;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient2314"> + <stop + style="stop-color:#80000e;stop-opacity:1;" + offset="0" + id="stop2316" /> + <stop + style="stop-color:#b00014;stop-opacity:0;" + offset="1" + id="stop2318" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2312" + x1="1.0046476" + y1="12.825893" + x2="7.9239235" + y2="12.825893" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(1.262691,-1.100752)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2310" + x1="24.397505" + y1="12.535715" + x2="31.31678" + y2="12.535715" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(-0.947018,-0.885198)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2308" + x1="15.647213" + y1="2.7028866" + x2="14.013638" + y2="10.576721" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient2306" + x1="2.0651877" + y1="12.625902" + x2="6.8378897" + y2="13.920053" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0.426158,-2.762136)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient2304" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1,0,0,1,32.04188,-2.86473)" + x1="2.0651877" + y1="12.625902" + x2="6.8378897" + y2="13.920053" /> + <linearGradient + gradientTransform="matrix(0.875025,0,0,0.875025,0.666703,0.177907)" + gradientUnits="userSpaceOnUse" + y2="22.512505" + x2="27.5625" + y1="6.7288713" + x1="16.826796" + id="linearGradient2302" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + id="linearGradient2296"> + <stop + id="stop2298" + offset="0" + style="stop-color:#80000e;stop-opacity:1;" /> + <stop + id="stop2300" + offset="1" + style="stop-color:#b00014;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient2290"> + <stop + style="stop-color:#1db000;stop-opacity:1;" + offset="0" + id="stop2292" /> + <stop + style="stop-color:#0f5f00;stop-opacity:1;" + offset="1" + id="stop2294" /> + </linearGradient> + <linearGradient + id="linearGradient2284"> + <stop + id="stop2286" + offset="0" + style="stop-color:#1db000;stop-opacity:1;" /> + <stop + id="stop2288" + offset="1" + style="stop-color:#1db000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient2278"> + <stop + id="stop2280" + offset="0" + style="stop-color:#ffffff;stop-opacity:0" /> + <stop + id="stop2282" + offset="1" + style="stop-color:#fefee7;stop-opacity:0.89308178" /> + </linearGradient> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="16" + inkscape:cx="13.429637" + inkscape:cy="14.062082" + inkscape:document-units="px" + inkscape:current-layer="layer1" + width="32px" + height="32px" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1014" + inkscape:window-height="691" + inkscape:window-x="5" + inkscape:window-y="425" /> + <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="g2364" + inkscape:label="Calque 1" + transform="translate(12.25524,-3.4355522)"> + <g + transform="translate(7.9455775,4.2707653)" + inkscape:label="Calque 1" + id="g2446"> + <g + id="g2181" + transform="matrix(-0.4376782,-0.758081,0.7581751,-0.4377326,3.5952686,30.820492)" + style="fill:none;stroke:#000000;stroke-opacity:0.44968555"> + <path + style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:0.65573961;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.44968555" + d="M 41.109694,-0.41817229 C 40.505298,0.20454826 39.040867,0.77635346 37.592239,0.77635106 C 36.102089,0.77635106 34.114653,0.15682998 33.532659,-0.49267807 L 33.569913,-2.0031726 L 33.569913,-3.0835065 C 31.027414,-3.5787101 30.997014,-3.8285637 27.525623,-3.8285643 C 24.054233,-3.8285649 23.830777,-3.5759718 21.29017,-3.0462535 L 21.29017,-0.3436665 C 20.685773,0.27905404 19.221343,0.87609843 17.772714,0.87609724 C 16.282564,0.87609724 14.623294,0.43325774 13.915083,-0.41817229 L 14.138601,-5.7646408 C 18.129172,-7.3187814 22.030595,-8.3970767 27.437882,-8.5586077 C 32.38601,-8.450833 36.259126,-7.7053161 40.886177,-5.8763994 L 41.109694,-0.41817229 z " + id="path2183" + sodipodi:nodetypes="csccczccsccccc" /> + </g> + <g + id="g2451" + transform="matrix(-0.4400595,-0.7622054,0.7622054,-0.4400595,-10.917299,27.830684)"> + <path + sodipodi:nodetypes="cccsccsccsccc" + id="path2453" + d="M 16.100095,4.59375 C 10.946289,4.7477067 7.2256019,5.7999634 3.4220983,7.28125 L 3.2345983,10.227679 C 3.7846813,10.972881 5.0136533,11.508929 6.4220983,11.508929 C 7.7912983,11.508929 8.9758403,11.004648 9.5470983,10.290179 L 9.5470983,9.1875 C 11.968608,8.682612 12.862258,8.4375 16.125,8.4375 C 19.479577,8.4375001 20.38467,8.6842603 22.807982,9.15625 L 22.807982,10.165179 C 23.37924,10.879648 24.563781,11.383929 25.932982,11.383929 C 27.341427,11.383929 28.53915,10.847881 29.089232,10.102679 L 28.901732,7.15625 C 24.491586,5.413068 20.816266,4.6964725 16.100095,4.59375 z " + style="opacity:1;fill:url(#linearGradient2483);fill-opacity:1;stroke:#903e00;stroke-width:0.625;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cccsccc" + id="path2455" + d="M 6.4075414,13.019293 C 7.7882612,13.019293 8.983936,12.610489 9.5600003,12.01696 L 9.5600003,10.430989 C 8.8231919,11.109285 7.789205,11.494948 6.4075414,11.494948 C 4.9854414,11.494948 3.9881276,11.13019 3.2127675,10.48174 L 3.2127675,11.966208 C 3.7674786,12.585269 4.9872465,13.019293 6.4075414,13.019293 z " + style="opacity:1;fill:url(#linearGradient2485);fill-opacity:1;stroke:#903e00;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cccsccc" + id="path2457" + d="M 25.967532,12.944669 C 27.348252,12.944669 28.543927,12.535865 29.119991,11.942336 L 29.119991,10.356365 C 28.383183,11.034661 27.349196,11.420324 25.967532,11.420324 C 24.545432,11.420324 23.548118,11.055566 22.772758,10.407116 L 22.772758,11.891584 C 23.327469,12.510645 24.547237,12.944669 25.967532,12.944669 z " + style="opacity:1;fill:url(#linearGradient2487);fill-opacity:1;stroke:#903e00;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cccsccc" + id="path2459" + d="M 6.6822725,11.157918 C 8.0629923,11.157918 8.7535908,10.73333 9.3296551,10.139801 L 9.0644746,7.3100024 C 8.3276662,7.9882984 8.1270706,8.5445024 6.745407,8.5445024 C 5.323307,8.5445024 4.4996132,8.1797444 3.7242531,7.5312944 L 3.4874986,10.104833 C 4.0422097,10.723894 5.2619776,11.157918 6.6822725,11.157918 z " + style="opacity:1;fill:url(#linearGradient2489);fill-opacity:1;stroke:none;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + <path + sodipodi:nodetypes="cccsccc" + id="path2461" + d="M 25.633599,11.055324 C 24.252879,11.055324 23.56228,10.630736 22.986216,10.037207 L 22.418005,7.3779497 C 23.154814,8.0562457 24.188801,8.4419087 25.570464,8.4419087 C 26.992564,8.4419087 27.816258,8.0771507 28.591618,7.4287007 L 28.828373,10.002239 C 28.273662,10.6213 27.053894,11.055324 25.633599,11.055324 z " + style="opacity:1;fill:url(#linearGradient2491);fill-opacity:1;stroke:none;stroke-width:0.57204324;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> + </g> + </g> + </g> + <g + id="g2266" + style="opacity:1;fill:#ff7105;fill-opacity:1;stroke:#903e00;stroke-opacity:1" + transform="matrix(1.2687892,0,0,1.2687892,-6.6211534,-0.9357295)"> + <g + id="g3252"> + <path + sodipodi:type="arc" + style="opacity:1;fill:#2d2d2d;fill-opacity:0.52037615;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path3240" + sodipodi:cx="-19.445436" + sodipodi:cy="8.8477116" + sodipodi:rx="2.2728431" + sodipodi:ry="2.2728431" + d="M -17.172593 8.8477116 A 2.2728431 2.2728431 0 1 1 -21.71828,8.8477116 A 2.2728431 2.2728431 0 1 1 -17.172593 8.8477116 z" + transform="matrix(0.7168524,0,0,0.7168524,28.665086,-2.8957295)" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#ff7105;fill-opacity:1;stroke:#903e00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path2260" + sodipodi:cx="-19.445436" + sodipodi:cy="8.8477116" + sodipodi:rx="2.2728431" + sodipodi:ry="2.2728431" + d="M -17.172593 8.8477116 A 2.2728431 2.2728431 0 1 1 -21.71828,8.8477116 A 2.2728431 2.2728431 0 1 1 -17.172593 8.8477116 z" + transform="matrix(0.4763157,0,0,0.4763157,23.987745,-0.7675302)" /> + </g> + <g + id="g3248" + transform="translate(-0.3694459,0)"> + <path + sodipodi:type="arc" + style="opacity:1;fill:#2d2d2d;fill-opacity:0.52037617;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path3244" + sodipodi:cx="-19.445436" + sodipodi:cy="8.8477116" + sodipodi:rx="2.2728431" + sodipodi:ry="2.2728431" + d="M -17.172593 8.8477116 A 2.2728431 2.2728431 0 1 1 -21.71828,8.8477116 A 2.2728431 2.2728431 0 1 1 -17.172593 8.8477116 z" + transform="matrix(0.7168524,0,0,0.7168524,32.753628,-2.8464698)" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#ff7105;fill-opacity:1;stroke:#903e00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path3246" + sodipodi:cx="-19.445436" + sodipodi:cy="8.8477116" + sodipodi:rx="2.2728431" + sodipodi:ry="2.2728431" + d="M -17.172593 8.8477116 A 2.2728431 2.2728431 0 1 1 -21.71828,8.8477116 A 2.2728431 2.2728431 0 1 1 -17.172593 8.8477116 z" + transform="matrix(0.4763157,0,0,0.4763157,28.076287,-0.7182706)" /> + </g> + <g + style="opacity:1;fill:#ff7105;fill-opacity:1;stroke:#903e00;stroke-opacity:1" + id="g3256" + transform="translate(7.438193,4.925971e-2)"> + <path + sodipodi:type="arc" + style="opacity:1;fill:#2d2d2d;fill-opacity:0.52037617;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path3258" + sodipodi:cx="-19.445436" + sodipodi:cy="8.8477116" + sodipodi:rx="2.2728431" + sodipodi:ry="2.2728431" + d="M -17.172593 8.8477116 A 2.2728431 2.2728431 0 1 1 -21.71828,8.8477116 A 2.2728431 2.2728431 0 1 1 -17.172593 8.8477116 z" + transform="matrix(0.7168524,0,0,0.7168524,28.665086,-2.8957295)" /> + <path + sodipodi:type="arc" + style="opacity:1;fill:#ff7105;fill-opacity:1;stroke:#903e00;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + id="path3260" + sodipodi:cx="-19.445436" + sodipodi:cy="8.8477116" + sodipodi:rx="2.2728431" + sodipodi:ry="2.2728431" + d="M -17.172593 8.8477116 A 2.2728431 2.2728431 0 1 1 -21.71828,8.8477116 A 2.2728431 2.2728431 0 1 1 -17.172593 8.8477116 z" + transform="matrix(0.4763157,0,0,0.4763157,23.987745,-0.7675302)" /> + </g> + </g> + </g> +</svg> diff --git a/sflphone-gtk/pixmaps/fail.svg b/sflphone-gtk/pixmaps/fail.svg new file mode 100644 index 0000000000000000000000000000000000000000..f3751ca7658161c83d6cb7de4d52d9eb87633fe4 --- /dev/null +++ b/sflphone-gtk/pixmaps/fail.svg @@ -0,0 +1,111 @@ +<?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="24" + height="24" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.45" + version="1.0" + sodipodi:docbase="/home/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps" + sodipodi:docname="fail.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true"> + <defs + id="defs4"> + <linearGradient + id="linearGradient4183"> + <stop + id="stop4185" + offset="0" + style="stop-color:#b00014;stop-opacity:1;" /> + <stop + id="stop4187" + offset="1" + style="stop-color:#70000c;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="#linearGradient4167" + id="linearGradient4173" + x1="7.1249466" + y1="23.946518" + x2="20.06057" + y2="16.478132" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(6.313453e-2,-0.384275)" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="1" + inkscape:cx="13.59101" + inkscape:cy="12.669149" + inkscape:document-units="px" + inkscape:current-layer="g3157" + width="32px" + height="32px" + showguides="true" + inkscape:guide-bbox="true" + inkscape:window-width="1014" + inkscape:window-height="691" + inkscape:window-x="5" + inkscape:window-y="49"> + <sodipodi:guide + orientation="horizontal" + position="8.0357143" + id="guide3144" /> + <sodipodi:guide + orientation="vertical" + position="15.982143" + 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="g3157" + transform="matrix(0.8678614,0.8678614,-0.8678614,0.8678614,11.185569,-9.9643113)"> + <path + style="opacity:1;fill:#7e001a;fill-opacity:1;stroke:#3b000b;stroke-width:1.22734141;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.60188085" + d="M 5.25 2.1875 C 4.8395257 2.1875 4.4395267 2.3417233 4.125 2.65625 L 2.59375 4.1875 C 1.9646967 4.8165533 1.9646968 5.8084466 2.59375 6.4375 L 8.3125 12.1875 L 2.59375 17.90625 C 1.9646967 18.535303 1.9646968 19.527197 2.59375 20.15625 L 4.125 21.6875 C 4.7540533 22.316553 5.7771965 22.316553 6.40625 21.6875 L 12.125 15.96875 L 17.84375 21.6875 C 18.472803 22.316553 19.495947 22.316553 20.125 21.6875 L 21.65625 20.15625 C 22.285303 19.527197 22.285303 18.535304 21.65625 17.90625 L 15.9375 12.1875 L 21.65625 6.4375 C 22.285303 5.8084467 22.285303 4.8165534 21.65625 4.1875 L 20.125 2.65625 C 19.495947 2.0271967 18.472803 2.0271966 17.84375 2.65625 L 12.125 8.375 L 6.40625 2.65625 C 6.0917233 2.3417233 5.6604743 2.1875 5.25 2.1875 z " + transform="matrix(0.5761289,-0.5761289,0.5761289,0.5761289,-0.7036018,12.185056)" + id="rect2182" /> + </g> + </g> +</svg> diff --git a/sflphone-gtk/src/actions.c b/sflphone-gtk/src/actions.c index 919476a4c74a4ad6930672302cd6b1d7c8de33fb..f60cc2deaf87717561ecb0a6ae92630465888d73 100644 --- a/sflphone-gtk/src/actions.c +++ b/sflphone-gtk/src/actions.c @@ -132,6 +132,22 @@ sflphone_hang_up( call_t * c ) screen_clear(); } +void +sflphone_fail( call_t * c ) +{ + c->state = CALL_STATE_FAILURE; + update_call_tree(c); + screen_set_call(c); +} + +void +sflphone_busy( call_t * c ) +{ + c->state = CALL_STATE_BUSY; + update_call_tree(c); + screen_set_call(c); +} + void sflphone_current( call_t * c ) { @@ -248,6 +264,8 @@ sflphone_keypad( guint keyval, gchar * key) break; case CALL_STATE_CURRENT: case CALL_STATE_RINGING: + case CALL_STATE_BUSY: + case CALL_STATE_FAILURE: switch (keyval) { case 65307: /* ESCAPE */ diff --git a/sflphone-gtk/src/actions.h b/sflphone-gtk/src/actions.h index 6a9dda052abd4638643ffef26606a50fd0a82139..97b3368f5d03160ebb552b77ba932f443c2778fe 100644 --- a/sflphone-gtk/src/actions.h +++ b/sflphone-gtk/src/actions.h @@ -62,6 +62,9 @@ void sflphone_hold ( call_t * c); */ void sflphone_ringing(call_t * c ); +void sflphone_busy( call_t * c ); +void sflphone_fail( call_t * c ); + /** * Put the call in Current state */ diff --git a/sflphone-gtk/src/calllist.h b/sflphone-gtk/src/calllist.h index 9b0accb65755da8112fcfec7cd43b74bd69a367a..fb5620e8e00f920f0760591d2b9733eebe8c878e 100644 --- a/sflphone-gtk/src/calllist.h +++ b/sflphone-gtk/src/calllist.h @@ -40,7 +40,11 @@ typedef enum /** Call which numbers are being added by the user */ CALL_STATE_DIALING, /** Call is on hold */ - CALL_STATE_HOLD + CALL_STATE_HOLD, + /** Call has failed */ + CALL_STATE_FAILURE, + /** Call is busy */ + CALL_STATE_BUSY } call_state_t; diff --git a/sflphone-gtk/src/calltree.c b/sflphone-gtk/src/calltree.c index 590104b0cb574becfd976aebae578f00368decf9..1f87a57dfd9b72d315f94d0dde8dabef076d8138 100644 --- a/sflphone-gtk/src/calltree.c +++ b/sflphone-gtk/src/calltree.c @@ -147,41 +147,40 @@ update_buttons () gtk_widget_set_sensitive( GTK_WIDGET(unholdButton), FALSE); call_t * selectedCall = call_get_selected(); - if(selectedCall) // TODO Make this a switch + if (selectedCall) { - if( selectedCall->state == CALL_STATE_INCOMING) - { - gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE); - gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); - } - else if( selectedCall->state == CALL_STATE_HOLD) - { - gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); - gtk_widget_set_sensitive( GTK_WIDGET(unholdButton), TRUE); - } - else if( selectedCall->state == CALL_STATE_RINGING) - { - gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); - } - else if(selectedCall->state == CALL_STATE_DIALING) - { - gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE); - gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); - } - else if (selectedCall->state == CALL_STATE_CURRENT) - { - //gtk_widget_hide( callButton ); - /* Hack : if hangupButton is put on the window in create_screen() - * the hbox will request space for 4 buttons making the window larger than needed */ - //gtk_box_pack_start (GTK_BOX (hbox), hangupButton, TRUE /*expand*/, TRUE /*fill*/, 10 /*padding*/); - //gtk_box_reorder_child(GTK_BOX (hbox), hangupButton, 0); - gtk_widget_show( hangupButton ); - gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); - gtk_widget_set_sensitive( GTK_WIDGET(holdButton), TRUE); - gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), TRUE); - } - - } + switch(selectedCall->state) // TODO Make this a switch + { + case CALL_STATE_INCOMING: + gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE); + gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); + break; + case CALL_STATE_HOLD: + gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); + gtk_widget_set_sensitive( GTK_WIDGET(unholdButton), TRUE); + break; + case CALL_STATE_RINGING: + gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); + break; + case CALL_STATE_DIALING: + gtk_widget_set_sensitive( GTK_WIDGET(callButton), TRUE); + gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); + break; + case CALL_STATE_CURRENT: + gtk_widget_show( hangupButton ); + gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); + gtk_widget_set_sensitive( GTK_WIDGET(holdButton), TRUE); + gtk_widget_set_sensitive( GTK_WIDGET(transfertButton), TRUE); + break; + case CALL_STATE_BUSY: + case CALL_STATE_FAILURE: + gtk_widget_set_sensitive( GTK_WIDGET(hangupButton), TRUE); + break; + default: + g_error("Should not happen!"); + break; + } + } } /* Call back when the user click on a call in the list */ static void @@ -365,21 +364,28 @@ update_call_tree (call_t * c) call_get_name(c), call_get_number(c)); - if (c->state == CALL_STATE_HOLD) + switch(c->state) { - pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/hold.svg", NULL); - } - else if (c->state == CALL_STATE_RINGING) - { - pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/ring.svg", NULL); - } - else if (c->state == CALL_STATE_CURRENT) - { - pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/current.svg", NULL); - } - else if (c->state == CALL_STATE_DIALING) - { - pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/dial.svg", NULL); + case CALL_STATE_HOLD: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/hold.svg", NULL); + break; + case CALL_STATE_RINGING: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/ring.svg", NULL); + break; + case CALL_STATE_CURRENT: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/current.svg", NULL); + break; + case CALL_STATE_DIALING: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/dial.svg", NULL); + break; + case CALL_STATE_FAILURE: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/fail.svg", NULL); + break; + case CALL_STATE_BUSY: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/busy.svg", NULL); + break; + default: + g_error("Should not happen!"); } //Resize it if(pixbuf) @@ -422,14 +428,21 @@ update_call_tree_add (call_t * c) gtk_list_store_append (store, &iter); - if (c->state == CALL_STATE_INCOMING) - { - pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/ring.svg", NULL); - } - else if (c->state == CALL_STATE_DIALING) - { - pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/dial.svg", NULL); - } + switch(c->state) + { + case CALL_STATE_INCOMING: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/ring.svg", NULL); + break; + case CALL_STATE_DIALING: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/dial.svg", NULL); + break; + case CALL_STATE_RINGING: + pixbuf = gdk_pixbuf_new_from_file(PIXMAPS_DIR "/ring.svg", NULL); + break; + default: + g_error("Should not happen!"); + } + //Resize it if(pixbuf) { diff --git a/sflphone-gtk/src/dbus.c b/sflphone-gtk/src/dbus.c index e967b00bf288b4f949cc40319bc46f149b92127b..18720d08d264f5ca631e44631de9d51be207e934 100644 --- a/sflphone-gtk/src/dbus.c +++ b/sflphone-gtk/src/dbus.c @@ -112,6 +112,27 @@ call_state_cb (DBusGProxy *proxy, { sflphone_current (c); } + else if ( strcmp(state, "FAILURE") == 0 ) + { + sflphone_fail (c); + } + else if ( strcmp(state, "BUSY") == 0 ) + { + sflphone_busy (c); + } + } + else + { //The callID is unknow, threat it like a new call + if ( strcmp(state, "RINGING") == 0 ) + { + g_print ("New ringing call! %s\n",callID); + call_t * c = g_new0 (call_t, 1); + c->accountID = g_strdup("1"); + c->callID = g_strdup(callID); + c->from = g_strdup("\"\" <>"); + c->state = CALL_STATE_RINGING; + sflphone_incoming_call (c); + } } } diff --git a/sflphone-gtk/src/main.c b/sflphone-gtk/src/main.c index a9bc42f7fa804d4fcef21237479e450e69c4ff2a..66474b098ad94275466b6ff3189fd0101725fc14 100644 --- a/sflphone-gtk/src/main.c +++ b/sflphone-gtk/src/main.c @@ -24,6 +24,7 @@ #include <actions.h> #include <gtk/gtk.h> +#include <stdlib.h> int main (int argc, char *argv[]) @@ -36,6 +37,8 @@ main (int argc, char *argv[]) the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.\n\ There is NO WARRANTY, to the extent permitted by law.\n\n"); + srand ( time(NULL) ); + if(sflphone_init()) { create_main_window ();