diff --git a/sflphone-client-kde/INSTALL b/sflphone-client-kde/INSTALL index c3ff7117560cc3dfc0ebfcac9372724969446242..3f34eb11f87e0bf6684fd4f3126908caba8bae4b 100644 --- a/sflphone-client-kde/INSTALL +++ b/sflphone-client-kde/INSTALL @@ -50,6 +50,6 @@ Options You can change the prefix of the installation using: - .config.sh -DCMAKE_INSTALL_PREFIX="expected_prefix_directory" + .config.sh --prefix="expected_prefix_directory" By default, it is set to /usr. \ No newline at end of file diff --git a/sflphone-client-kde/config.sh b/sflphone-client-kde/config.sh index 931c28bc5e15f6222cbceb638bcdbc6357ca29ac..b67afe8749994aeedc788631397b0a1b2d6d7720 100755 --- a/sflphone-client-kde/config.sh +++ b/sflphone-client-kde/config.sh @@ -15,9 +15,16 @@ fi cd build -autocmd cmake $@ .. +# prefix=`echo $@ | grep -q "--prefix="` +# +# if $prefix +# then options=$@" -DCMAKE_INSTALL_PREFIX="$prefix_env -echo $@ +options=`echo $@ | sed "s/--prefix=/-DCMAKE_INSTALL_PREFIX=/g"` + +autocmd cmake $options .. + +echo $options echo "**********************************************" echo "Configuration done!" diff --git a/sflphone-client-kde/src/ConfigDialog.cpp b/sflphone-client-kde/src/ConfigDialog.cpp index 773803df86147d92b765cabc0b1e2d830421d542..16f04caca3c496d0c541f28da9a557859ce0f68b 100644 --- a/sflphone-client-kde/src/ConfigDialog.cpp +++ b/sflphone-client-kde/src/ConfigDialog.cpp @@ -458,7 +458,6 @@ void ConfigurationDialog::loadAccount(QListWidgetItem * item) edit5_password->setText( account->getAccountDetail(ACCOUNT_PASSWORD)); edit6_mailbox->setText( account->getAccountDetail(ACCOUNT_MAILBOX)); QString status = account->getAccountDetail(ACCOUNT_STATUS); - qDebug() << "Color : " << account->getStateColorName(); edit7_state->setText( "<FONT COLOR=\"" + account->getStateColorName() + "\">" + status + "</FONT>" ); } @@ -513,11 +512,8 @@ void ConfigurationDialog::loadCodecs() tableWidget_codecs->insertRow(i); QTableWidgetItem * headerItem = new QTableWidgetItem(""); tableWidget_codecs->setVerticalHeaderItem (i, headerItem); - //headerItem->setVisible(false); tableWidget_codecs->setItem(i,0,new QTableWidgetItem("")); tableWidget_codecs->setItem(i,1,new QTableWidgetItem(details[CODEC_NAME])); - //qDebug() << "tableWidget_Codecs->itemAt(" << i << "," << 2 << ")->setText(" << details[CODEC_NAME] << ");"; - //tableWidget_Codecs->item(i,2)->setText(details[CODEC_NAME]); tableWidget_codecs->setItem(i,2,new QTableWidgetItem(details[CODEC_SAMPLE_RATE])); tableWidget_codecs->setItem(i,3,new QTableWidgetItem(details[CODEC_BIT_RATE])); tableWidget_codecs->setItem(i,4,new QTableWidgetItem(details[CODEC_BANDWIDTH])); @@ -543,10 +539,8 @@ void ConfigurationDialog::saveCodecs() QStringList activeCodecs; for(int i = 0 ; i < tableWidget_codecs->rowCount() ; i++) { - //qDebug() << "Checked if active : " << tableWidget_Codecs->item(i,1)->text(); if(tableWidget_codecs->item(i,0)->checkState() == Qt::Checked) { - //qDebug() << "Added to activeCodecs : " << tableWidget_Codecs->item(i,1)->text(); activeCodecs << (*codecPayloads)[tableWidget_codecs->item(i,1)->text()]; } } diff --git a/sflphone-client-kde/src/ConfigDialog.h b/sflphone-client-kde/src/ConfigDialog.h index af0c2ffcae1274406466b2b5d8e8ad10867fbf5e..1e113028b729b487e42118cdaf743e8acc2d9467 100644 --- a/sflphone-client-kde/src/ConfigDialog.h +++ b/sflphone-client-kde/src/ConfigDialog.h @@ -48,7 +48,7 @@ private: public: //Constructors & Destructors - ConfigurationDialog(sflphone_kdeView *parent = 0); + ConfigurationDialog(sflphone_kdeView *parent); ~ConfigurationDialog(); //Getters diff --git a/sflphone-client-kde/src/SFLPhone.cpp b/sflphone-client-kde/src/SFLPhone.cpp index 7a5be519f276ed4533b3160b67b7826177218891..7c9ac108d04e47200537dfbb4c7ef3901704745b 100644 --- a/sflphone-client-kde/src/SFLPhone.cpp +++ b/sflphone-client-kde/src/SFLPhone.cpp @@ -120,6 +120,7 @@ void SFLPhone::setupActions() toolbar->addAction(view->action_addressBook); toolbar->addSeparator(); toolbar->addAction(view->action_mailBox); + toolbar->setIconSize(QSize(24,24)); trayIconMenu = new QMenu(this); diff --git a/sflphone-client-kde/src/icons/application-exit.png b/sflphone-client-kde/src/icons/application-exit.png deleted file mode 100644 index dd76354c4a49d07e81d9e701164cdc2caa439a47..0000000000000000000000000000000000000000 Binary files a/sflphone-client-kde/src/icons/application-exit.png and /dev/null differ diff --git a/sflphone-client-kde/src/icons/office-address-book.png b/sflphone-client-kde/src/icons/office-address-book.png deleted file mode 100644 index 3b00f62c87465a2614920885b1bcee6ae7fea2f9..0000000000000000000000000000000000000000 Binary files a/sflphone-client-kde/src/icons/office-address-book.png and /dev/null differ diff --git a/sflphone-client-kde/src/icons/record_disabled.svg b/sflphone-client-kde/src/icons/record_disabled.svg new file mode 100644 index 0000000000000000000000000000000000000000..3f8afeb87a9aa502eae4b89ff5ef046c3264b8b8 --- /dev/null +++ b/sflphone-client-kde/src/icons/record_disabled.svg @@ -0,0 +1,1070 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<!-- Created with Inkscape (http://www.inkscape.org/) --> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="24" + height="24" + id="svg2" + sodipodi:version="0.32" + inkscape:version="0.46" + version="1.0" + sodipodi:docbase="/home/plbeaudoin/SFLPhone/sflphone/sflphone-gtk/pixmaps" + sodipodi:docname="record_disabled.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + sodipodi:modified="true"> + <defs + id="defs4"> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 12 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="24 : 12 : 1" + inkscape:persp3d-origin="12 : 8 : 1" + id="perspective77" /> + <linearGradient + id="linearGradient4045"> + <stop + style="stop-color:#ffffff;stop-opacity:0" + offset="0" + id="stop4047" /> + <stop + style="stop-color:#fefee7;stop-opacity:0.89308178" + 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 + 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 + gradientTransform="matrix(1.256521,0,0,-1.256521,-7.854319,28.773309)" + gradientUnits="userSpaceOnUse" + y2="8.5305319" + x2="15.630395" + y1="22.874208" + x1="15.630395" + id="linearGradient2444" + 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,31.179578,-2.86473)" + gradientUnits="userSpaceOnUse" + id="linearGradient2442" + xlink:href="#linearGradient4269" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(1.1362892,-2.762136)" + gradientUnits="userSpaceOnUse" + y2="13.920053" + x2="6.8378897" + y1="12.625902" + x1="2.0651877" + id="linearGradient2440" + xlink:href="#linearGradient4269" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="10.576721" + x2="14.013638" + y1="2.7028866" + x1="15.647213" + id="linearGradient2438" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(-1.9107675,-0.885198)" + gradientUnits="userSpaceOnUse" + y2="12.535715" + x2="31.31678" + y1="12.535715" + x1="24.397505" + id="linearGradient2436" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + gradientTransform="translate(1.9220986,-1.100752)" + gradientUnits="userSpaceOnUse" + y2="12.825893" + x2="7.9239235" + y1="12.825893" + x1="1.0046476" + id="linearGradient2434" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + id="linearGradient2428"> + <stop + id="stop2430" + offset="0" + style="stop-color:#80000e;stop-opacity:1;" /> + <stop + id="stop2432" + offset="1" + style="stop-color:#b00014;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient2422"> + <stop + style="stop-color:#26b000;stop-opacity:1;" + offset="0" + id="stop2424" /> + <stop + style="stop-color:#145f00;stop-opacity:1;" + offset="1" + id="stop2426" /> + </linearGradient> + <linearGradient + id="linearGradient2416"> + <stop + id="stop2418" + offset="0" + style="stop-color:#26b000;stop-opacity:1;" /> + <stop + id="stop2420" + offset="1" + style="stop-color:#26b000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2483" + gradientUnits="userSpaceOnUse" + x1="15.647213" + y1="2.7028866" + x2="14.013638" + y2="10.576721" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2485" + 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="linearGradient2487" + 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="linearGradient2489" + 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="linearGradient2491" + 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 + gradientUnits="userSpaceOnUse" + y2="355.44769" + x2="189.20502" + y1="118.36168" + x1="192.86734" + id="linearGradient2702" + xlink:href="#linearGradient3169" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3308"> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop3310" /> + <stop + style="stop-color:#ffffff;stop-opacity:0" + offset="1" + id="stop3312" /> + </linearGradient> + <linearGradient + id="linearGradient3289" + inkscape:collect="always"> + <stop + id="stop3291" + offset="0" + style="stop-color:#999999;stop-opacity:1" /> + <stop + id="stop3293" + offset="1" + style="stop-color:#000000;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3193"> + <stop + style="stop-color:#ffffff;stop-opacity:1" + offset="0" + id="stop3195" /> + <stop + style="stop-color:#000000;stop-opacity:1" + offset="1" + id="stop3197" /> + </linearGradient> + <linearGradient + id="linearGradient3181"> + <stop + id="stop3183" + offset="0" + style="stop-color:#ff0000;stop-opacity:1;" /> + <stop + style="stop-color:#ff0000;stop-opacity:0.65271967" + offset="0.11529652" + id="stop3185" /> + <stop + id="stop3187" + offset="1" + style="stop-color:#000000;stop-opacity:0.15481172" /> + </linearGradient> + <linearGradient + id="linearGradient3169"> + <stop + id="stop3171" + offset="0" + style="stop-color:#6b0000;stop-opacity:1;" /> + <stop + id="stop3173" + offset="1" + style="stop-color:#ff0000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient2385"> + <stop + style="stop-color:#ff0000;stop-opacity:1;" + offset="0" + id="stop2387" /> + <stop + id="stop3175" + offset="0.87037039" + style="stop-color:#ff0000;stop-opacity:0.55172414;" /> + <stop + style="stop-color:#ff0000;stop-opacity:1;" + offset="1" + id="stop2389" /> + </linearGradient> + <inkscape:perspective + sodipodi:type="inkscape:persp3d" + inkscape:vp_x="0 : 526.18109 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_z="744.09448 : 526.18109 : 1" + inkscape:persp3d-origin="372.04724 : 350.78739 : 1" + id="perspective10" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient2385" + id="radialGradient3163" + cx="184.85791" + cy="163.42795" + fx="184.85791" + fy="163.42795" + r="140.91121" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3181" + id="linearGradient3179" + x1="175.76654" + y1="316.97113" + x2="184.85791" + y2="23.016739" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3199" + x1="204.55589" + y1="262.45413" + x2="204.55589" + y2="62.412689" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3203" + gradientUnits="userSpaceOnUse" + x1="175.13184" + y1="259.03506" + x2="226.90887" + y2="65.800499" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3211" + gradientUnits="userSpaceOnUse" + x1="204.55589" + y1="262.45413" + x2="204.55589" + y2="62.412689" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3213" + gradientUnits="userSpaceOnUse" + x1="204.55589" + y1="262.45413" + x2="204.55589" + y2="62.412689" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient3287" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient3301" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" + gradientTransform="matrix(-1.1122783,-0.2980341,0.2980341,-1.1122783,376.2049,402.98248)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3308" + id="linearGradient3306" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.1122783,-0.2980341,0.2980341,-1.1122783,306.50437,364.59668)" + x1="160.2529" + y1="-5.1353641" + x2="224.82684" + y2="168.2903" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient3322" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3324" + gradientUnits="userSpaceOnUse" + x1="175.13184" + y1="259.03506" + x2="226.90887" + y2="65.800499" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3308" + id="linearGradient3326" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.1122783,-0.2980341,0.2980341,-1.1122783,747.63347,397.26819)" + x1="160.2529" + y1="-5.1353641" + x2="224.82684" + y2="168.2903" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient3336" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3338" + gradientUnits="userSpaceOnUse" + x1="175.13184" + y1="259.03506" + x2="226.90887" + y2="65.800499" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3308" + id="linearGradient3340" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.1122783,-0.2980341,0.2980341,-1.1122783,558.73494,665.96877)" + x1="160.2529" + y1="-5.1353641" + x2="224.82684" + y2="168.2903" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient3360" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient2641" + gradientUnits="userSpaceOnUse" + x1="175.13184" + y1="259.03506" + x2="226.90887" + y2="65.800499" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3308" + id="linearGradient3364" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.1122783,-0.2980341,0.2980341,-1.1122783,558.73494,665.96877)" + x1="160.2529" + y1="-5.1353641" + x2="224.82684" + y2="168.2903" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient3366" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3368" + gradientUnits="userSpaceOnUse" + x1="175.13184" + y1="259.03506" + x2="226.90887" + y2="65.800499" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3308" + id="linearGradient2646" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-1.1122783,-0.2980341,0.2980341,-1.1122783,747.63347,397.26819)" + x1="160.2529" + y1="-5.1353641" + x2="224.82684" + y2="168.2903" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient3372" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient3374" + gradientUnits="userSpaceOnUse" + x1="175.13184" + y1="259.03506" + x2="226.90887" + y2="65.800499" /> + <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="linearGradient2809" + 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="linearGradient2807" + 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="linearGradient2805" + 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="linearGradient2803" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + y2="10.576721" + x2="14.013638" + y1="2.7028866" + x1="15.647213" + gradientUnits="userSpaceOnUse" + id="linearGradient2801" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + id="linearGradient2795"> + <stop + style="stop-color:#26b000;stop-opacity:1;" + offset="0" + id="stop2797" /> + <stop + style="stop-color:#26b000;stop-opacity:0;" + offset="1" + id="stop2799" /> + </linearGradient> + <linearGradient + id="linearGradient2789"> + <stop + id="stop2791" + offset="0" + style="stop-color:#26b000;stop-opacity:1;" /> + <stop + id="stop2793" + offset="1" + style="stop-color:#145f00;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient2783"> + <stop + style="stop-color:#80000e;stop-opacity:1;" + offset="0" + id="stop2785" /> + <stop + style="stop-color:#b00014;stop-opacity:0;" + offset="1" + id="stop2787" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4183" + id="linearGradient2781" + 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="linearGradient2779" + 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="linearGradient2777" + x1="15.647213" + y1="2.7028866" + x2="14.013638" + y2="10.576721" + gradientUnits="userSpaceOnUse" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient4269" + id="linearGradient2775" + 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="linearGradient2773" + 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="linearGradient2771" + xlink:href="#linearGradient4183" + inkscape:collect="always" /> + <linearGradient + id="linearGradient2765"> + <stop + id="stop2767" + offset="0" + style="stop-color:#80000e;stop-opacity:1;" /> + <stop + id="stop2769" + offset="1" + style="stop-color:#b00014;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient2759"> + <stop + style="stop-color:#1db000;stop-opacity:1;" + offset="0" + id="stop2761" /> + <stop + style="stop-color:#0f5f00;stop-opacity:1;" + offset="1" + id="stop2763" /> + </linearGradient> + <linearGradient + id="linearGradient2753"> + <stop + id="stop2755" + offset="0" + style="stop-color:#1db000;stop-opacity:1;" /> + <stop + id="stop2757" + offset="1" + style="stop-color:#1db000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + id="linearGradient2747"> + <stop + id="stop2749" + offset="0" + style="stop-color:#ffffff;stop-opacity:0" /> + <stop + id="stop2751" + offset="1" + style="stop-color:#fcfbcb;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient3362"> + <stop + id="stop3364" + offset="0" + style="stop-color:#000000;stop-opacity:1;" /> + <stop + id="stop3366" + offset="1" + style="stop-color:#ffffff;stop-opacity:1;" /> + </linearGradient> + <linearGradient + id="linearGradient3370"> + <stop + id="stop3372" + offset="0" + style="stop-color:#d7d7d7;stop-opacity:1;" /> + <stop + id="stop3374" + offset="1" + style="stop-color:#7c7c7c;stop-opacity:1;" /> + </linearGradient> + <inkscape:perspective + id="perspective4283" + inkscape:persp3d-origin="8 : 5.3333333 : 1" + inkscape:vp_z="16 : 8 : 1" + inkscape:vp_y="0 : 1000 : 0" + inkscape:vp_x="0 : 8 : 1" + sodipodi:type="inkscape:persp3d" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="16.739393" + x2="32.578228" + y1="-0.80084854" + x1="2.965755" + id="linearGradient2439" + xlink:href="#linearGradient2433" + inkscape:collect="always" /> + <linearGradient + id="linearGradient2433" + inkscape:collect="always"> + <stop + id="stop2435" + offset="0" + style="stop-color:#008000;stop-opacity:1;" /> + <stop + id="stop2437" + offset="1" + style="stop-color:#008000;stop-opacity:0;" /> + </linearGradient> + <linearGradient + y2="10.576721" + x2="14.013638" + y1="2.7028866" + x1="15.647213" + gradientUnits="userSpaceOnUse" + id="linearGradient2734" + 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="linearGradient2732" + xlink:href="#linearGradient4183" + 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="linearGradient2730" + xlink:href="#linearGradient4183" + 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="linearGradient2728" + 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="linearGradient2726" + xlink:href="#linearGradient4269" + inkscape:collect="always" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3289" + id="linearGradient2538" + gradientUnits="userSpaceOnUse" + x1="224.26379" + y1="259.7438" + x2="172.07999" + y2="66.61824" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3193" + id="linearGradient2540" + gradientUnits="userSpaceOnUse" + x1="175.13184" + y1="259.03506" + x2="226.90887" + y2="65.800499" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3169" + id="linearGradient2542" + gradientUnits="userSpaceOnUse" + x1="192.86734" + y1="118.36168" + x2="189.20502" + y2="355.44769" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="8" + inkscape:cx="-0.008255" + inkscape:cy="-5.4508769" + 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="774" + inkscape:window-x="415" + inkscape:window-y="57" + showgrid="false"> + <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"> + <path + sodipodi:type="arc" + style="fill:url(#radialGradient4051);fill-opacity:1;stroke:none;stroke-width:5.69999981;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" + id="path3162" + sodipodi:cx="19.285715" + sodipodi:cy="9.8571424" + sodipodi:rx="8.0357141" + sodipodi:ry="8.0357141" + d="M 27.321429,9.8571424 A 8.0357141,8.0357141 0 1 1 11.250001,9.8571424 A 8.0357141,8.0357141 0 1 1 27.321429,9.8571424 z" + transform="matrix(0.723409,0,0,0.723409,6.772732,3.51761)" /> + <path + sodipodi:type="arc" + style="fill:url(#linearGradient2538);fill-opacity:1;stroke:none" + id="path3209" + sodipodi:cx="201.02036" + sodipodi:cy="162.41779" + sodipodi:rx="100.0051" + sodipodi:ry="100.0051" + d="M 301.02545,162.41779 A 100.0051,100.0051 0 1 1 101.01526,162.41779 A 100.0051,100.0051 0 1 1 301.02545,162.41779 z" + transform="matrix(-6.9153073e-2,6.9214053e-2,-6.7315028e-2,-6.5348954e-2,37.191581,8.4593329)" /> + <path + sodipodi:type="arc" + style="opacity:0.24886876;fill:url(#linearGradient2540);fill-opacity:1;stroke:none" + id="path3201" + sodipodi:cx="201.02036" + sodipodi:cy="162.41779" + sodipodi:rx="100.0051" + sodipodi:ry="100.0051" + d="M 301.02545,162.41779 A 100.0051,100.0051 0 1 1 101.01526,162.41779 A 100.0051,100.0051 0 1 1 301.02545,162.41779 z" + transform="matrix(2.151327e-2,-7.5958959e-2,7.6170112e-2,1.8032561e-2,-4.3387374,24.099422)" /> + <path + sodipodi:type="arc" + style="opacity:0.59728507;fill:url(#linearGradient2542);fill-opacity:1;stroke:none" + id="path3295" + sodipodi:cx="201.02036" + sodipodi:cy="162.41779" + sodipodi:rx="78.284782" + sodipodi:ry="79.05574" + d="M 279.30514,162.41779 A 78.284782,79.05574 0 1 1 122.73557,162.41779 A 78.284782,79.05574 0 1 1 279.30514,162.41779 z" + transform="matrix(-6.9153073e-2,6.9214053e-2,-6.7315028e-2,-6.5348954e-2,37.191581,8.4593329)" /> + </g> +</svg> diff --git a/sflphone-client-kde/src/qrc/resources.qrc b/sflphone-client-kde/src/qrc/resources.qrc index b12e851e7d035b8767aeab2cb19c2d0a10129098..f80e0438fc2c2019112540a84841b9e7b38e608f 100644 --- a/sflphone-client-kde/src/qrc/resources.qrc +++ b/sflphone-client-kde/src/qrc/resources.qrc @@ -2,8 +2,6 @@ <qresource prefix="images" > <file>../icons/sflphone.svg</file> <file>../icons/sflphone_notif.svg</file> - <file>../icons/application-exit.png</file> - <file>../icons/office-address-book.png</file> <file>../icons/x-office-address-book.png</file> <file>../icons/add.png</file> <file>../icons/remove.png</file> @@ -19,7 +17,6 @@ <file>../icons/history2.svg</file> <file>../icons/history.svg</file> <file>../icons/hold.svg</file> - <file>../icons/application-exit.png</file> <file>../icons/icon_accept.svg</file> <file>../icons/icon_call.svg</file> <file>../icons/icon_dialpad_off.svg</file> @@ -89,6 +86,7 @@ <file>../icons/led-red.svg</file> <file>../icons/led-green.svg</file> <file>../icons/led-gray.svg</file> - <file>../icons/test.svg</file> + <file>../icons/record.svg</file> + <file>../icons/record_disabled.svg</file> </qresource> </RCC> diff --git a/sflphone-client-kde/src/sflphone_const.h b/sflphone-client-kde/src/sflphone_const.h index 52c5a348830dd5812a2ca1ec410fe1526642c2b3..96a56c7603cdcb8c67004cf70e073ecddee9e4e3 100644 --- a/sflphone-client-kde/src/sflphone_const.h +++ b/sflphone-client-kde/src/sflphone_const.h @@ -81,8 +81,8 @@ #define ICON_ACCEPT ":/images/icons/accept.svg" #define ICON_REFUSE ":/images/icons/refuse.svg" #define ICON_EXEC_TRANSF ":/images/icons/call.svg" -#define ICON_REC_DEL_OFF ":/images/icons/del_off.png" -#define ICON_REC_DEL_ON ":/images/icons/del_on.png" +#define ICON_REC_DEL_OFF ":/images/icons/record_disabled.svg" +#define ICON_REC_DEL_ON ":/images/icons/record.svg" #define ICON_REC_VOL_0 ":/images/icons/mic.svg" #define ICON_REC_VOL_1 ":/images/icons/mic_25.svg" diff --git a/sflphone-client-kde/src/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp index 95ea9a1c4085cce6c6545219f88483c6c48d55ae..5de096389cdcefcdee0b20c4b1d5f5cfb9eaf630 100644 --- a/sflphone-client-kde/src/sflphone_kdeview.cpp +++ b/sflphone-client-kde/src/sflphone_kdeview.cpp @@ -407,7 +407,7 @@ void sflphone_kdeView::updateWindowCallState() bool recordActivated = false; //tells whether the call can be recorded in the state it is right now bool recordEnabled = false; - enabledActions[5] = ! firstRegisteredAccount()->getAccountDetail(ACCOUNT_MAILBOX).isempty(); + enabledActions[5] = ! firstRegisteredAccount()->getAccountDetail(ACCOUNT_MAILBOX).isEmpty(); if(stackedWidget_screen->currentWidget() == page_callList) { item = listWidget_callList->currentItem();