Skip to content
Snippets Groups Projects
Commit 3b74e54f authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

Merge branch 'qt-client'

parents 3c4cc213 c3622e61
No related branches found
No related tags found
No related merge requests found
...@@ -70,17 +70,17 @@ ConfigurationDialog::ConfigurationDialog(sflphone_kdeView *parent) : QDialog(par ...@@ -70,17 +70,17 @@ ConfigurationDialog::ConfigurationDialog(sflphone_kdeView *parent) : QDialog(par
connect(&configurationManager, SIGNAL(accountsChanged()), connect(&configurationManager, SIGNAL(accountsChanged()),
this, SLOT(on1_accountsChanged())); this, SLOT(on1_accountsChanged()));
connect(edit1_alias, SIGNAL(textChanged(const QString &)), connect(edit1_alias, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(edit2_protocol, SIGNAL(currentIndexChanged(int)), connect(edit2_protocol, SIGNAL(currentIndexChanged(int)),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(edit3_server, SIGNAL(textChanged(const QString &)), connect(edit3_server, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(edit4_user, SIGNAL(textChanged(const QString &)), connect(edit4_user, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(edit5_password, SIGNAL(textChanged(const QString &)), connect(edit5_password, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(edit6_mailbox, SIGNAL(textChanged(const QString &)), connect(edit6_mailbox, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
connect(button_accountUp, SIGNAL(clicked()), connect(button_accountUp, SIGNAL(clicked()),
this, SLOT(changedAccountList())); this, SLOT(changedAccountList()));
...@@ -683,7 +683,7 @@ void ConfigurationDialog::on_button_accountUp_clicked() ...@@ -683,7 +683,7 @@ void ConfigurationDialog::on_button_accountUp_clicked()
listWidget_accountList->insertItem(currentRow - 1 , item); listWidget_accountList->insertItem(currentRow - 1 , item);
listWidget_accountList->setItemWidget(item, widget); listWidget_accountList->setItemWidget(item, widget);
listWidget_accountList->setCurrentItem(item); listWidget_accountList->setCurrentItem(item);
changedAccountList(); // changedAccountList();
} }
void ConfigurationDialog::on_button_accountDown_clicked() void ConfigurationDialog::on_button_accountDown_clicked()
...@@ -700,7 +700,7 @@ void ConfigurationDialog::on_button_accountDown_clicked() ...@@ -700,7 +700,7 @@ void ConfigurationDialog::on_button_accountDown_clicked()
listWidget_accountList->insertItem(currentRow + 1 , item); listWidget_accountList->insertItem(currentRow + 1 , item);
listWidget_accountList->setItemWidget(item, widget); listWidget_accountList->setItemWidget(item, widget);
listWidget_accountList->setCurrentItem(item); listWidget_accountList->setCurrentItem(item);
changedAccountList(); // changedAccountList();
} }
void ConfigurationDialog::on_button_accountAdd_clicked() void ConfigurationDialog::on_button_accountAdd_clicked()
...@@ -715,7 +715,7 @@ void ConfigurationDialog::on_button_accountAdd_clicked() ...@@ -715,7 +715,7 @@ void ConfigurationDialog::on_button_accountAdd_clicked()
listWidget_accountList->setCurrentRow(r); listWidget_accountList->setCurrentRow(r);
frame2_editAccounts->setEnabled(true); frame2_editAccounts->setEnabled(true);
} }
changedAccountList(); // changedAccountList();
} }
void ConfigurationDialog::on_button_accountRemove_clicked() void ConfigurationDialog::on_button_accountRemove_clicked()
...@@ -725,7 +725,7 @@ void ConfigurationDialog::on_button_accountRemove_clicked() ...@@ -725,7 +725,7 @@ void ConfigurationDialog::on_button_accountRemove_clicked()
QListWidgetItem * item = listWidget_accountList->takeItem(r); QListWidgetItem * item = listWidget_accountList->takeItem(r);
accountList->removeAccount(item); accountList->removeAccount(item);
listWidget_accountList->setCurrentRow( (r >= listWidget_accountList->count()) ? r-1 : r ); listWidget_accountList->setCurrentRow( (r >= listWidget_accountList->count()) ? r-1 : r );
changedAccountList(); // changedAccountList();
} }
void ConfigurationDialog::on_toolButton_accountsApply_clicked() void ConfigurationDialog::on_toolButton_accountsApply_clicked()
......
...@@ -147,7 +147,6 @@ void sflphone_kdeView::loadWindow() ...@@ -147,7 +147,6 @@ void sflphone_kdeView::loadWindow()
updateVolumeControls(); updateVolumeControls();
updateDialpad(); updateDialpad();
updateSearchHistory(); updateSearchHistory();
updateSearchAddressBook();
} }
QString sflphone_kdeView::firstAccountId() QString sflphone_kdeView::firstAccountId()
...@@ -461,7 +460,7 @@ void sflphone_kdeView::updateWindowCallState() ...@@ -461,7 +460,7 @@ void sflphone_kdeView::updateWindowCallState()
bool recordActivated = false; bool recordActivated = false;
//tells whether the call can be recorded in the state it is right now //tells whether the call can be recorded in the state it is right now
bool recordEnabled = false; bool recordEnabled = false;
enabledActions[5] = ! firstRegisteredAccount()->getAccountDetail(ACCOUNT_MAILBOX).isEmpty(); enabledActions[5] = firstRegisteredAccount() && ! firstRegisteredAccount()->getAccountDetail(ACCOUNT_MAILBOX).isEmpty();
if(stackedWidget_screen->currentWidget() == page_callList) if(stackedWidget_screen->currentWidget() == page_callList)
{ {
item = listWidget_callList->currentItem(); item = listWidget_callList->currentItem();
...@@ -634,11 +633,6 @@ void sflphone_kdeView::updateSearchHistory() ...@@ -634,11 +633,6 @@ void sflphone_kdeView::updateSearchHistory()
lineEdit_searchHistory->setVisible(!lineEdit_searchHistory->text().isEmpty()); lineEdit_searchHistory->setVisible(!lineEdit_searchHistory->text().isEmpty());
} }
void sflphone_kdeView::updateSearchAddressBook()
{
qDebug() << "updateAddressBookSearch";
lineEdit_addressBook->setVisible(!lineEdit_addressBook->text().isEmpty());
}
void sflphone_kdeView::updateCallHistory() void sflphone_kdeView::updateCallHistory()
{ {
...@@ -912,7 +906,6 @@ void sflphone_kdeView::on_lineEdit_searchHistory_textChanged() ...@@ -912,7 +906,6 @@ void sflphone_kdeView::on_lineEdit_searchHistory_textChanged()
void sflphone_kdeView::on_lineEdit_addressBook_textChanged() void sflphone_kdeView::on_lineEdit_addressBook_textChanged()
{ {
qDebug() << "on_lineEdit_addressBook_textEdited"; qDebug() << "on_lineEdit_addressBook_textEdited";
updateSearchAddressBook();
updateAddressBook(); updateAddressBook();
updateWindowCallState(); updateWindowCallState();
} }
...@@ -1331,9 +1324,10 @@ void sflphone_kdeView::on_action_addressBook_triggered(bool checked) ...@@ -1331,9 +1324,10 @@ void sflphone_kdeView::on_action_addressBook_triggered(bool checked)
{ {
if(checked == true) if(checked == true)
{ {
action_history->setChecked(false); action_history->setChecked(false);
stackedWidget_screen->setCurrentWidget(page_addressBook); stackedWidget_screen->setCurrentWidget(page_addressBook);
if(lineEdit_addressBook->text().isEmpty())
{ lineEdit_addressBook->setFocus(Qt::OtherFocusReason); }
} }
else else
{ {
......
...@@ -117,7 +117,6 @@ private slots: ...@@ -117,7 +117,6 @@ private slots:
void updateCallItem(Call * call); void updateCallItem(Call * call);
void updateWindowCallState(); void updateWindowCallState();
void updateSearchHistory(); void updateSearchHistory();
void updateSearchAddressBook();
void updateCallHistory(); void updateCallHistory();
void updateAddressBook(); void updateAddressBook();
void updateRecordButton(); void updateRecordButton();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment