diff --git a/sflphone-client-kde/src/conf/dlgaccounts.cpp b/sflphone-client-kde/src/conf/dlgaccounts.cpp
index 8407a204e445a5aaa6a58450d40fa25557e4cb88..e2518dec1bc63ae57c5802af4aba6892d04c734f 100644
--- a/sflphone-client-kde/src/conf/dlgaccounts.cpp
+++ b/sflphone-client-kde/src/conf/dlgaccounts.cpp
@@ -54,10 +54,10 @@ DlgAccounts::DlgAccounts(KConfigDialog *parent)
this, SLOT(changedAccountList()));
connect(edit6_mailbox, SIGNAL(textEdited(const QString &)),
this, SLOT(changedAccountList()));
- connect(spinbox_regExpire, SIGNAL(editingFinished()),
- this, SLOT(changedAccountList()));
- connect(checkBox_conformRFC, SIGNAL(clicked(bool)),
- this, SLOT(changedAccountList()));
+ connect(checkbox_stun, SIGNAL(toggled(bool)),
+ this, SLOT(changedAccountList()));
+ connect(checkbox_zrtp, SIGNAL(toggled(bool)),
+ this, SLOT(changedAccountList()));
connect(button_accountUp, SIGNAL(clicked()),
this, SLOT(changedAccountList()));
connect(button_accountDown, SIGNAL(clicked()),
@@ -168,8 +168,6 @@ void DlgAccounts::saveAccount(QListWidgetItem * item)
account->setAccountDetail(ACCOUNT_USERNAME, edit4_user->text());
account->setAccountDetail(ACCOUNT_PASSWORD, edit5_password->text());
account->setAccountDetail(ACCOUNT_MAILBOX, edit6_mailbox->text());
- account->setAccountDetail(ACCOUNT_RESOLVE_ONCE, checkBox_conformRFC->isChecked() ? "FALSE" : "TRUE");
- account->setAccountDetail(ACCOUNT_EXPIRE, QString::number(spinbox_regExpire->value()));
account->setAccountDetail(ACCOUNT_ENABLED, account->isChecked() ? ACCOUNT_ENABLED_TRUE : ACCOUNT_ENABLED_FALSE);
}
@@ -197,10 +195,25 @@ void DlgAccounts::loadAccount(QListWidgetItem * item)
edit4_user->setText( account->getAccountDetail(ACCOUNT_USERNAME));
edit5_password->setText( account->getAccountDetail(ACCOUNT_PASSWORD));
edit6_mailbox->setText( account->getAccountDetail(ACCOUNT_MAILBOX));
- checkBox_conformRFC->setChecked( account->getAccountDetail(ACCOUNT_RESOLVE_ONCE) != "TRUE" );
- bool ok;
- int val = account->getAccountDetail(ACCOUNT_EXPIRE).toInt(&ok);
- spinbox_regExpire->setValue(ok ? val : ACCOUNT_EXPIRE_DEFAULT);
+
+ if(protocolIndex == 0) // if sip selected
+ {
+ checkbox_stun->setChecked(account->getAccountDetail(ACCOUNT_SIP_STUN_ENABLED) == ACCOUNT_ENABLED_TRUE);
+ edit_stunServer->setText( account->getAccountDetail(ACCOUNT_SIP_STUN_SERVER) );
+ checkbox_zrtp->setChecked(account->getAccountDetail(ACCOUNT_SRTP_ENABLED) == ACCOUNT_ENABLED_TRUE);
+
+ tab_advanced->setEnabled(true);
+ edit_stunServer->setEnabled(checkbox_stun->isChecked());
+ }
+ else
+ {
+ checkbox_stun->setChecked(false);
+ edit_stunServer->setText( account->getAccountDetail(ACCOUNT_SIP_STUN_SERVER) );
+ checkbox_zrtp->setChecked(false);
+
+ tab_advanced->setEnabled(false);
+ }
+
updateStatusLabel(account);
frame2_editAccounts->setEnabled(true);
}
@@ -209,7 +222,6 @@ void DlgAccounts::loadAccountList()
{
qDebug() << "loadAccountList";
accountList->updateAccounts();
- //initialize the QListWidget object with the AccountList
listWidget_accountList->clear();
for (int i = 0; i < accountList->size(); ++i){
addAccountToAccountList((*accountList)[i]);
@@ -236,6 +248,18 @@ void DlgAccounts::changedAccountList()
accountListHasChanged = true;
emit updateButtons();
toolButton_accountsApply->setEnabled(true);
+
+ int currentIndex = edit2_protocol->currentIndex();
+
+ if(currentIndex==0)
+ {
+ tab_advanced->setEnabled(true);
+ edit_stunServer->setEnabled(checkbox_stun->isChecked());
+ }
+ else
+ {
+ tab_advanced->setEnabled(false);
+ }
}
diff --git a/sflphone-client-kde/src/conf/dlgaccountsbase.ui b/sflphone-client-kde/src/conf/dlgaccountsbase.ui
index eafe181482ff650951b73e6f5f9ab1781cf4c1b8..a5aef4fe3b37ad8bdf6f4b24dbc4e38e8ff88e94 100644
--- a/sflphone-client-kde/src/conf/dlgaccountsbase.ui
+++ b/sflphone-client-kde/src/conf/dlgaccountsbase.ui
@@ -230,6 +230,9 @@
</item>
<item>
<widget class="QTabWidget" name="frame2_editAccounts">
+ <property name="enabled">
+ <bool>true</bool>
+ </property>
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>1</horstretch>
@@ -237,7 +240,7 @@
</sizepolicy>
</property>
<property name="currentIndex">
- <number>0</number>
+ <number>1</number>
</property>
<widget class="QWidget" name="tab_basic">
<attribute name="title">
@@ -386,34 +389,57 @@
</layout>
</widget>
<widget class="QWidget" name="tab_advanced">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
<attribute name="title">
<string>Advanced</string>
</attribute>
<layout class="QFormLayout" name="formLayout_2">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QLabel" name="label_regExpire">
+ <item row="5" column="1">
+ <widget class="QCheckBox" name="checkbox_stun">
<property name="text">
- <string>Registration expire</string>
+ <string/>
</property>
- <property name="buddy">
- <cstring>spinbox_regExpire</cstring>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QCheckBox" name="checkbox_zrtp">
+ <property name="text">
+ <string/>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="KIntSpinBox" name="spinbox_regExpire">
- <property name="maximum">
- <number>16777215</number>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_zrtp">
+ <property name="text">
+ <string>Secure with ZRTP</string>
</property>
</widget>
</item>
- <item row="3" column="0" colspan="2">
- <widget class="QCheckBox" name="checkBox_conformRFC">
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_stun">
<property name="text">
- <string>Conform to RFC 3263</string>
+ <string>Enable Stun</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="0" colspan="2">
+ <widget class="KLineEdit" name="edit_stunServer">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="toolTip">
+ <string>Format : name.server:port</string>
+ </property>
+ <property name="squeezedTextEnabled">
+ <bool>false</bool>
+ </property>
+ <property name="clickMessage">
+ <string>choose Stun server (example : stunserver.org)</string>
+ </property>
+ <property name="showClearButton" stdset="0">
+ <bool>false</bool>
</property>
</widget>
</item>
@@ -424,66 +450,9 @@
</layout>
</widget>
</item>
- <item>
- <widget class="QGroupBox" name="groupBox_commonSettings">
- <property name="title">
- <string/>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_10">
- <item>
- <widget class="QLabel" name="label_commonSettings">
- <property name="text">
- <string>Stun parameters will be applied on each SIP account created.</string>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QFormLayout" name="formLayout_commonSettings">
- <property name="fieldGrowthPolicy">
- <enum>QFormLayout::ExpandingFieldsGrow</enum>
- </property>
- <item row="0" column="0">
- <widget class="QCheckBox" name="kcfg_enableStun">
- <property name="text">
- <string>Enable Stun</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="KLineEdit" name="kcfg_stunServer">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="toolTip">
- <string>Format : name.server:port</string>
- </property>
- <property name="squeezedTextEnabled">
- <bool>false</bool>
- </property>
- <property name="clickMessage">
- <string>choose Stun server (example : stunserver.org)</string>
- </property>
- <property name="showClearButton" stdset="0">
- <bool>false</bool>
- </property>
- </widget>
- </item>
- </layout>
- </item>
- </layout>
- </widget>
- </item>
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KIntSpinBox</class>
- <extends>QSpinBox</extends>
- <header>knuminput.h</header>
- </customwidget>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
@@ -493,22 +462,5 @@
<resources>
<include location="../qrc/resources.qrc"/>
</resources>
- <connections>
- <connection>
- <sender>kcfg_enableStun</sender>
- <signal>toggled(bool)</signal>
- <receiver>kcfg_stunServer</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>71</x>
- <y>414</y>
- </hint>
- <hint type="destinationlabel">
- <x>167</x>
- <y>419</y>
- </hint>
- </hints>
- </connection>
- </connections>
+ <connections/>
</ui>
diff --git a/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg b/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg
index 11d1fc817d6c834d4286b09c288411a43e6fcd07..e832419a9391888d8f9e9735111a2685590337a6 100644
--- a/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg
+++ b/sflphone-client-kde/src/conf/sflphone-client-kde.kcfg
@@ -37,20 +37,6 @@
<label>Defines whether the main window should be displayed when receiving a message.</label>
</entry>
- <!-- Accounts Settings -->
-
- <!--
- <entry name="accountList" type="StringList">
- <label>Defines the list of accounts to register, in order of preference (first registered used by default).</label>
- </entry>
- -->
- <entry name="enableStun" type="Bool">
- <label>Defines the SIP accounts must use Stun.</label>
- </entry>
- <entry name="stunServer" type="String">
- <label>Defines the Stun server to use.</label>
- </entry>
-
<!-- Audio Settings -->
<entry name="interface" type="Enum">