diff --git a/sflphone_kde/Account.cpp b/sflphone_kde/Account.cpp
index ed4e9de074ee2be42a02c0bbfed51c7f18ef13f7..03e778a235aa361e08678cb12bee08d36a6dce4e 100644
--- a/sflphone_kde/Account.cpp
+++ b/sflphone_kde/Account.cpp
@@ -65,10 +65,12 @@ Account * Account::buildExistingAccountFromId(QString _accountId)
a->accountDetails = new MapStringString( ConfigurationManagerInterfaceSingleton::getInstance().getAccountDetails(_accountId).value() );
a->initAccountItem();
if(a->item->checkState() == Qt::Checked)
+ {
if(a->getAccountDetail(* new QString(ACCOUNT_STATUS)) == ACCOUNT_STATE_REGISTERED)
a->item->setTextColor(Qt::darkGreen);
else
a->item->setTextColor(Qt::red);
+ }
return a;
}
diff --git a/sflphone_kde/Call.cpp b/sflphone_kde/Call.cpp
index 242a99b1b56af108c33fd9274ab1ef5093be6b8a..48bc86997faf9fa438d03888f9e0d74460dcddc4 100644
--- a/sflphone_kde/Call.cpp
+++ b/sflphone_kde/Call.cpp
@@ -53,7 +53,8 @@ const function Call::actionPerformedFunctionMap[11][5] =
/*ERROR */ {&Call::nothing , &Call::nothing , &Call::nothing , &Call::nothing , &Call::nothing }
};
-const QIcon Call::historyIcons[3] = {QIcon(ICON_HISTORY_INCOMING), QIcon(ICON_HISTORY_OUTGOING), QIcon(ICON_HISTORY_MISSED)};
+const char * Call::historyIcons[3] = {ICON_HISTORY_INCOMING, ICON_HISTORY_OUTGOING, ICON_HISTORY_MISSED};
+
Call::Call(call_state startState, QString callId, QString from, QString account)
{
@@ -64,6 +65,7 @@ Call::Call(call_state startState, QString callId, QString from, QString account)
this->recording = false;
this->currentState = startState;
this->historyItem = NULL;
+
}
Call::~Call()
@@ -112,6 +114,7 @@ daemon_call_state Call::toDaemonCallState(const QString & stateName)
return DAEMON_CALL_STATE_FAILURE;
}
qDebug() << "stateChanged signal received with unknown state.";
+ return DAEMON_CALL_STATE_FAILURE;
}
QListWidgetItem * Call::getItem()
@@ -123,8 +126,8 @@ QListWidgetItem * Call::getHistoryItem()
{
if(historyItem == NULL)
{
- historyItem = new QListWidgetItem("<H1>"+peer+"</H1>");
- historyItem->setIcon(historyIcons[historyState]);
+ historyItem = new QListWidgetItem(peer);
+ historyItem->setIcon(QIcon(historyIcons[historyState]));
}
return historyItem;
}
@@ -197,7 +200,7 @@ void Call::accept(QString number)
CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
qDebug() << "Accepting call. callId : " << callId;
callManager.accept(callId);
- this->startTime = & QDateTime::currentDateTime();
+ this->startTime = new QDateTime(QDateTime::currentDateTime());
this->historyState = INCOMING;
}
@@ -206,7 +209,7 @@ void Call::refuse(QString number)
CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
qDebug() << "Refusing call. callId : " << callId;
callManager.refuse(callId);
- this->startTime = & QDateTime::currentDateTime();
+ this->startTime = new QDateTime(QDateTime::currentDateTime());
this->historyState = MISSED;
}
@@ -267,7 +270,7 @@ void Call::transfer(QString number)
CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
qDebug() << "Transfering call to number : " << number << ". callId : " << callId;
callManager.transfert(callId, number);
- this->stopTime = & QDateTime::currentDateTime();
+ this->stopTime = new QDateTime(QDateTime::currentDateTime());
}
void Call::unhold(QString number)
diff --git a/sflphone_kde/Call.h b/sflphone_kde/Call.h
index 2c55164b426b0a14c63effad33fecb6cf2f72d45..37d0beb648c91e0e339cb619de1dfc815b357eb4 100644
--- a/sflphone_kde/Call.h
+++ b/sflphone_kde/Call.h
@@ -103,7 +103,7 @@ private:
static const call_state actionPerformedStateMap [11][5];
static const function actionPerformedFunctionMap [11][5];
static const call_state stateChangedStateMap [11][6];
- static const QIcon historyIcons[3];
+ static const char * historyIcons[3];
call_state currentState;
bool recording;
diff --git a/sflphone_kde/ConfigDialog.cpp b/sflphone_kde/ConfigDialog.cpp
index 9fd144e91dd1759955b1498dd6590e47e8fc04b0..06287ec80fccfdce803e6883e15e1c49db887095 100644
--- a/sflphone_kde/ConfigDialog.cpp
+++ b/sflphone_kde/ConfigDialog.cpp
@@ -9,20 +9,26 @@
using namespace std;
+
ConfigurationDialog::ConfigurationDialog(SFLPhone *parent) : QDialog(parent)
{
//configuration qt designer
setupUi(this);
//configuration complémentaire
+ QStyle * style = QApplication::style();
errorWindow = new QErrorMessage(this);
codecPayloads = new MapStringString();
- horizontalSlider_Capacity->setMaximum(MAX_HISTORY_CAPACITY);
+ horizontalSlider_historyCapacity->setMaximum(MAX_HISTORY_CAPACITY);
label_WarningSIP->setVisible(false);
- for(int i = 0 ; i < listOptions->count() ; i++)
+ for(int i = 0 ; i < list_options->count() ; i++)
{
- listOptions->item(i)->setTextAlignment(Qt::AlignHCenter);
+ list_options->item(i)->setTextAlignment(Qt::AlignHCenter);
}
+ button_accountUp->setIcon(style->standardIcon(QStyle::SP_ArrowUp));
+ button_accountDown->setIcon(style->standardIcon(QStyle::SP_ArrowDown));
+ toolButton_codecUp->setIcon(style->standardIcon(QStyle::SP_ArrowUp));
+ toolButton_codecDown->setIcon(style->standardIcon(QStyle::SP_ArrowDown));
//TODO ajouter les items de l'interface audio ici avec les constantes
@@ -52,33 +58,33 @@ void ConfigurationDialog::loadOptions()
////////////////////////
//Call history settings
- spinBox_CapaciteHist->setValue(daemon.getMaxCalls());
+ spinBox_historyCapacity->setValue(daemon.getMaxCalls());
//SIP port settings
int sipPort = daemon.getSipPort();
if(sipPort<1025){
- spinBox_PortSIP->setMinimum(sipPort);
+ spinBox_SIPPort->setMinimum(sipPort);
label_WarningSIP->setText("Attention : le port SIP doit être supérieur à 1024 !");
label_WarningSIP->setVisible(true);
}
if(sipPort>65535){
- spinBox_PortSIP->setMaximum(sipPort);
+ spinBox_SIPPort->setMaximum(sipPort);
label_WarningSIP->setText("Attention : le port SIP doit être inférieur à 65536 !");
label_WarningSIP->setVisible(true);
}
- spinBox_PortSIP->setValue(daemon.getSipPort());
+ spinBox_SIPPort->setValue(daemon.getSipPort());
////////////////////////
////Display settings////
////////////////////////
//Notification settings
- checkBox1_NotifAppels->setCheckState(daemon.getNotify() ? Qt::Checked : Qt::Unchecked);
- checkBox2_NotifMessages->setCheckState(daemon.getMailNotify() ? Qt::Checked : Qt::Unchecked);
+ checkBox1_notifOnCalls->setCheckState(daemon.getNotify() ? Qt::Checked : Qt::Unchecked);
+ checkBox2_notifOnMessages->setCheckState(daemon.getMailNotify() ? Qt::Checked : Qt::Unchecked);
//Window display settings
- checkBox1_FenDemarrage->setCheckState(daemon.isStartHidden() ? Qt::Unchecked : Qt::Checked);
- checkBox2_FenAppel->setCheckState(daemon.popupMode() ? Qt::Checked : Qt::Unchecked);
+ checkBox1_displayOnStart->setCheckState(daemon.isStartHidden() ? Qt::Unchecked : Qt::Checked);
+ checkBox2_displayOnCalls->setCheckState(daemon.popupMode() ? Qt::Checked : Qt::Unchecked);
/////////////////////////
////Accounts settings////
@@ -87,19 +93,19 @@ void ConfigurationDialog::loadOptions()
loadAccountList();
//Stun settings
- checkBoxStun->setCheckState(daemon.isStunEnabled() ? Qt::Checked : Qt::Unchecked);
- lineEdit_Stun->setText(QString(daemon.getStunServer()));
+ checkBox_stun->setCheckState(daemon.isStunEnabled() ? Qt::Checked : Qt::Unchecked);
+ lineEdit_stun->setText(QString(daemon.getStunServer()));
//////////////////////
////Audio settings////
//////////////////////
//Audio Interface settings
- comboBox_Interface->setCurrentIndex(daemon.getAudioManager());
- stackedWidget_ParametresSpecif->setCurrentIndex(daemon.getAudioManager());
+ comboBox_interface->setCurrentIndex(daemon.getAudioManager());
+ stackedWidget_interfaceSpecificSettings->setCurrentIndex(daemon.getAudioManager());
//ringtones settings
- checkBox_Sonneries->setCheckState(daemon.isRingtoneEnabled() ? Qt::Checked : Qt::Unchecked);
+ checkBox_ringtones->setCheckState(daemon.isRingtoneEnabled() ? Qt::Checked : Qt::Unchecked);
//TODO widget choix de sonnerie
//widget_nomSonnerie->setText(daemon.getRingtoneChoice());
@@ -108,29 +114,29 @@ void ConfigurationDialog::loadOptions()
//
//alsa settings
- comboBox1_GreffonAlsa->clear();
+ comboBox1_alsaPlugin->clear();
QStringList pluginList = daemon.getOutputAudioPluginList();
- comboBox1_GreffonAlsa->addItems(pluginList);
- comboBox1_GreffonAlsa->setCurrentIndex(comboBox1_GreffonAlsa->findText(daemon.getCurrentAudioOutputPlugin()));
+ comboBox1_alsaPlugin->addItems(pluginList);
+ comboBox1_alsaPlugin->setCurrentIndex(comboBox1_alsaPlugin->findText(daemon.getCurrentAudioOutputPlugin()));
qDebug() << "avant daemon.getCurrentAudioDevicesIndex();";
QStringList devices = daemon.getCurrentAudioDevicesIndex();
qDebug() << "apres daemon.getCurrentAudioDevicesIndex();";
int inputDevice = devices[1].toInt();
- comboBox2_Entree->clear();
+ comboBox2_in->clear();
QStringList inputDeviceList = daemon.getAudioInputDeviceList();
- comboBox2_Entree->addItems(inputDeviceList);
- comboBox2_Entree->setCurrentIndex(inputDevice);
+ comboBox2_in->addItems(inputDeviceList);
+ comboBox2_in->setCurrentIndex(inputDevice);
int outputDevice = devices[0].toInt();
- comboBox3_Sortie->clear();
+ comboBox3_out->clear();
QStringList outputDeviceList = daemon.getAudioOutputDeviceList();
- comboBox3_Sortie->addItems(inputDeviceList);
- comboBox3_Sortie->setCurrentIndex(outputDevice);
+ comboBox3_out->addItems(inputDeviceList);
+ comboBox3_out->setCurrentIndex(outputDevice);
//pulseaudio settings
- checkBox_ModifVolumeApps->setCheckState(daemon.getPulseAppVolumeControl() ? Qt::Checked : Qt::Unchecked);
+ checkBox_pulseAudioVolumeAlter->setCheckState(daemon.getPulseAppVolumeControl() ? Qt::Checked : Qt::Unchecked);
}
@@ -145,10 +151,10 @@ void ConfigurationDialog::saveOptions()
////////////////////////
//Call history settings
- daemon.setMaxCalls(spinBox_CapaciteHist->value());
+ daemon.setMaxCalls(spinBox_historyCapacity->value());
//SIP port settings
- int sipPort = spinBox_PortSIP->value();
+ int sipPort = spinBox_SIPPort->value();
if(sipPort<1025){
errorWindow->showMessage("Attention : le port SIP doit être supérieur à 1024 !");
@@ -163,13 +169,13 @@ void ConfigurationDialog::saveOptions()
////////////////////////
//Notification settings
- if(checkBox1_NotifAppels->checkState() != (daemon.getNotify() ? Qt::Checked : Qt::Unchecked)) daemon.setNotify();
- if(checkBox2_NotifMessages->checkState() != (daemon.getMailNotify() ? Qt::Checked : Qt::Unchecked)) daemon.setMailNotify();
+ if(checkBox1_notifOnCalls->checkState() != (daemon.getNotify() ? Qt::Checked : Qt::Unchecked)) daemon.setNotify();
+ if(checkBox2_notifOnMessages->checkState() != (daemon.getMailNotify() ? Qt::Checked : Qt::Unchecked)) daemon.setMailNotify();
//Window display settings
//WARNING états inversés
- if(checkBox1_FenDemarrage->checkState() != (daemon.isStartHidden() ? Qt::Unchecked : Qt::Checked)) daemon.startHidden();
- if(checkBox2_FenAppel->checkState() != (daemon.popupMode() ? Qt::Checked : Qt::Unchecked)) daemon.switchPopupMode();
+ if(checkBox1_displayOnStart->checkState() != (daemon.isStartHidden() ? Qt::Unchecked : Qt::Checked)) daemon.startHidden();
+ if(checkBox2_displayOnCalls->checkState() != (daemon.popupMode() ? Qt::Checked : Qt::Unchecked)) daemon.switchPopupMode();
/////////////////////////
////Accounts settings////
@@ -178,8 +184,8 @@ void ConfigurationDialog::saveOptions()
saveAccountList();
//Stun settings
- if(checkBoxStun->checkState() != (daemon.isStunEnabled() ? Qt::Checked : Qt::Unchecked)) daemon.enableStun();
- daemon.setStunServer(lineEdit_Stun->text());
+ if(checkBox_stun->checkState() != (daemon.isStunEnabled() ? Qt::Checked : Qt::Unchecked)) daemon.enableStun();
+ daemon.setStunServer(lineEdit_stun->text());
//////////////////////
////Audio settings////
@@ -187,12 +193,12 @@ void ConfigurationDialog::saveOptions()
//Audio Interface settings
qDebug() << "setting audio manager";
- int manager = comboBox_Interface->currentIndex();
+ int manager = comboBox_interface->currentIndex();
daemon.setAudioManager(manager);
//ringtones settings
qDebug() << "setting ringtone options";
- if(checkBox_Sonneries->checkState() != (daemon.isRingtoneEnabled() ? Qt::Checked : Qt::Unchecked)) daemon.ringtoneEnabled();
+ if(checkBox_ringtones->checkState() != (daemon.isRingtoneEnabled() ? Qt::Checked : Qt::Unchecked)) daemon.ringtoneEnabled();
//TODO widget choix de sonnerie
//daemon.getRingtoneChoice(widget_nomSonnerie->text());
@@ -204,15 +210,15 @@ void ConfigurationDialog::saveOptions()
if(manager == ALSA)
{
qDebug() << "setting alsa settings";
- daemon.setOutputAudioPlugin(comboBox1_GreffonAlsa->currentText());
- daemon.setAudioInputDevice(comboBox2_Entree->currentIndex());
- daemon.setAudioOutputDevice(comboBox3_Sortie->currentIndex());
+ daemon.setOutputAudioPlugin(comboBox1_alsaPlugin->currentText());
+ daemon.setAudioInputDevice(comboBox2_in->currentIndex());
+ daemon.setAudioOutputDevice(comboBox3_out->currentIndex());
}
//pulseaudio settings
if(manager == PULSEAUDIO)
{
qDebug() << "setting pulseaudio settings";
- if(checkBox_ModifVolumeApps->checkState() != (daemon.getPulseAppVolumeControl() ? Qt::Checked : Qt::Unchecked)) daemon.setPulseAppVolumeControl();
+ if(checkBox_pulseAudioVolumeAlter->checkState() != (daemon.getPulseAppVolumeControl() ? Qt::Checked : Qt::Unchecked)) daemon.setPulseAppVolumeControl();
}
}
@@ -224,21 +230,21 @@ void ConfigurationDialog::loadAccountList()
//create the AccountList object with the ids
accountList = new AccountList(accountIds);
//initialize the QListWidget object with the AccountList
- listWidgetComptes->clear();
+ listWidget_accountList->clear();
for (int i = 0; i < accountList->size(); ++i){
- listWidgetComptes->addItem((*accountList)[i].getItem());
+ listWidget_accountList->addItem((*accountList)[i].getItem());
}
- if (listWidgetComptes->count() > 0)
- listWidgetComptes->setCurrentRow(0);
+ if (listWidget_accountList->count() > 0)
+ listWidget_accountList->setCurrentRow(0);
else
- frame2_EditComptes->setEnabled(false);
+ frame2_editAccounts->setEnabled(false);
}
void ConfigurationDialog::saveAccountList()
{
//save the account being edited
- if(listWidgetComptes->currentItem())
- saveAccount(listWidgetComptes->currentItem());
+ if(listWidget_accountList->currentItem())
+ saveAccount(listWidget_accountList->currentItem());
//get the daemon instance
ConfigurationManagerInterface & daemon = ConfigurationManagerInterfaceSingleton::getInstance();
//ask for the list of accounts ids to the daemon
@@ -282,15 +288,15 @@ void ConfigurationDialog::loadAccount(QListWidgetItem * item)
Account * account = accountList->getAccountByItem(item);
if(! account ) { qDebug() << "Attempting to load details of an unexisting account"; return; }
- edit1_Alias->setText( account->getAccountDetail(*(new QString(ACCOUNT_ALIAS))));
+ edit1_alias->setText( account->getAccountDetail(*(new QString(ACCOUNT_ALIAS))));
int protocoleIndex = getProtocoleIndex(account->getAccountDetail(*(new QString(ACCOUNT_TYPE))));
- edit2_Protocole->setCurrentIndex( (protocoleIndex < 0) ? 0 : protocoleIndex );
- edit3_Serveur->setText( account->getAccountDetail(*(new QString(ACCOUNT_HOSTNAME))));
- edit4_Usager->setText( account->getAccountDetail(*(new QString(ACCOUNT_USERNAME))));
- edit5_Mdp->setText( account->getAccountDetail(*(new QString(ACCOUNT_PASSWORD))));
- edit6_BoiteVocale->setText( account->getAccountDetail(*(new QString(ACCOUNT_MAILBOX))));
+ edit2_protocol->setCurrentIndex( (protocoleIndex < 0) ? 0 : protocoleIndex );
+ edit3_server->setText( account->getAccountDetail(*(new QString(ACCOUNT_HOSTNAME))));
+ edit4_user->setText( account->getAccountDetail(*(new QString(ACCOUNT_USERNAME))));
+ edit5_password->setText( account->getAccountDetail(*(new QString(ACCOUNT_PASSWORD))));
+ edit6_mailbox->setText( account->getAccountDetail(*(new QString(ACCOUNT_MAILBOX))));
QString status = account->getAccountDetail(*(new QString(ACCOUNT_STATUS)));
- edit7_Etat->setText( "<FONT COLOR=\"" + account->getStateColorName() + "\">" + status + "</FONT>" );
+ edit7_state->setText( "<FONT COLOR=\"" + account->getStateColorName() + "\">" + status + "</FONT>" );
//edit7_Etat->setTextColor( account->getStateColor );
}
@@ -302,12 +308,12 @@ void ConfigurationDialog::saveAccount(QListWidgetItem * item)
Account * account = accountList->getAccountByItem(item);
if(! account) { qDebug() << "Attempting to save details of an unexisting account : " << item->text(); return; }
- account->setAccountDetail(ACCOUNT_ALIAS, edit1_Alias->text());
- account->setAccountDetail(ACCOUNT_TYPE, getIndexProtocole(edit2_Protocole->currentIndex()));
- account->setAccountDetail(ACCOUNT_HOSTNAME, edit3_Serveur->text());
- account->setAccountDetail(ACCOUNT_USERNAME, edit4_Usager->text());
- account->setAccountDetail(ACCOUNT_PASSWORD, edit5_Mdp->text());
- account->setAccountDetail(ACCOUNT_MAILBOX, edit6_BoiteVocale->text());
+ account->setAccountDetail(ACCOUNT_ALIAS, edit1_alias->text());
+ account->setAccountDetail(ACCOUNT_TYPE, getIndexProtocole(edit2_protocol->currentIndex()));
+ account->setAccountDetail(ACCOUNT_HOSTNAME, edit3_server->text());
+ account->setAccountDetail(ACCOUNT_USERNAME, edit4_user->text());
+ account->setAccountDetail(ACCOUNT_PASSWORD, edit5_password->text());
+ account->setAccountDetail(ACCOUNT_MAILBOX, edit6_mailbox->text());
}
@@ -319,7 +325,7 @@ void ConfigurationDialog::loadCodecs()
QStringList activeCodecList = daemon.getActiveCodecList();
qDebug() << codecList;
qDebug() << activeCodecList;
- tableWidget_Codecs->setRowCount(0);
+ tableWidget_codecs->setRowCount(0);
codecPayloads->clear();
for(int i=0 ; i<codecList.size() ; i++)
{
@@ -332,29 +338,29 @@ void ConfigurationDialog::loadCodecs()
else
{
QStringList details = daemon.getCodecDetails(payload);
- tableWidget_Codecs->insertRow(i);
+ tableWidget_codecs->insertRow(i);
QTableWidgetItem * headerItem = new QTableWidgetItem("");
- tableWidget_Codecs->setVerticalHeaderItem (i, headerItem);
+ 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]));
+ 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]));
- tableWidget_Codecs->item(i,0)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
- tableWidget_Codecs->item(i,0)->setCheckState(activeCodecList.contains(codecList[i]) ? Qt::Checked : Qt::Unchecked);
- tableWidget_Codecs->item(i,1)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
- tableWidget_Codecs->item(i,2)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
- tableWidget_Codecs->item(i,3)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
- tableWidget_Codecs->item(i,4)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+ 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]));
+ tableWidget_codecs->item(i,0)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsUserCheckable|Qt::ItemIsEnabled);
+ tableWidget_codecs->item(i,0)->setCheckState(activeCodecList.contains(codecList[i]) ? Qt::Checked : Qt::Unchecked);
+ tableWidget_codecs->item(i,1)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+ tableWidget_codecs->item(i,2)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+ tableWidget_codecs->item(i,3)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
+ tableWidget_codecs->item(i,4)->setFlags(Qt::ItemIsSelectable|Qt::ItemIsEnabled);
(*codecPayloads)[details[CODEC_NAME]] = payloadStr;
qDebug() << "Added to codecs : " << payloadStr << " , " << details[CODEC_NAME];
}
}
- tableWidget_Codecs->resizeColumnsToContents();
- tableWidget_Codecs->resizeRowsToContents();
+ tableWidget_codecs->resizeColumnsToContents();
+ tableWidget_codecs->resizeRowsToContents();
}
@@ -362,13 +368,13 @@ void ConfigurationDialog::saveCodecs()
{
ConfigurationManagerInterface & daemon = ConfigurationManagerInterfaceSingleton::getInstance();
QStringList activeCodecs;
- for(int i = 0 ; i < tableWidget_Codecs->rowCount() ; i++)
+ 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)
+ 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()];
+ activeCodecs << (*codecPayloads)[tableWidget_codecs->item(i,1)->text()];
}
}
qDebug() << "Calling setActiveCodecList with list : " << activeCodecs ;
@@ -377,25 +383,59 @@ void ConfigurationDialog::saveCodecs()
void ConfigurationDialog::setPage(int page)
{
- stackedWidgetOptions->setCurrentIndex(page);
- listOptions->setCurrentRow(page);
+ stackedWidget_options->setCurrentIndex(page);
+ list_options->setCurrentRow(page);
}
-void ConfigurationDialog::on_edit1_Alias_textChanged(const QString & text)
+void ConfigurationDialog::updateAccountListCommands()
{
- listWidgetComptes->currentItem()->setText(text);
+ bool buttonsEnabled[4] = {true,true,true,true};
+ if(! listWidget_accountList->currentItem())
+ {
+ buttonsEnabled[0] = false;
+ buttonsEnabled[1] = false;
+ buttonsEnabled[3] = false;
+ }
+ else if(listWidget_accountList->currentRow() == 0)
+ {
+ buttonsEnabled[0] = false;
+ }
+ else if(listWidget_accountList->currentRow() == listWidget_accountList->count() - 1)
+ {
+ buttonsEnabled[1] = false;
+ }
+ button_accountUp->setEnabled(buttonsEnabled[0]);
+ button_accountDown->setEnabled(buttonsEnabled[1]);
+ button_accountAdd->setEnabled(buttonsEnabled[2]);
+ button_accountRemove->setEnabled(buttonsEnabled[3]);
}
+void ConfigurationDialog::updateCodecListCommands()
+{
+ bool buttonsEnabled[2] = {true,true};
+ if(! listWidget_accountList->currentItem())
+ {
+ buttonsEnabled[0] = false;
+ buttonsEnabled[1] = false;
+ }
+ else if(listWidget_accountList->currentRow() == 0)
+ {
+ buttonsEnabled[0] = false;
+ }
+ else if(listWidget_accountList->currentRow() == listWidget_accountList->count() - 1)
+ {
+ buttonsEnabled[1] = false;
+ }
+ toolButton_codecUp->setEnabled(buttonsEnabled[0]);
+ toolButton_codecDown->setEnabled(buttonsEnabled[1]);
+}
-void ConfigurationDialog::on_listWidgetComptes_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous )
+void ConfigurationDialog::on_edit1_alias_textChanged(const QString & text)
{
- if(previous)
- saveAccount(previous);
- if(current)
- loadAccount(current);
+ listWidget_accountList->currentItem()->setText(text);
}
-void ConfigurationDialog::on_spinBox_PortSIP_valueChanged ( int value )
+void ConfigurationDialog::on_spinBox_SIPPort_valueChanged ( int value )
{
if(value>1024 && value<65536)
label_WarningSIP->setVisible(false);
@@ -403,28 +443,73 @@ void ConfigurationDialog::on_spinBox_PortSIP_valueChanged ( int value )
label_WarningSIP->setVisible(true);
}
+void ConfigurationDialog::on_listWidget_codecs_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous )
+{
+ qDebug() << "on_listWidget_codecs_currentItemChanged";
+ updateCodecListCommands();
+}
+
+void ConfigurationDialog::on_toolButton_codecUp_clicked()
+{
+}
+
+void ConfigurationDialog::on_toolButton_codecDown_clicked()
+{/*
+ int currentRow = listWidget_codecs->currentRow();
+ int nbCol = tableWidget_codecs->columnCount();
+ QTableWidgetSelectionRange row(currentRow, 0, currentRow, nbCol - 1);
+ QListWidgetItem * item = listWidget_accountList->takeItem(currentRow);
+ listWidget_accountList->insertItem(currentRow + 1 , item);
+ listWidget_accountList->setCurrentItem(item);
+*/}
+
+void ConfigurationDialog::on_listWidget_accountList_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous )
+{
+ qDebug() << "on_listWidget_accountList_currentItemChanged";
+ if(previous)
+ saveAccount(previous);
+ if(current)
+ loadAccount(current);
+ updateAccountListCommands();
+}
+void ConfigurationDialog::on_button_accountUp_clicked()
+{
+ int currentRow = listWidget_accountList->currentRow();
+ QListWidgetItem * item = listWidget_accountList->takeItem(currentRow);
+ listWidget_accountList->insertItem(currentRow - 1 , item);
+ listWidget_accountList->setCurrentItem(item);
+}
-void ConfigurationDialog::on_button_newAccount_clicked()
+void ConfigurationDialog::on_button_accountDown_clicked()
+{
+ int currentRow = listWidget_accountList->currentRow();
+ QListWidgetItem * item = listWidget_accountList->takeItem(currentRow);
+ listWidget_accountList->insertItem(currentRow + 1 , item);
+ listWidget_accountList->setCurrentItem(item);
+}
+
+void ConfigurationDialog::on_button_accountAdd_clicked()
{
QString itemName = QInputDialog::getText(this, "New account", "Enter new account's alias");
itemName = itemName.simplified();
if (!itemName.isEmpty()) {
QListWidgetItem * item = accountList->addAccount(itemName);
+
//TODO verifier que addItem set bien le parent
- listWidgetComptes->addItem(item);
- int r = listWidgetComptes->count() - 1;
- listWidgetComptes->setCurrentRow(r);
- frame2_EditComptes->setEnabled(true);
+ listWidget_accountList->addItem(item);
+ int r = listWidget_accountList->count() - 1;
+ listWidget_accountList->setCurrentRow(r);
+ frame2_editAccounts->setEnabled(true);
}
}
-void ConfigurationDialog::on_button_delAccount_clicked()
+void ConfigurationDialog::on_button_accountRemove_clicked()
{
- int r = listWidgetComptes->currentRow();
- QListWidgetItem * item = listWidgetComptes->takeItem(r);
+ int r = listWidget_accountList->currentRow();
+ QListWidgetItem * item = listWidget_accountList->takeItem(r);
accountList->removeAccount(item);
- listWidgetComptes->setCurrentRow( (r >= listWidgetComptes->count()) ? r-1 : r );
+ listWidget_accountList->setCurrentRow( (r >= listWidget_accountList->count()) ? r-1 : r );
}
@@ -450,6 +535,29 @@ void ConfigurationDialog::on_buttonBoxDialog_clicked(QAbstractButton * button)
}
}
+void ConfigurationDialog::on_tableWidget_codecs_currentItemChanged(QTableWidgetItem * current, QTableWidgetItem * previous)
+{
+ qDebug() << "on_tableWidget_codecs_currentItemChanged";
+ int row = current->row();
+ int nbCol = tableWidget_codecs->columnCount();
+ for(int i = 0 ; i < nbCol ; i++)
+ {
+ tableWidget_codecs->setRangeSelected(QTableWidgetSelectionRange(row, 0, row, nbCol - 1), true);
+ }
+ updateCodecListCommands();
+}
+
+void ConfigurationDialog::on_tableWidget_codecs_currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn)
+{
+ qDebug() << "on_tableWidget_codecs_currentCellChanged";
+ int nbCol = tableWidget_codecs->columnCount();
+ for(int i = 0 ; i < nbCol ; i++)
+ {
+ tableWidget_codecs->setRangeSelected(QTableWidgetSelectionRange(currentRow, 0, currentRow, nbCol - 1), true);
+ }
+ updateCodecListCommands();
+}
+
/*
void ConfigurationDialog::on_listWidgetComptes_itemChanged(QListWidgetItem * item)
{
diff --git a/sflphone_kde/ConfigDialog.h b/sflphone_kde/ConfigDialog.h
index e5a8ddca36bbe5f0efcf123f2065de905bc6c753..72e94458199df62e5b8bb61775413f5ae93cc12f 100644
--- a/sflphone_kde/ConfigDialog.h
+++ b/sflphone_kde/ConfigDialog.h
@@ -8,14 +8,12 @@
#include "SFLPhone.h"
#include <QErrorMessage>
-
class SFLPhone;
class ConfigurationDialog : public QDialog, private Ui::ConfigurationDialog
{
Q_OBJECT
-
private:
AccountList * accountList;
QErrorMessage * errorWindow;
@@ -38,16 +36,25 @@ public:
void saveOptions();
void setPage(int page);
+
+ void updateCodecListCommands();
+ void updateAccountListCommands();
private slots:
- void on_button_delAccount_clicked();
- void on_button_newAccount_clicked();
- void on_edit1_Alias_textChanged(const QString & text);
- void on_listWidgetComptes_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous );
- void on_spinBox_PortSIP_valueChanged ( int value );
+ void on_toolButton_codecUp_clicked();
+ void on_toolButton_codecDown_clicked();
+ void on_button_accountUp_clicked();
+ void on_button_accountDown_clicked();
+ void on_button_accountAdd_clicked();
+ void on_button_accountRemove_clicked();
+ void on_edit1_alias_textChanged(const QString & text);
+ void on_listWidget_accountList_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous );
+ void on_listWidget_codecs_currentItemChanged ( QListWidgetItem * current, QListWidgetItem * previous );
+ void on_spinBox_SIPPort_valueChanged ( int value );
void on_buttonBoxDialog_clicked(QAbstractButton * button);
-};
-
+ void on_tableWidget_codecs_currentItemChanged(QTableWidgetItem * current, QTableWidgetItem * previous);
+ void on_tableWidget_codecs_currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn);
+};
#endif
diff --git a/sflphone_kde/ConfigDialog.ui b/sflphone_kde/ConfigDialog.ui
index e92d6f8f429ef03ec8f2ae4f97f320dcba1f7828..342ec5d390f2c30fb9ac808486214961c0d9b2c4 100644
--- a/sflphone_kde/ConfigDialog.ui
+++ b/sflphone_kde/ConfigDialog.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>504</width>
- <height>432</height>
+ <height>435</height>
</rect>
</property>
<property name="minimumSize" >
@@ -29,7 +29,7 @@
<enum>QLayout::SetDefaultConstraint</enum>
</property>
<item>
- <widget class="QListWidget" name="listOptions" >
+ <widget class="QListWidget" name="list_options" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -143,38 +143,38 @@
</widget>
</item>
<item>
- <widget class="Line" name="lineOptions" >
+ <widget class="Line" name="line_options" >
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item>
- <widget class="QStackedWidget" name="stackedWidgetOptions" >
+ <widget class="QStackedWidget" name="stackedWidget_options" >
<property name="currentIndex" >
<number>2</number>
</property>
- <widget class="QWidget" name="page_General" >
+ <widget class="QWidget" name="page_general" >
<layout class="QVBoxLayout" name="verticalLayout_18" >
<property name="leftMargin" >
<number>4</number>
</property>
<item>
- <widget class="QLabel" name="label_ConfGeneral" >
+ <widget class="QLabel" name="label_configGeneral" >
<property name="text" >
<string>Configuration des paramètres généraux</string>
</property>
</widget>
</item>
<item>
- <widget class="Line" name="line_ConfGeneral" >
+ <widget class="Line" name="line_ConfigGeneral" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox1_Historique" >
+ <widget class="QGroupBox" name="groupBox1_history" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -186,20 +186,20 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_19" >
<item>
- <widget class="QWidget" native="1" name="widget_CapaciteHist" >
+ <widget class="QWidget" native="1" name="widget_historyCapacity" >
<layout class="QHBoxLayout" name="horizontalLayout_10" >
<item>
- <widget class="QLabel" name="label_Capacite" >
+ <widget class="QLabel" name="label_historyCapacity" >
<property name="text" >
<string>&Capacité</string>
</property>
<property name="buddy" >
- <cstring>horizontalSlider_Capacity</cstring>
+ <cstring>horizontalSlider_historyCapacity</cstring>
</property>
</widget>
</item>
<item>
- <widget class="QSlider" name="horizontalSlider_Capacity" >
+ <widget class="QSlider" name="horizontalSlider_historyCapacity" >
<property name="maximum" >
<number>100</number>
</property>
@@ -209,13 +209,13 @@
</widget>
</item>
<item>
- <widget class="QSpinBox" name="spinBox_CapaciteHist" />
+ <widget class="QSpinBox" name="spinBox_historyCapacity" />
</item>
</layout>
</widget>
</item>
<item>
- <widget class="QToolButton" name="toolButtonEffacerHist" >
+ <widget class="QToolButton" name="toolButton_historyClear" >
<property name="text" >
<string>&Effacer l'Historique</string>
</property>
@@ -225,7 +225,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox2_Connexion" >
+ <widget class="QGroupBox" name="groupBox2_connection" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -240,14 +240,14 @@
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0" >
- <widget class="QLabel" name="label_PortSIP" >
+ <widget class="QLabel" name="label_SIPPort" >
<property name="text" >
<string>Port SIP</string>
</property>
</widget>
</item>
<item row="0" column="1" >
- <widget class="QWidget" native="1" name="widget" >
+ <widget class="QWidget" native="1" name="widget_SIPPort" >
<property name="minimumSize" >
<size>
<width>50</width>
@@ -259,7 +259,7 @@
<number>0</number>
</property>
<item>
- <widget class="QSpinBox" name="spinBox_PortSIP" >
+ <widget class="QSpinBox" name="spinBox_SIPPort" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -291,7 +291,7 @@
</widget>
</item>
<item>
- <widget class="QWidget" native="1" name="widget_RemplissageConfGeneral" >
+ <widget class="QWidget" native="1" name="widget_fullConfigGeneral" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -302,10 +302,10 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_Affichage" >
+ <widget class="QWidget" name="page_display" >
<layout class="QVBoxLayout" name="verticalLayout_9" >
<item>
- <widget class="QLabel" name="label_ConfAffichage" >
+ <widget class="QLabel" name="label_configDisplay" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -318,14 +318,14 @@
</widget>
</item>
<item>
- <widget class="Line" name="line_ConfAffichage" >
+ <widget class="Line" name="line_configDisplay" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QFrame" name="frameAffichage" >
+ <widget class="QFrame" name="frame_display" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -340,7 +340,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_8" >
<item>
- <widget class="QLabel" name="label1_Notifications" >
+ <widget class="QLabel" name="label1_notifications" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -353,7 +353,7 @@
</widget>
</item>
<item>
- <widget class="QWidget" native="1" name="widget1_Notifications" >
+ <widget class="QWidget" native="1" name="widget1_notifications" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -362,14 +362,14 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_5" >
<item>
- <widget class="QCheckBox" name="checkBox1_NotifAppels" >
+ <widget class="QCheckBox" name="checkBox1_notifOnCalls" >
<property name="text" >
<string>&Appels entrants</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="checkBox2_NotifMessages" >
+ <widget class="QCheckBox" name="checkBox2_notifOnMessages" >
<property name="text" >
<string>&Messages vocaux</string>
</property>
@@ -379,7 +379,7 @@
</widget>
</item>
<item>
- <widget class="QLabel" name="label2_FenetrePrincipale" >
+ <widget class="QLabel" name="label2_displayMainWindow" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -392,7 +392,7 @@
</widget>
</item>
<item>
- <widget class="QWidget" native="1" name="widget_FenetrePrincipale" >
+ <widget class="QWidget" native="1" name="widget_displayMainWindow" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -401,14 +401,14 @@
</property>
<layout class="QHBoxLayout" name="horizontalLayout_6" >
<item>
- <widget class="QCheckBox" name="checkBox1_FenDemarrage" >
+ <widget class="QCheckBox" name="checkBox1_displayOnStart" >
<property name="text" >
<string>Au &démarrage</string>
</property>
</widget>
</item>
<item>
- <widget class="QCheckBox" name="checkBox2_FenAppel" >
+ <widget class="QCheckBox" name="checkBox2_displayOnCalls" >
<property name="text" >
<string>Lors d'un appel &entrant</string>
</property>
@@ -418,17 +418,17 @@
</widget>
</item>
<item>
- <widget class="QWidget" native="1" name="widget_5" />
+ <widget class="QWidget" native="1" name="widget_fullConfigDisplay" />
</item>
</layout>
</widget>
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_Comptes" >
+ <widget class="QWidget" name="page_accounts" >
<layout class="QVBoxLayout" name="verticalLayout_2" >
<item>
- <widget class="QLabel" name="label_ConfComptes" >
+ <widget class="QLabel" name="label_configAccounts" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -441,17 +441,17 @@
</widget>
</item>
<item>
- <widget class="Line" name="line_ConfComptes" >
+ <widget class="Line" name="line_configAccounts" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QWidget" native="1" name="widget1_ConfComptes" >
+ <widget class="QWidget" native="1" name="widget1_configAccounts" >
<layout class="QHBoxLayout" name="horizontalLayout_3" >
<item>
- <widget class="QFrame" name="frame1_ListeComptes" >
+ <widget class="QFrame" name="frame1_accountList" >
<property name="minimumSize" >
<size>
<width>0</width>
@@ -472,7 +472,7 @@
</property>
<layout class="QVBoxLayout" name="verticalLayout_6" >
<item>
- <widget class="QListWidget" name="listWidgetComptes" >
+ <widget class="QListWidget" name="listWidget_accountList" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Fixed" >
<horstretch>0</horstretch>
@@ -497,7 +497,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBoxGestionComptes" >
+ <widget class="QGroupBox" name="groupBox_accountListHandle" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -527,7 +527,7 @@
<number>0</number>
</property>
<item>
- <widget class="QToolButton" name="button_delAccount" >
+ <widget class="QToolButton" name="button_accountRemove" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
@@ -539,7 +539,7 @@
</property>
<property name="icon" >
<iconset resource="resources.qrc" >
- <normaloff>:/images/icons/fail.svg</normaloff>:/images/icons/fail.svg</iconset>
+ <normaloff>:/images/icons/remove.png</normaloff>:/images/icons/remove.png</iconset>
</property>
<property name="shortcut" >
<string>+</string>
@@ -547,7 +547,7 @@
</widget>
</item>
<item>
- <widget class="QToolButton" name="button_newAccount" >
+ <widget class="QToolButton" name="button_accountAdd" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Fixed" >
<horstretch>0</horstretch>
@@ -565,7 +565,7 @@
</property>
<property name="icon" >
<iconset resource="resources.qrc" >
- <normaloff>:/images/icons/accept.svg</normaloff>:/images/icons/accept.svg</iconset>
+ <normaloff>:/images/icons/add.png</normaloff>:/images/icons/add.png</iconset>
</property>
</widget>
</item>
@@ -574,10 +574,6 @@
<property name="text" >
<string>Down</string>
</property>
- <property name="icon" >
- <iconset resource="resources.qrc" >
- <normaloff>:/images/icons/incoming.svg</normaloff>:/images/icons/incoming.svg</iconset>
- </property>
</widget>
</item>
<item>
@@ -585,10 +581,6 @@
<property name="text" >
<string>Up</string>
</property>
- <property name="icon" >
- <iconset resource="resources.qrc" >
- <normaloff>:/images/icons/accept.svg</normaloff>:/images/icons/accept.svg</iconset>
- </property>
</widget>
</item>
</layout>
@@ -598,7 +590,7 @@
</widget>
</item>
<item>
- <widget class="QFrame" name="frame2_EditComptes" >
+ <widget class="QFrame" name="frame2_editAccounts" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -616,17 +608,17 @@
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0" >
- <widget class="QLabel" name="label1_Alias" >
+ <widget class="QLabel" name="label1_alias" >
<property name="text" >
<string>&Alias</string>
</property>
<property name="buddy" >
- <cstring>edit1_Alias</cstring>
+ <cstring>edit1_alias</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
- <widget class="QLineEdit" name="edit1_Alias" >
+ <widget class="QLineEdit" name="edit1_alias" >
<property name="minimumSize" >
<size>
<width>0</width>
@@ -636,57 +628,57 @@
</widget>
</item>
<item row="1" column="0" >
- <widget class="QLabel" name="label2_Protocole" >
+ <widget class="QLabel" name="label2_protocol" >
<property name="text" >
<string>&Protocole</string>
</property>
<property name="buddy" >
- <cstring>edit2_Protocole</cstring>
+ <cstring>edit2_protocol</cstring>
</property>
</widget>
</item>
<item row="2" column="0" >
- <widget class="QLabel" name="label3_Serveur" >
+ <widget class="QLabel" name="label3_server" >
<property name="text" >
<string>&Serveur</string>
</property>
<property name="buddy" >
- <cstring>edit3_Serveur</cstring>
+ <cstring>edit3_server</cstring>
</property>
</widget>
</item>
<item row="3" column="0" >
- <widget class="QLabel" name="label4_Usager" >
+ <widget class="QLabel" name="label4_user" >
<property name="text" >
<string>&Usager</string>
</property>
<property name="buddy" >
- <cstring>edit4_Usager</cstring>
+ <cstring>edit4_user</cstring>
</property>
</widget>
</item>
<item row="4" column="0" >
- <widget class="QLabel" name="label5_Mdp" >
+ <widget class="QLabel" name="label5_password" >
<property name="text" >
<string>&Mot de Passe</string>
</property>
<property name="buddy" >
- <cstring>edit5_Mdp</cstring>
+ <cstring>edit5_password</cstring>
</property>
</widget>
</item>
<item row="5" column="0" >
- <widget class="QLabel" name="label6_BoiteVocale" >
+ <widget class="QLabel" name="label6_mailbox" >
<property name="text" >
<string>&Boîte Vocale</string>
</property>
<property name="buddy" >
- <cstring>edit6_BoiteVocale</cstring>
+ <cstring>edit6_mailbox</cstring>
</property>
</widget>
</item>
<item row="2" column="1" >
- <widget class="QLineEdit" name="edit3_Serveur" >
+ <widget class="QLineEdit" name="edit3_server" >
<property name="minimumSize" >
<size>
<width>0</width>
@@ -696,20 +688,20 @@
</widget>
</item>
<item row="3" column="1" >
- <widget class="QLineEdit" name="edit4_Usager" />
+ <widget class="QLineEdit" name="edit4_user" />
</item>
<item row="4" column="1" >
- <widget class="QLineEdit" name="edit5_Mdp" >
+ <widget class="QLineEdit" name="edit5_password" >
<property name="echoMode" >
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item row="5" column="1" >
- <widget class="QLineEdit" name="edit6_BoiteVocale" />
+ <widget class="QLineEdit" name="edit6_mailbox" />
</item>
<item row="1" column="1" >
- <widget class="QComboBox" name="edit2_Protocole" >
+ <widget class="QComboBox" name="edit2_protocol" >
<item>
<property name="text" >
<string>SIP</string>
@@ -723,14 +715,14 @@
</widget>
</item>
<item row="6" column="1" >
- <widget class="QLabel" name="edit7_Etat" >
+ <widget class="QLabel" name="edit7_state" >
<property name="text" >
<string/>
</property>
</widget>
</item>
<item row="6" column="0" >
- <widget class="QLabel" name="label7_Etat" >
+ <widget class="QLabel" name="label7_state" >
<property name="text" >
<string>État </string>
</property>
@@ -743,32 +735,32 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_ConfComptesCommuns" >
+ <widget class="QGroupBox" name="groupBox_commonSettings" >
<property name="title" >
<string/>
</property>
<layout class="QVBoxLayout" name="verticalLayout_10" >
<item>
- <widget class="QLabel" name="label_ConfComptesCommus" >
+ <widget class="QLabel" name="label_commonSettings" >
<property name="text" >
<string>Les paramètres STUN seront appliqués à tous les comptes</string>
</property>
</widget>
</item>
<item>
- <layout class="QFormLayout" name="formLayoutConfComptesCommus" >
+ <layout class="QFormLayout" name="formLayout_commonSettings" >
<property name="fieldGrowthPolicy" >
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0" >
- <widget class="QCheckBox" name="checkBoxStun" >
+ <widget class="QCheckBox" name="checkBox_stun" >
<property name="text" >
<string>Activer Stun</string>
</property>
</widget>
</item>
<item row="0" column="1" >
- <widget class="QLineEdit" name="lineEdit_Stun" >
+ <widget class="QLineEdit" name="lineEdit_stun" >
<property name="enabled" >
<bool>false</bool>
</property>
@@ -781,10 +773,10 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page_Audio" >
+ <widget class="QWidget" name="page_audio" >
<layout class="QVBoxLayout" name="verticalLayout_5" >
<item>
- <widget class="QLabel" name="label_ConfAudio" >
+ <widget class="QLabel" name="label_configAudio" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -797,30 +789,30 @@
</widget>
</item>
<item>
- <widget class="Line" name="line_ConfAudio" >
+ <widget class="Line" name="line_configAudio" >
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox1_Audio" >
+ <widget class="QGroupBox" name="groupBox1_audio" >
<property name="title" >
<string/>
</property>
<layout class="QFormLayout" name="formLayout_3" >
<item row="0" column="0" >
- <widget class="QLabel" name="label_Interface" >
+ <widget class="QLabel" name="label_interface" >
<property name="text" >
<string>&Interface audio</string>
</property>
<property name="buddy" >
- <cstring>comboBox_Interface</cstring>
+ <cstring>comboBox_interface</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
- <widget class="QComboBox" name="comboBox_Interface" >
+ <widget class="QComboBox" name="comboBox_interface" >
<property name="minimumSize" >
<size>
<width>100</width>
@@ -840,17 +832,20 @@
</widget>
</item>
<item row="1" column="0" >
- <widget class="QCheckBox" name="checkBox_Sonneries" >
+ <widget class="QCheckBox" name="checkBox_ringtones" >
<property name="text" >
<string>&Activer les sonneries</string>
</property>
</widget>
</item>
+ <item row="1" column="1" >
+ <widget class="KUrlComboRequester" name="kurlcomborequester" />
+ </item>
</layout>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox2_Codecs" >
+ <widget class="QGroupBox" name="groupBox2_codecs" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -862,7 +857,7 @@
</property>
<layout class="QGridLayout" name="gridLayout" >
<item row="0" column="2" >
- <layout class="QVBoxLayout" name="verticalLayout_OrdreCodecs" >
+ <layout class="QVBoxLayout" name="verticalLayout_codecsOrder" >
<property name="leftMargin" >
<number>0</number>
</property>
@@ -870,23 +865,23 @@
<number>0</number>
</property>
<item>
- <widget class="QToolButton" name="toolButton_MonterCodec" >
+ <widget class="QToolButton" name="toolButton_codecUp" >
<property name="text" >
- <string>...</string>
+ <string/>
</property>
</widget>
</item>
<item>
- <widget class="QToolButton" name="toolButton_DescendreCodec" >
+ <widget class="QToolButton" name="toolButton_codecDown" >
<property name="text" >
- <string>...</string>
+ <string/>
</property>
</widget>
</item>
</layout>
</item>
<item row="0" column="0" >
- <widget class="QTableWidget" name="tableWidget_Codecs" >
+ <widget class="QTableWidget" name="tableWidget_codecs" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -948,7 +943,7 @@
</widget>
</item>
<item>
- <widget class="QStackedWidget" name="stackedWidget_ParametresSpecif" >
+ <widget class="QStackedWidget" name="stackedWidget_interfaceSpecificSettings" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
<horstretch>0</horstretch>
@@ -958,19 +953,19 @@
<property name="currentIndex" >
<number>0</number>
</property>
- <widget class="QWidget" name="page1_Alsa" >
+ <widget class="QWidget" name="page1_alsa" >
<layout class="QVBoxLayout" name="verticalLayout_20" >
<property name="margin" >
<number>0</number>
</property>
<item>
- <widget class="QGroupBox" name="groupBox_Alsa" >
+ <widget class="QGroupBox" name="groupBox_alsa" >
<property name="title" >
<string>Paramètres ALSA</string>
</property>
<layout class="QFormLayout" name="formLayout_4" >
<item row="2" column="1" >
- <widget class="QComboBox" name="comboBox2_Entree" >
+ <widget class="QComboBox" name="comboBox2_in" >
<property name="minimumSize" >
<size>
<width>100</width>
@@ -980,27 +975,27 @@
</widget>
</item>
<item row="2" column="0" >
- <widget class="QLabel" name="label2_Entree" >
+ <widget class="QLabel" name="label2_in" >
<property name="text" >
<string>&Entrée</string>
</property>
<property name="buddy" >
- <cstring>comboBox2_Entree</cstring>
+ <cstring>comboBox2_in</cstring>
</property>
</widget>
</item>
<item row="3" column="0" >
- <widget class="QLabel" name="label3_Sortie" >
+ <widget class="QLabel" name="label3_out" >
<property name="text" >
<string>&Sortie</string>
</property>
<property name="buddy" >
- <cstring>comboBox3_Sortie</cstring>
+ <cstring>comboBox3_out</cstring>
</property>
</widget>
</item>
<item row="3" column="1" >
- <widget class="QComboBox" name="comboBox3_Sortie" >
+ <widget class="QComboBox" name="comboBox3_out" >
<property name="minimumSize" >
<size>
<width>100</width>
@@ -1010,17 +1005,17 @@
</widget>
</item>
<item row="0" column="0" >
- <widget class="QLabel" name="label1_GreffonAlsa" >
+ <widget class="QLabel" name="label1_alsaPugin" >
<property name="text" >
<string>&Greffon ALSA</string>
</property>
<property name="buddy" >
- <cstring>comboBox1_GreffonAlsa</cstring>
+ <cstring>comboBox1_alsaPlugin</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
- <widget class="QComboBox" name="comboBox1_GreffonAlsa" >
+ <widget class="QComboBox" name="comboBox1_alsaPlugin" >
<property name="minimumSize" >
<size>
<width>100</width>
@@ -1034,10 +1029,10 @@
</item>
</layout>
</widget>
- <widget class="QWidget" name="page2_PulseAudio" >
+ <widget class="QWidget" name="page2_pulseAudio" >
<layout class="QVBoxLayout" name="verticalLayout_7" >
<item>
- <widget class="QGroupBox" name="groupBox_PulseAudio" >
+ <widget class="QGroupBox" name="groupBox_pulseAudio" >
<property name="sizePolicy" >
<sizepolicy vsizetype="Expanding" hsizetype="Expanding" >
<horstretch>0</horstretch>
@@ -1052,7 +1047,7 @@
<enum>QFormLayout::ExpandingFieldsGrow</enum>
</property>
<item row="0" column="0" >
- <widget class="QCheckBox" name="checkBox_ModifVolumeApps" >
+ <widget class="QCheckBox" name="checkBox_pulseAudioVolumeAlter" >
<property name="text" >
<string>Autoriser à &modifier le volume des autres applications</string>
</property>
@@ -1102,6 +1097,13 @@
</action>
</widget>
<layoutdefault spacing="4" margin="4" />
+ <customwidgets>
+ <customwidget>
+ <class>KUrlComboRequester</class>
+ <extends>KUrlRequester</extends>
+ <header>kurlrequester.h</header>
+ </customwidget>
+ </customwidgets>
<resources>
<include location="resources.qrc" />
</resources>
@@ -1123,9 +1125,9 @@
</hints>
</connection>
<connection>
- <sender>listOptions</sender>
+ <sender>list_options</sender>
<signal>currentRowChanged(int)</signal>
- <receiver>stackedWidgetOptions</receiver>
+ <receiver>stackedWidget_options</receiver>
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel" >
@@ -1139,9 +1141,9 @@
</hints>
</connection>
<connection>
- <sender>checkBoxStun</sender>
+ <sender>checkBox_stun</sender>
<signal>toggled(bool)</signal>
- <receiver>lineEdit_Stun</receiver>
+ <receiver>lineEdit_stun</receiver>
<slot>setEnabled(bool)</slot>
<hints>
<hint type="sourcelabel" >
@@ -1155,9 +1157,9 @@
</hints>
</connection>
<connection>
- <sender>comboBox_Interface</sender>
+ <sender>comboBox_interface</sender>
<signal>currentIndexChanged(int)</signal>
- <receiver>stackedWidget_ParametresSpecif</receiver>
+ <receiver>stackedWidget_interfaceSpecificSettings</receiver>
<slot>setCurrentIndex(int)</slot>
<hints>
<hint type="sourcelabel" >
@@ -1171,9 +1173,9 @@
</hints>
</connection>
<connection>
- <sender>horizontalSlider_Capacity</sender>
+ <sender>horizontalSlider_historyCapacity</sender>
<signal>valueChanged(int)</signal>
- <receiver>spinBox_CapaciteHist</receiver>
+ <receiver>spinBox_historyCapacity</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
@@ -1187,9 +1189,9 @@
</hints>
</connection>
<connection>
- <sender>spinBox_CapaciteHist</sender>
+ <sender>spinBox_historyCapacity</sender>
<signal>valueChanged(int)</signal>
- <receiver>horizontalSlider_Capacity</receiver>
+ <receiver>horizontalSlider_historyCapacity</receiver>
<slot>setValue(int)</slot>
<hints>
<hint type="sourcelabel" >
diff --git a/sflphone_kde/SFLPhone.cpp b/sflphone_kde/SFLPhone.cpp
index 2c0d274b21fe23f052b616902e5d350b15a77915..17468b13d6cc16c4a49e24e449ef788c7f056279 100644
--- a/sflphone_kde/SFLPhone.cpp
+++ b/sflphone_kde/SFLPhone.cpp
@@ -43,8 +43,8 @@ SFLPhone::~SFLPhone()
void SFLPhone::loadWindow()
{
ConfigurationManagerInterface & daemon = ConfigurationManagerInterfaceSingleton::getInstance();
- actionAfficher_les_barres_de_volume->setChecked(daemon.getVolumeControls());
- actionAfficher_le_clavier->setChecked(daemon.getDialpad());
+ action_displayVolumeControls->setChecked(daemon.getVolumeControls());
+ action_displayDialpad->setChecked(daemon.getDialpad());
updateWindowCallState();
updateRecordButton();
updateVolumeButton();
@@ -154,7 +154,6 @@ void SFLPhone::updateWindowCallState()
}
else
{
- CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
Call * call = (*callList)[item];
call_state state = call->getState();
//qDebug() << "calling getIsRecording on " << call->getCallId();
@@ -239,7 +238,7 @@ void SFLPhone::updateWindowCallState()
}
}
//qDebug() << "mi";
- if (item)
+ if (item && iconFile)
{
qDebug() << "rentre " << item;
item->setIcon(QIcon(iconFile));
@@ -400,14 +399,14 @@ void SFLPhone::updateDialpad()
************ Autoconnect *************
************************************************************/
-void SFLPhone::on_actionAfficher_les_barres_de_volume_toggled()
+void SFLPhone::on_action_displayVolumeControls_toggled()
{
ConfigurationManagerInterface & daemon = ConfigurationManagerInterfaceSingleton::getInstance();
daemon.setVolumeControls();
updateVolumeControls();
}
-void SFLPhone::on_actionAfficher_le_clavier_toggled()
+void SFLPhone::on_action_displayDialpad_toggled()
{
ConfigurationManagerInterface & daemon = ConfigurationManagerInterfaceSingleton::getInstance();
daemon.setDialpad();
@@ -427,7 +426,7 @@ void SFLPhone::on_pushButton_0_clicked() { typeString("0"); }
void SFLPhone::on_pushButton_diese_clicked() { typeString("#"); }
void SFLPhone::on_pushButton_etoile_clicked() { typeString("*"); }
-void SFLPhone::on_label_searchHistory_textChanged(const QString & text)
+void SFLPhone::on_label_searchHistory_textChanged()
{
qDebug() << "on_label_searchHistory_textEdited";
updateSearchHistory();
@@ -530,21 +529,21 @@ void SFLPhone::on_listWidget_callHistory_currentItemChanged()
updateWindowCallState();
}
-void SFLPhone::on_actionConfigurer_les_comptes_triggered()
+void SFLPhone::on_action_configureAccounts_triggered()
{
configDialog->loadOptions();
configDialog->setPage(PAGE_ACCOUNTS);
configDialog->show();
}
-void SFLPhone::on_actionConfigurer_le_son_triggered()
+void SFLPhone::on_action_configureAudio_triggered()
{
configDialog->loadOptions();
configDialog->setPage(PAGE_AUDIO);
configDialog->show();
}
-void SFLPhone::on_actionConfigurer_SFLPhone_triggered()
+void SFLPhone::on_action_configureSflPhone_triggered()
{
configDialog->loadOptions();
configDialog->setPage(PAGE_GENERAL);
@@ -693,12 +692,12 @@ void SFLPhone::on1_incomingCall(const QString &accountID, const QString & callID
void SFLPhone::on1_incomingMessage(const QString &accountID, const QString &message)
{
- qDebug() << "on_incomingMessage !";
+ qDebug() << "on_incomingMessage ! ";
}
void SFLPhone::on1_voiceMailNotify(const QString &accountID, int count)
{
- qDebug() << "on_voiceMailNotify !";
+ qDebug() << "on_voiceMailNotify ! " << count << " new voice mails for account " << accountID;
}
void SFLPhone::on1_volumeChanged(const QString &device, double value)
diff --git a/sflphone_kde/SFLPhone.h b/sflphone_kde/SFLPhone.h
index fabd977e28eb303976b18d3dc44281f6e0a10006..5f725590ee583a0679ab2b323b524cabeb4d4ffc 100644
--- a/sflphone_kde/SFLPhone.h
+++ b/sflphone_kde/SFLPhone.h
@@ -48,11 +48,11 @@ private slots:
}
}
- void on_actionAfficher_les_barres_de_volume_toggled();
- void on_actionAfficher_le_clavier_toggled();
- void on_actionConfigurer_les_comptes_triggered();
- void on_actionConfigurer_le_son_triggered();
- void on_actionConfigurer_SFLPhone_triggered();
+ void on_action_displayVolumeControls_toggled();
+ void on_action_displayDialpad_toggled();
+ void on_action_configureAccounts_triggered();
+ void on_action_configureAudio_triggered();
+ void on_action_configureSflPhone_triggered();
void on_action_accept_triggered();
void on_action_refuse_triggered();
void on_action_hold_triggered();
@@ -75,7 +75,7 @@ private slots:
void on_pushButton_diese_clicked();
void on_pushButton_etoile_clicked();
- void on_label_searchHistory_textChanged(const QString & text);
+ void on_label_searchHistory_textChanged();
void on_slider_recVol_valueChanged(int value);
void on_slider_sndVol_valueChanged(int value);
diff --git a/sflphone_kde/main.cpp b/sflphone_kde/main.cpp
index da4fa231ffab1fbf77f8a6ccd23904fbcea4d385..db21401070ec6b164d8e37d9f3862d82e409f4e0 100644
--- a/sflphone_kde/main.cpp
+++ b/sflphone_kde/main.cpp
@@ -1,13 +1,26 @@
#include <QApplication>
+#include "kapplication.h"
+#include "kcmdlineargs.h"
+#include "kaboutdata.h"
#include <QtGui>
#include "ConfigDialog.h"
#include "SFLPhone.h"
-int main(int argc, char *argv[])
+static const char description[] = I18N_NOOP("A KDE 4 Client for SflPhone");
+
+static const char version[] = "0.1";
+
+int main(int argc, char **argv)
{
try
{
- QApplication app(argc, argv);
+ KAboutData about("sflphone_kde", 0, ki18n("sflphone_kde"), version, ki18n(description),
+ KAboutData::License_GPL, ki18n("(C) 2009 Jérémy Quentin"), KLocalizedString(), 0, "jeremy.quentin@gsavoirfairelinux.com");
+ about.addAuthor( ki18n("Jérémy Quentin"), KLocalizedString(), "jeremy.quentin@gmail.com" );
+ KCmdLineArgs::init(argc, argv, &about);
+ KCmdLineOptions options;
+ //options.add("+[URL]", ki18n( "Document to open" ));
+ KApplication app;
QString locale = QLocale::system().name();
diff --git a/sflphone_kde/resources.qrc b/sflphone_kde/resources.qrc
index ab01ffff90b444dc1e79333d7e694c76cf87d13c..f4b96db5f23069f3ddcbcff0729c7621e3eec7e3 100644
--- a/sflphone_kde/resources.qrc
+++ b/sflphone_kde/resources.qrc
@@ -1,5 +1,7 @@
<RCC>
<qresource prefix="images" >
+ <file>icons/add.png</file>
+ <file>icons/remove.png</file>
<file>icons/del_off.png</file>
<file>icons/del_on.png</file>
<file>icons/accept.svg</file>
diff --git a/sflphone_kde/sflphone-qt.ui b/sflphone_kde/sflphone-qt.ui
index bfba474751b4f2816fd4d3b59cf30559800ca804..b92044de3f7e6b1d690cfc49514cbacb6a479b1d 100644
--- a/sflphone_kde/sflphone-qt.ui
+++ b/sflphone_kde/sflphone-qt.ui
@@ -368,12 +368,12 @@
<property name="title" >
<string>&Configuration</string>
</property>
- <addaction name="actionAfficher_les_barres_de_volume" />
- <addaction name="actionAfficher_le_clavier" />
+ <addaction name="action_displayVolumeControls" />
+ <addaction name="action_displayDialpad" />
<addaction name="separator" />
- <addaction name="actionConfigurer_les_comptes" />
- <addaction name="actionConfigurer_le_son" />
- <addaction name="actionConfigurer_SFLPhone" />
+ <addaction name="action_configureAccounts" />
+ <addaction name="action_configureAudio" />
+ <addaction name="action_configureSflPhone" />
</widget>
<widget class="QMenu" name="menuAide" >
<property name="title" >
@@ -465,7 +465,7 @@
<string>&Boîte Vocale</string>
</property>
</action>
- <action name="actionConfigurer_les_comptes" >
+ <action name="action_configureAccounts" >
<property name="icon" >
<iconset>
<normaloff>:/Images/stock_person.svg</normaloff>:/Images/stock_person.svg</iconset>
@@ -474,7 +474,7 @@
<string>Configurer les &comptes</string>
</property>
</action>
- <action name="actionConfigurer_le_son" >
+ <action name="action_configureAudio" >
<property name="icon" >
<iconset>
<normaloff>:/Images/icon_volume.svg</normaloff>:/Images/icon_volume.svg</iconset>
@@ -483,7 +483,7 @@
<string>Configurer le &son</string>
</property>
</action>
- <action name="actionConfigurer_SFLPhone" >
+ <action name="action_configureSflPhone" >
<property name="icon" >
<iconset>
<normaloff>:/Images/sflphone.png</normaloff>:/Images/sflphone.png</iconset>
@@ -492,7 +492,7 @@
<string>&Configurer SFLPhone</string>
</property>
</action>
- <action name="actionAfficher_les_barres_de_volume" >
+ <action name="action_displayVolumeControls" >
<property name="checkable" >
<bool>true</bool>
</property>
@@ -512,7 +512,7 @@
<string>&About</string>
</property>
</action>
- <action name="actionAfficher_le_clavier" >
+ <action name="action_displayDialpad" >
<property name="checkable" >
<bool>true</bool>
</property>
diff --git a/sflphone_kde/sflphone_kde.kdevelop.pcs b/sflphone_kde/sflphone_kde.kdevelop.pcs
deleted file mode 100644
index 19c8c9a9535818c626f537ad1a52607169ede3de..0000000000000000000000000000000000000000
Binary files a/sflphone_kde/sflphone_kde.kdevelop.pcs and /dev/null differ
diff --git a/sflphone_kde/sflphone_kde.kdevses b/sflphone_kde/sflphone_kde.kdevses
deleted file mode 100644
index bd9758e3697f34daeaafcacc3b4136faa8f3eef7..0000000000000000000000000000000000000000
--- a/sflphone_kde/sflphone_kde.kdevses
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version = '1.0' encoding = 'UTF-8'?>
-<!DOCTYPE KDevPrjSession>
-<KDevPrjSession>
- <DocsAndViews NumberOfDocuments="9" >
- <Doc0 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/ConfigDialog.cpp" >
- <View0 Encoding="" Type="Source" />
- </Doc0>
- <Doc1 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/SFLPhone.cpp" >
- <View0 Encoding="" line="229" Type="Source" />
- </Doc1>
- <Doc2 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Call.cpp" >
- <View0 Encoding="" Type="Source" />
- </Doc2>
- <Doc3 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Call.h" >
- <View0 Encoding="" Type="Source" />
- </Doc3>
- <Doc4 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/sflphone_const.h" >
- <View0 Encoding="" Type="Source" />
- </Doc4>
- <Doc5 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/SFLPhone.h" >
- <View0 Encoding="" Type="Source" />
- </Doc5>
- <Doc6 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/configurationmanager_interface_singleton.cpp" >
- <View0 Encoding="" Type="Source" />
- </Doc6>
- <Doc7 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/Account.cpp" >
- <View0 Encoding="" line="90" Type="Source" />
- </Doc7>
- <Doc8 NumberOfViews="1" URL="file:///home/jquentin/sflphone/sflphone_kde/sflphone_kdeui.rc" >
- <View0 Encoding="" line="8" Type="Source" />
- </Doc8>
- </DocsAndViews>
- <pluginList>
- <kdevdebugger>
- <breakpointList/>
- <showInternalCommands value="0" />
- </kdevdebugger>
- <kdevastyle>
- <Extensions ext="*.cpp *.h *.hpp,*.c *.h,*.cxx *.hxx,*.c++ *.h++,*.cc *.hh,*.C *.H,*.diff ,*.inl,*.java,*.moc,*.patch,*.tlh,*.xpm" />
- <AStyle IndentPreprocessors="0" FillCount="4" PadParenthesesOut="1" IndentNamespaces="1" IndentLabels="1" Fill="Tabs" MaxStatement="40" Brackets="Break" MinConditional="-1" IndentBrackets="0" PadParenthesesUn="1" BlockBreak="0" KeepStatements="1" KeepBlocks="1" BlockIfElse="0" IndentSwitches="1" PadOperators="0" FStyle="UserDefined" IndentCases="0" FillEmptyLines="0" BracketsCloseHeaders="0" BlockBreakAll="0" PadParenthesesIn="1" IndentClasses="1" IndentBlocks="0" FillForce="0" />
- </kdevastyle>
- <kdevbookmarks>
- <bookmarks>
- <bookmark url="/home/jquentin/sflphone_kde/build/ui_sflphone-qt.h" >
- <mark line="36" />
- </bookmark>
- </bookmarks>
- </kdevbookmarks>
- <kdevvalgrind>
- <executable path="" params="" />
- <valgrind path="" params="" />
- <calltree path="" params="" />
- <kcachegrind path="" />
- </kdevvalgrind>
- </pluginList>
-</KDevPrjSession>