diff --git a/sflphone-client-kde/src/conf/dlgaccountsbase.ui b/sflphone-client-kde/src/conf/dlgaccountsbase.ui
index 099fd3255234897a80d0d0f4cfc2d9028d651cf7..431034ca7ba3c906bdee0deb53a9b777366c45f4 100644
--- a/sflphone-client-kde/src/conf/dlgaccountsbase.ui
+++ b/sflphone-client-kde/src/conf/dlgaccountsbase.ui
@@ -229,263 +229,154 @@
</widget>
</item>
<item>
- <widget class="QTabWidget" name="frame2_editAccounts">
+ <widget class="QFrame" name="frame2_editAccounts">
<property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+ <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
- <property name="currentIndex">
- <number>0</number>
+ <property name="frameShape">
+ <enum>QFrame::StyledPanel</enum>
</property>
- <widget class="QWidget" name="tab_basic">
- <attribute name="title">
- <string>Basic</string>
- </attribute>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label1_alias">
- <property name="text">
- <string>Alias</string>
- </property>
- <property name="buddy">
- <cstring>edit1_alias</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="edit1_alias">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label2_protocol">
- <property name="text">
- <string>Protocol</string>
- </property>
- <property name="buddy">
- <cstring>edit2_protocol</cstring>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="edit2_protocol">
- <item>
- <property name="text">
- <string>SIP</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>IAX</string>
- </property>
- </item>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label3_server">
- <property name="text">
- <string>Server</string>
- </property>
- <property name="buddy">
- <cstring>edit3_server</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="edit3_server">
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>0</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="label4_user">
- <property name="text">
- <string>Username</string>
- </property>
- <property name="buddy">
- <cstring>edit4_user</cstring>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QLineEdit" name="edit4_user"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label5_password">
- <property name="text">
- <string>Password</string>
- </property>
- <property name="buddy">
- <cstring>edit5_password</cstring>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QLineEdit" name="edit5_password">
- <property name="echoMode">
- <enum>QLineEdit::Password</enum>
- </property>
- </widget>
- </item>
- <item row="5" column="0">
- <widget class="QLabel" name="label6_mailbox">
- <property name="text">
- <string>Voicemail</string>
- </property>
- <property name="buddy">
- <cstring>edit6_mailbox</cstring>
- </property>
- </widget>
- </item>
- <item row="5" column="1">
- <widget class="QLineEdit" name="edit6_mailbox"/>
- </item>
- <item row="6" column="0">
- <widget class="QLabel" name="label7_state">
- <property name="text">
- <string>Status</string>
- </property>
- </widget>
- </item>
- <item row="6" column="1">
- <widget class="QLabel" name="edit7_state">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
+ <property name="frameShadow">
+ <enum>QFrame::Raised</enum>
+ </property>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label1_alias">
+ <property name="text">
+ <string>Alias</string>
+ </property>
+ <property name="buddy">
+ <cstring>edit1_alias</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="edit1_alias">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label2_protocol">
+ <property name="text">
+ <string>Protocol</string>
+ </property>
+ <property name="buddy">
+ <cstring>edit2_protocol</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="edit2_protocol">
+ <item>
<property name="text">
- <string/>
+ <string>SIP</string>
</property>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="tab_security">
- <attribute name="title">
- <string>Security</string>
- </attribute>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QCheckBox" name="checkBox_useSRTP">
+ </item>
+ <item>
<property name="text">
- <string>Use SRTP</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QWidget" name="widget" native="true">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <property name="leftMargin">
- <number>0</number>
- </property>
- <item>
- <widget class="QWidget" name="widget_keyExchange" native="true">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <property name="spacing">
- <number>-1</number>
- </property>
- <property name="margin">
- <number>0</number>
- </property>
- <item>
- <widget class="QLabel" name="label_keyExchange">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>Key exchange</string>
- </property>
- <property name="buddy">
- <cstring>combo_keyExchange</cstring>
- </property>
- </widget>
- </item>
- <item>
- <widget class="KComboBox" name="combo_keyExchange"/>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_helloSDP">
- <property name="text">
- <string>Send hello hash in SDP</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_confirmSAS">
- <property name="text">
- <string>Ask user to confirm SAS</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_warnZRTP">
- <property name="text">
- <string>Warn if ZRTP is not supported</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QCheckBox" name="checkBox_displaySASOnce">
- <property name="text">
- <string>Display SAS once for hold events</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
+ <string>IAX</string>
</property>
- <property name="sizeType">
- <enum>QSizePolicy::Expanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>1</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </widget>
+ </item>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label3_server">
+ <property name="text">
+ <string>Server</string>
+ </property>
+ <property name="buddy">
+ <cstring>edit3_server</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="edit3_server">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>0</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label4_user">
+ <property name="text">
+ <string>Username</string>
+ </property>
+ <property name="buddy">
+ <cstring>edit4_user</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="edit4_user"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label5_password">
+ <property name="text">
+ <string>Password</string>
+ </property>
+ <property name="buddy">
+ <cstring>edit5_password</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="edit5_password">
+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label6_mailbox">
+ <property name="text">
+ <string>Voicemail</string>
+ </property>
+ <property name="buddy">
+ <cstring>edit6_mailbox</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="edit6_mailbox"/>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label7_state">
+ <property name="text">
+ <string>Status</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QLabel" name="edit7_state">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
</widget>
</item>
</layout>
@@ -546,11 +437,6 @@
</layout>
</widget>
<customwidgets>
- <customwidget>
- <class>KComboBox</class>
- <extends>QComboBox</extends>
- <header>kcombobox.h</header>
- </customwidget>
<customwidget>
<class>KLineEdit</class>
<extends>QLineEdit</extends>
@@ -577,21 +463,5 @@
</hint>
</hints>
</connection>
- <connection>
- <sender>checkBox_useSRTP</sender>
- <signal>toggled(bool)</signal>
- <receiver>widget</receiver>
- <slot>setEnabled(bool)</slot>
- <hints>
- <hint type="sourcelabel">
- <x>377</x>
- <y>61</y>
- </hint>
- <hint type="destinationlabel">
- <x>380</x>
- <y>70</y>
- </hint>
- </hints>
- </connection>
</connections>
</ui>