diff --git a/sflphone-client-kde/src/Account.cpp b/sflphone-client-kde/src/Account.cpp
index 138b9d4554699aab5f72a260496c22ba6a6e61f1..c77e16baf6575b445543770266772e730ce584ae 100644
--- a/sflphone-client-kde/src/Account.cpp
+++ b/sflphone-client-kde/src/Account.cpp
@@ -100,7 +100,6 @@ Account * Account::buildExistingAccountFromId(QString _accountId)
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
Account * a = new Account();
a->accountId = new QString(_accountId);
- qDebug() << "getAccountDetails 1 sent";
a->accountDetails = new MapStringString( configurationManager.getAccountDetails(_accountId).value() );
a->initItem();
return a;
diff --git a/sflphone-client-kde/src/AccountItemWidget.cpp b/sflphone-client-kde/src/AccountItemWidget.cpp
index 3549b5fd92f2da3398e394d35ec317e6606faebe..1f57e83dd35ff999b3f1d5e4a1c173311dff3b7f 100644
--- a/sflphone-client-kde/src/AccountItemWidget.cpp
+++ b/sflphone-client-kde/src/AccountItemWidget.cpp
@@ -47,9 +47,6 @@ AccountItemWidget::AccountItemWidget(QWidget *parent)
enabled = false;
updateDisplay();
-// connect(checkBox, SIGNAL(stateChanged(int)),
-// this, SLOT(on_checkBox_stateChanged()));
-
QMetaObject::connectSlotsByName(this);
}
@@ -115,6 +112,5 @@ bool AccountItemWidget::getEnabled()
void AccountItemWidget::on_checkBox_stateChanged(int state)
{
- qDebug() << "on_checkBox_stateChanged";
emit checkStateChanged(state == Qt::Checked);
}
diff --git a/sflphone-client-kde/src/AccountList.cpp b/sflphone-client-kde/src/AccountList.cpp
index 61ddb535fd46a8052c2b823b215eb040f1a699be..4add67625c13ee31e1b43532bf4b48f5d13ec5cd 100644
--- a/sflphone-client-kde/src/AccountList.cpp
+++ b/sflphone-client-kde/src/AccountList.cpp
@@ -38,7 +38,6 @@ AccountList::AccountList(QStringList & _accountIds)
AccountList::AccountList(bool fill)
{
- qDebug() << "AccountList()";
accounts = new QVector<Account *>();
if(fill)
{
diff --git a/sflphone-client-kde/src/Call.cpp b/sflphone-client-kde/src/Call.cpp
index efb34db0da9ab6b59166ceb24edb7f62736ac8c4..8ac8efc3736e2e84083458ee3db6a79bb325e651 100644
--- a/sflphone-client-kde/src/Call.cpp
+++ b/sflphone-client-kde/src/Call.cpp
@@ -111,7 +111,6 @@ void Call::initCallItem()
itemWidget = new QWidget();
labelIcon = new QLabel();
- qDebug() << "labelIcon : " << labelIcon;
labelCallNumber = new QLabel(peerPhoneNumber);
labelTransferPrefix = new QLabel(i18n("Transfer to : "));
labelTransferNumber = new QLabel();
@@ -127,7 +126,6 @@ void Call::initCallItem()
transfer->setMargin(0);
transfer->setSpacing(0);
mainLayout->addWidget(labelIcon);
- qDebug() << "descr->addWidget(labelPeerName);";
if(! peerName.isEmpty())
{
labelPeerName = new QLabel(peerName);
@@ -389,15 +387,12 @@ QListWidgetItem * Call::getHistoryItem()
{
historyItem = new QListWidgetItem();
historyItem->setSizeHint(QSize(140,45));
- qDebug() << "historystate = " << historyState;
}
return historyItem;
}
QWidget * Call::getHistoryItemWidget()
{
-// if(historyItemWidget == NULL && historyState != NONE)
-// {
historyItemWidget = new QWidget();
labelHistoryIcon = new QLabel();
labelHistoryIcon->setPixmap(QPixmap(historyIcons[historyState]));
@@ -584,8 +579,8 @@ void Call::call()
qDebug() << "account = " << account;
if(account.isEmpty())
{
- qDebug() << "account is empty, taking the first registered.";
- this->account = sflphone_kdeView::firstRegisteredAccountId();
+ qDebug() << "account is not set, taking the first registered.";
+ this->account = sflphone_kdeView::accountInUseId();
}
if(!account.isEmpty())
{
@@ -670,14 +665,8 @@ void Call::appendItemText(QString text)
editNumber = labelCallNumber;
break;
case CALL_STATE_CURRENT:
- //TODO replace account string by an Account instance and handle damn pointers to avoid detruction of Accounts
-// if(peerPhoneNumber == configurationManager.getAccountDetails(account).value()[ACCOUNT_MAILBOX])
-// {
-// text = QString(QChar(0x9A));
-// }
text = QString();
editNumber = labelCallNumber;
-
break;
default:
qDebug() << "Type key on call not editable. Doing nothing.";
diff --git a/sflphone-client-kde/src/CallList.cpp b/sflphone-client-kde/src/CallList.cpp
index 9f2cb774456cb3f812375a2e78fd720d19bb9e64..c2ff2e4a5e27ec93341aedd6ec8080d5f7fe183d 100644
--- a/sflphone-client-kde/src/CallList.cpp
+++ b/sflphone-client-kde/src/CallList.cpp
@@ -25,7 +25,8 @@
#include "callmanager_interface_singleton.h"
#include "configurationmanager_interface_singleton.h"
-CallList::CallList()
+CallList::CallList(QObject * parent)
+ : QObject(parent)
{
CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
diff --git a/sflphone-client-kde/src/CallList.h b/sflphone-client-kde/src/CallList.h
index e9ff5341b32a19a4822620b7e63886495eb733c7..40c6de88ff9a40dcffb427d1fd350a60fb829576 100644
--- a/sflphone-client-kde/src/CallList.h
+++ b/sflphone-client-kde/src/CallList.h
@@ -39,7 +39,7 @@ private:
public:
//Constructors & Destructors
- CallList();
+ CallList(QObject * parent = 0);
~CallList();
//Getters
diff --git a/sflphone-client-kde/src/CodecListModel.cpp b/sflphone-client-kde/src/CodecListModel.cpp
index 31b694e64a916f3e0fcd358f4b5a6fa1471d16d7..a6ce0616b6998b99163101446a787f675215016a 100644
--- a/sflphone-client-kde/src/CodecListModel.cpp
+++ b/sflphone-client-kde/src/CodecListModel.cpp
@@ -186,7 +186,6 @@ void CodecListModel::setActiveCodecList(const QStringList & activeCodecListToSet
for(int i=0 ; i<codecListToDisplay.size() ; i++)
{
bool ok;
- qDebug() << codecListToDisplay[i];
QString payloadStr = QString(codecListToDisplay[i]);
int payload = payloadStr.toInt(&ok);
if(!ok)
diff --git a/sflphone-client-kde/src/SortableCodecListWidget.cpp b/sflphone-client-kde/src/SortableCodecListWidget.cpp
index 27587446b7b735b6c972b8e07a930009d13fe343..0f21952dfad47f07b577de502711794cb416222f 100644
--- a/sflphone-client-kde/src/SortableCodecListWidget.cpp
+++ b/sflphone-client-kde/src/SortableCodecListWidget.cpp
@@ -29,10 +29,6 @@ SortableCodecListWidget::SortableCodecListWidget(QWidget *parent)
{
codecTable = new QTableView(this);
codecTable->setObjectName("codecTable");
-// CodecListModel * model = new CodecListModel();
-// codecTable->setModel(model);
-// codecTable->resizeColumnsToContents();
-// codecTable->resizeRowsToContents();
codecTable->setSelectionBehavior(QAbstractItemView::SelectRows);
codecUpButton = new KPushButton(this);
diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.cpp b/sflphone-client-kde/src/conf/ConfigurationDialog.cpp
index f8620c6afce1f006068e3e7df24dbad9132b30bd..82084e4471089a35693d708c4afeeb390e257596 100644
--- a/sflphone-client-kde/src/conf/ConfigurationDialog.cpp
+++ b/sflphone-client-kde/src/conf/ConfigurationDialog.cpp
@@ -51,15 +51,12 @@ ConfigurationDialogKDE::ConfigurationDialogKDE(sflphone_kdeView *parent)
addPage( dlgAudio , i18nc("Config section", "Audio") , "voicecall" );
addPage( dlgAddressBook , i18nc("Config section", "Address Book") , "x-office-address-book" );
addPage( dlgRecord , i18nc("Config section", "Recordings") , "media-record" );
- addPage( dlgHooks , i18nc("Config section", "Hooks") , "insert-link" );
- connect(this, SIGNAL(applyClicked()), dlgAudio, SLOT(updateAlsaSettings()));
- connect(this, SIGNAL(okClicked()), dlgAudio, SLOT(updateAlsaSettings()));
+ addPage( dlgHooks , i18nc("Config section", "Hooks") , "insert-link" );
+
connect(this, SIGNAL(applyClicked()), this, SLOT(applyCustomSettings()));
connect(this, SIGNAL(okClicked()), this, SLOT(applyCustomSettings()));
connect(dlgGeneral, SIGNAL(clearCallHistoryAsked()), this, SIGNAL(clearCallHistoryAsked()));
-// connect(this, SIGNAL(settingsChanged(const QString&)), this, SLOT(slot()));
-// connect(this, SIGNAL(widgetModified()), this, SLOT(slot()));
}
@@ -67,10 +64,6 @@ ConfigurationDialogKDE::~ConfigurationDialogKDE()
{
}
-void ConfigurationDialogKDE::slot()
-{
- qDebug() << "slot";
-}
void ConfigurationDialogKDE::updateWidgets()
{
@@ -84,7 +77,7 @@ void ConfigurationDialogKDE::updateSettings()
qDebug() << "updateSettings";
dlgAudio->updateSettings();
dlgAccounts->updateSettings();
- qDebug() << "yo " << ConfigurationSkeleton::self()->alsaPlugin();
+ qDebug() << "alsaPlugin = " << ConfigurationSkeleton::self()->alsaPlugin();
}
bool ConfigurationDialogKDE::hasChanged()
@@ -106,8 +99,8 @@ void ConfigurationDialogKDE::applyCustomSettings()
// {
ConfigurationSkeleton::self()->writeConfig();
// }
- dlgAccounts->applyCustomSettings();
- dlgAudio->applyCustomSettings();
+ updateSettings();
+ updateWidgets();
updateButtons();
emit changesApplied();
}
@@ -117,6 +110,5 @@ void ConfigurationDialogKDE::reload()
qDebug() << "reload";
ConfigurationSkeleton::self()->readConfig();
updateWidgets();
- applyCustomSettings();
updateButtons();
}
diff --git a/sflphone-client-kde/src/conf/ConfigurationDialog.h b/sflphone-client-kde/src/conf/ConfigurationDialog.h
index 4c3b1c26b9610f1391fe7d34be6f33423ce9916b..ac36444fcc139aaba3d9117b799a50e31f4a5182 100644
--- a/sflphone-client-kde/src/conf/ConfigurationDialog.h
+++ b/sflphone-client-kde/src/conf/ConfigurationDialog.h
@@ -72,7 +72,6 @@ public:
public slots:
- void slot();
/**
* Reimplements KConfigDialog
*/
diff --git a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp b/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
index e29869eaff2f627cc0ba8244afed2be026911441..1929a6fbd17271b2e10a312d1f0c2a47bbf00590 100644
--- a/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
+++ b/sflphone-client-kde/src/conf/ConfigurationSkeleton.cpp
@@ -176,6 +176,8 @@ void ConfigurationSkeleton::readConfig()
setEnableHooksIAX(hooksSettings[HOOKS_IAX2_ENABLED]=="1");
setHooksSIPHeader(hooksSettings[HOOKS_SIP_FIELD]);
setHooksCommand(hooksSettings[HOOKS_COMMAND]);
+
+ qDebug() << "Finished to read config\n";
}
void ConfigurationSkeleton::writeConfig()
@@ -271,7 +273,6 @@ void ConfigurationSkeleton::writeConfig()
qDebug() << "Writing Record settings";
QString destination = destinationFolder();
- qDebug() << destination ;
configurationManager.setRecordPath(destination);
@@ -305,6 +306,8 @@ void ConfigurationSkeleton::writeConfig()
hooksSettings[HOOKS_COMMAND] = hooksCommand();
configurationManager.setHookSettings(hooksSettings);
+ qDebug() << "Finished to write config\n";
+
readConfig();
}
diff --git a/sflphone-client-kde/src/conf/dlgaccounts.cpp b/sflphone-client-kde/src/conf/dlgaccounts.cpp
index 9653ad01b1210ac6bf01e0578ae717c18f89ff39..1b510309a46f1a0f387fdc07aac794125989b95a 100644
--- a/sflphone-client-kde/src/conf/dlgaccounts.cpp
+++ b/sflphone-client-kde/src/conf/dlgaccounts.cpp
@@ -70,11 +70,6 @@ DlgAccounts::DlgAccounts(KConfigDialog *parent)
connect(this, SIGNAL(updateButtons()), parent, SLOT(updateButtons()));
}
-
-DlgAccounts::~DlgAccounts()
-{
-}
-
void DlgAccounts::saveAccountList()
{
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
@@ -200,14 +195,11 @@ void DlgAccounts::loadAccountList()
void DlgAccounts::addAccountToAccountList(Account * account)
{
- qDebug() << "addAccountToAccountList";
QListWidgetItem * item = account->getItem();
QWidget * widget = account->getItemWidget();
connect(widget, SIGNAL(checkStateChanged(bool)),
this, SLOT(changedAccountList()));
- qDebug() << "item->isHidden()" << item->isHidden();
listWidget_accountList->addItem(item);
- qDebug() << "addAccountToAccountList2";
listWidget_accountList->setItemWidget(item, widget);
}
@@ -243,7 +235,6 @@ void DlgAccounts::on_button_accountUp_clicked()
listWidget_accountList->insertItem(currentRow - 1 , item);
listWidget_accountList->setItemWidget(item, widget);
listWidget_accountList->setCurrentItem(item);
-// changedAccountList();
}
void DlgAccounts::on_button_accountDown_clicked()
@@ -260,7 +251,6 @@ void DlgAccounts::on_button_accountDown_clicked()
listWidget_accountList->insertItem(currentRow + 1 , item);
listWidget_accountList->setItemWidget(item, widget);
listWidget_accountList->setCurrentItem(item);
-// changedAccountList();
}
void DlgAccounts::on_button_accountAdd_clicked()
@@ -275,7 +265,6 @@ void DlgAccounts::on_button_accountAdd_clicked()
listWidget_accountList->setCurrentRow(r);
frame2_editAccounts->setEnabled(true);
}
-// changedAccountList();
}
void DlgAccounts::on_button_accountRemove_clicked()
@@ -285,25 +274,13 @@ void DlgAccounts::on_button_accountRemove_clicked()
QListWidgetItem * item = listWidget_accountList->takeItem(r);
accountList->removeAccount(item);
listWidget_accountList->setCurrentRow( (r >= listWidget_accountList->count()) ? r-1 : r );
-// changedAccountList();
}
void DlgAccounts::on_toolButton_accountsApply_clicked()
{
qDebug() << "on_toolButton_accountsApply_clicked";
- applyCustomSettings();
-}
-
-void DlgAccounts::applyCustomSettings()
-{
- qDebug() << "DlgAccounts::applyCustomSettings";
- if(hasChanged())
- {
- toolButton_accountsApply->setEnabled(false);
- saveAccountList();
- loadAccountList();
- accountListHasChanged = false;
- }
+ updateSettings();
+ updateWidgets();
}
void DlgAccounts::on_edit1_alias_textChanged(const QString & text)
@@ -359,11 +336,15 @@ bool DlgAccounts::hasChanged()
void DlgAccounts::updateSettings()
{
-
+ saveAccountList();
+ toolButton_accountsApply->setEnabled(false);
+ accountListHasChanged = false;
}
+
void DlgAccounts::updateWidgets()
{
loadAccountList();
+ toolButton_accountsApply->setEnabled(false);
accountListHasChanged = false;
}
diff --git a/sflphone-client-kde/src/conf/dlgaccounts.h b/sflphone-client-kde/src/conf/dlgaccounts.h
index b2187e11484fc75b4791957234e1a915fbac9523..3b1963b84382e563b34ef196c5c7103475a1e342 100644
--- a/sflphone-client-kde/src/conf/dlgaccounts.h
+++ b/sflphone-client-kde/src/conf/dlgaccounts.h
@@ -37,7 +37,6 @@ Q_OBJECT
public:
DlgAccounts(KConfigDialog *parent = 0);
- ~DlgAccounts();
void saveAccount(QListWidgetItem * item);
void loadAccount(QListWidgetItem * item);
@@ -48,7 +47,6 @@ private:
public slots:
void saveAccountList();
void loadAccountList();
- void applyCustomSettings();
bool hasChanged();
void updateSettings();
diff --git a/sflphone-client-kde/src/conf/dlgaudio.cpp b/sflphone-client-kde/src/conf/dlgaudio.cpp
index baa368f10a144fa201b578b964544334abc6c088..12fd1f033b11b4f64c1ee9de321f81c8f2a4d729 100644
--- a/sflphone-client-kde/src/conf/dlgaudio.cpp
+++ b/sflphone-client-kde/src/conf/dlgaudio.cpp
@@ -43,7 +43,7 @@ DlgAudio::DlgAudio(KConfigDialog *parent)
CodecListModel * model = skeleton->getCodecListModel();
sortableCodecList->setModel(model);
- updateAlsaSettings();
+// loadAlsaSettings();
connect(box_alsaPlugin, SIGNAL(currentIndexChanged(int)),
parent, SLOT(updateButtons()));
@@ -52,7 +52,7 @@ DlgAudio::DlgAudio(KConfigDialog *parent)
connect(sortableCodecList, SIGNAL(dataChanged()),
this, SLOT(codecTableChanged()));
-
+
}
@@ -64,6 +64,7 @@ void DlgAudio::updateWidgets()
{
ConfigurationSkeleton * skeleton = ConfigurationSkeleton::self();
box_alsaPlugin->setCurrentIndex(box_alsaPlugin->findText(skeleton->alsaPlugin()));
+ loadAlsaSettings();
codecTableHasChanged = false;
}
@@ -75,6 +76,7 @@ void DlgAudio::updateSettings()
//alsaPlugin
ConfigurationSkeleton * skeleton = ConfigurationSkeleton::self();
skeleton->setAlsaPlugin(box_alsaPlugin->currentText());
+
codecTableHasChanged = false;
}
@@ -91,9 +93,9 @@ bool DlgAudio::hasChanged()
return alsaPluginHasChanged || codecTableHasChanged;
}
-void DlgAudio::updateAlsaSettings()
+void DlgAudio::loadAlsaSettings()
{
- qDebug() << "DlgAudio::updateAlsaSettings";
+ qDebug() << "DlgAudio::loadAlsaSettings";
ConfigurationManagerInterface & configurationManager = ConfigurationManagerInterfaceSingleton::getInstance();
if(configurationManager.getAudioManager() == ConfigurationSkeleton::EnumInterface::ALSA)
{
@@ -123,14 +125,8 @@ void DlgAudio::updateAlsaSettings()
}
}
-void DlgAudio::applyCustomSettings()
-{
- codecTableHasChanged = false;
-}
-
-
void DlgAudio::codecTableChanged()
{
codecTableHasChanged = true;
emit updateButtons();
-}
\ No newline at end of file
+}
diff --git a/sflphone-client-kde/src/conf/dlgaudio.h b/sflphone-client-kde/src/conf/dlgaudio.h
index 74fe3db72b88cd2f02fb7eaf9c7a51167b539d09..e33dfd8d2b1fb5597d79afb2b071e72886908fd9 100644
--- a/sflphone-client-kde/src/conf/dlgaudio.h
+++ b/sflphone-client-kde/src/conf/dlgaudio.h
@@ -45,13 +45,17 @@ public slots:
void updateWidgets();
void updateSettings();
bool hasChanged();
- void updateAlsaSettings();
- void applyCustomSettings();
+ /**
+ * Loads the ALSA settings to fill the combo boxes
+ * of the ALSA settings.
+ * ALSA choices for input, output... can be load only
+ * when the daemon has set ALSA as sound manager.
+ * So we have to load these settings once the user choses
+ * ALSA.
+ */
+ void loadAlsaSettings();
private slots:
-// void updateCodecListCommands();
-// void on_toolButton_codecUp_clicked();
-// void on_toolButton_codecDown_clicked();
void codecTableChanged();
signals:
diff --git a/sflphone-client-kde/src/sflphone_kdeview.cpp b/sflphone-client-kde/src/sflphone_kdeview.cpp
index 8099ad4adff4c2e16934f3f8ac7934eda709debc..bd6a166a80d72892216ce1978b901145f68817db 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.cpp
+++ b/sflphone-client-kde/src/sflphone_kdeview.cpp
@@ -64,7 +64,7 @@ sflphone_kdeView::sflphone_kdeView(QWidget *parent)
CallManagerInterface & callManager = CallManagerInterfaceSingleton::getInstance();
errorWindow = new QErrorMessage(this);
- callList = new CallList();
+ callList = new CallList(this);
for(int i = 0 ; i < callList->size() ; i++)
{
Call * call = (*callList)[i];
@@ -120,17 +120,12 @@ sflphone_kdeView::sflphone_kdeView(QWidget *parent)
stackedWidget_screen->setCurrentWidget(page_callList);
-// loadWindow();
-
}
sflphone_kdeView::~sflphone_kdeView()
{
- delete configDialog;
- delete wizard;
- delete callList;
}
void sflphone_kdeView::loadWindow()
@@ -149,9 +144,7 @@ void sflphone_kdeView::loadWindow()
updateStatusMessage();
}
-
-
-Account * sflphone_kdeView::firstRegisteredAccount()
+Account * sflphone_kdeView::accountInUse()
{
Account * priorAccount = accountList->getAccountById(priorAccountId);
if(priorAccount && priorAccount->getAccountDetail(ACCOUNT_STATUS) == ACCOUNT_STATE_REGISTERED )
@@ -164,9 +157,9 @@ Account * sflphone_kdeView::firstRegisteredAccount()
}
}
-QString sflphone_kdeView::firstRegisteredAccountId()
+QString sflphone_kdeView::accountInUseId()
{
- Account * firstRegistered = firstRegisteredAccount();
+ Account * firstRegistered = accountInUse();
if(firstRegistered == NULL)
{
return QString();
@@ -365,8 +358,6 @@ void sflphone_kdeView::enter()
}
else
{
-// action_history->setChecked(false);
-// stackedWidget_screen->setCurrentWidget(page_callList);
changeScreen(SCREEN_MAIN);
Call * pastCall = callList->findCallByHistoryItem(item);
@@ -391,8 +382,6 @@ void sflphone_kdeView::enter()
}
else
{
-// action_addressBook->setChecked(false);
-// stackedWidget_screen->setCurrentWidget(page_callList);
changeScreen(SCREEN_MAIN);
ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(item));
Call * call = callList->addDialingCall(w->getContactName());
@@ -455,7 +444,7 @@ void sflphone_kdeView::updateWindowCallState()
bool transfer = false;
//tells whether the call is in recording position
bool recordActivated = false;
- enabledActions[SFLPhone::Mailbox] = firstRegisteredAccount() && ! firstRegisteredAccount()->getAccountDetail(ACCOUNT_MAILBOX).isEmpty();
+ enabledActions[SFLPhone::Mailbox] = accountInUse() && ! accountInUse()->getAccountDetail(ACCOUNT_MAILBOX).isEmpty();
if(stackedWidget_screen->currentWidget() == page_callList)
{
item = listWidget_callList->currentItem();
@@ -847,7 +836,7 @@ void sflphone_kdeView::updateDialpad()
void sflphone_kdeView::updateStatusMessage()
{
qDebug() << "updateStatusMessage";
- Account * account = firstRegisteredAccount();
+ Account * account = accountInUse();
if(account == NULL)
{
emit statusMessageChangeAsked(i18n("No registered accounts"));
@@ -885,7 +874,7 @@ void sflphone_kdeView::on_widget_dialpad_typed(QString text) { typeString(t
void sflphone_kdeView::on_lineEdit_searchHistory_textChanged()
{
- qDebug() << "on_lineEdit_searchHistory_textEdited";
+ qDebug() << "on_lineEdit_searchHistory_textChanged";
updateSearchHistory();
updateCallHistory();
updateWindowCallState();
@@ -893,7 +882,7 @@ void sflphone_kdeView::on_lineEdit_searchHistory_textChanged()
void sflphone_kdeView::on_lineEdit_addressBook_textChanged()
{
- qDebug() << "on_lineEdit_addressBook_textEdited";
+ qDebug() << "on_lineEdit_addressBook_textChanged";
updateAddressBook();
updateWindowCallState();
}
@@ -1001,8 +990,6 @@ void sflphone_kdeView::on_listWidget_callList_itemDoubleClicked(QListWidgetItem
void sflphone_kdeView::on_listWidget_callHistory_itemDoubleClicked(QListWidgetItem * item)
{
qDebug() << "on_listWidget_callHistory_itemDoubleClicked";
-// action_history->setChecked(false);
-// stackedWidget_screen->setCurrentWidget(page_callList);
changeScreen(SCREEN_MAIN);
Call * pastCall = callList->findCallByHistoryItem(item);
Call * call = callList->addDialingCall(pastCall->getPeerName(), pastCall->getAccountId());
@@ -1016,8 +1003,6 @@ void sflphone_kdeView::on_listWidget_callHistory_itemDoubleClicked(QListWidgetIt
void sflphone_kdeView::on_listWidget_addressBook_itemDoubleClicked(QListWidgetItem * item)
{
qDebug() << "on_listWidget_addressBook_itemDoubleClicked";
-// action_addressBook->setChecked(false);
-// stackedWidget_screen->setCurrentWidget(page_callList);
changeScreen(SCREEN_MAIN);
ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(item));
Call * call = callList->addDialingCall(w->getContactName());
@@ -1081,7 +1066,6 @@ void sflphone_kdeView::contextMenuEvent(QContextMenuEvent *event)
QVector<Account *> accounts = accountList->registeredAccounts();
for (int i = 0 ; i < accounts.size() ; i++)
{
- qDebug() << i;
Account * account = accounts.at(i);
QAction * action = new ActionSetAccountFirst(account, &menu);
action->setChecked(account->getAccountId() == priorAccountId);
@@ -1126,9 +1110,6 @@ void sflphone_kdeView::editBeforeCall()
QString newNumber = QInputDialog::getText(this, i18n("Edit before call"), QString(), QLineEdit::Normal, number, &ok);
if(ok)
{
-// action_history->setChecked(false);
-// action_addressBook->setChecked(false);
-// stackedWidget_screen->setCurrentWidget(page_callList);
changeScreen(SCREEN_MAIN);
Call * call = callList->addDialingCall(name);
call->appendItemText(newNumber);
@@ -1215,8 +1196,6 @@ void sflphone_kdeView::accept()
}
if(stackedWidget_screen->currentWidget() == page_callHistory)
{
-// action_history->setChecked(false);
-// stackedWidget_screen->setCurrentWidget(page_callList);
changeScreen(SCREEN_MAIN);
Call * pastCall = callList->findCallByHistoryItem(listWidget_callHistory->currentItem());
Call * call = callList->addDialingCall(pastCall->getPeerName());
@@ -1227,8 +1206,6 @@ void sflphone_kdeView::accept()
}
if(stackedWidget_screen->currentWidget() == page_addressBook)
{
-// action_addressBook->setChecked(false);
-// stackedWidget_screen->setCurrentWidget(page_callList);
changeScreen(SCREEN_MAIN);
ContactItemWidget * w = (ContactItemWidget *) (listWidget_addressBook->itemWidget(listWidget_addressBook->currentItem()));
Call * call = callList->addDialingCall(w->getContactName());
@@ -1304,7 +1281,7 @@ void sflphone_kdeView::record()
void sflphone_kdeView::mailBox()
{
- Account * account = firstRegisteredAccount();
+ Account * account = accountInUse();
QString mailBoxNumber = account->getAccountDetail(ACCOUNT_MAILBOX);
Call * call = callList->addDialingCall();
call->appendItemText(mailBoxNumber);
diff --git a/sflphone-client-kde/src/sflphone_kdeview.h b/sflphone-client-kde/src/sflphone_kdeview.h
index 0e96de72282b08437c8d29be19659e25650546e0..2f06207101d0b23843ad28bc1fb48d30abd5fad2 100644
--- a/sflphone-client-kde/src/sflphone_kdeview.h
+++ b/sflphone-client-kde/src/sflphone_kdeview.h
@@ -103,7 +103,7 @@ public:
* If there is no account registered, returns NULL.
* @return the account to use if an outgoing call is placed.
*/
- static Account * firstRegisteredAccount();
+ static Account * accountInUse();
/**
* Seeks the ID of the account to use.
* If priorAccountId is defined and the corresponding
@@ -112,7 +112,7 @@ public:
* If there is no account registered, returns an empty string.
* @return the ID of the account to use if an outgoing call is placed.
*/
- static QString firstRegisteredAccountId();
+ static QString accountInUseId();
static AccountList * getAccountList();
QErrorMessage * getErrorWindow();
@@ -131,7 +131,6 @@ public:
*/
bool isAddressBookEnabled();
- //Updates
QVector<Contact *> findContactsInKAddressBook(QString textSearched, bool & full);
private slots:
@@ -258,7 +257,7 @@ public slots:
/**
* Loads the address book asynchronously.
* Calls enableAddressBook() once the address book
- * loading has finished if it is not allready loaded.
+ * loading has finished if it is not already loaded.
* @return true if address book has finished loading
*/
bool loadAddressBook();