diff --git a/accountdetails.cpp b/accountdetails.cpp
index 4366ded307280b47b89a4e5414a3943caaaedc88..5cafd9a0b2c07aeb66165d60aa7c480faaf91f78 100644
--- a/accountdetails.cpp
+++ b/accountdetails.cpp
@@ -307,12 +307,6 @@ AccountDetails::save() {
codecModel_->performAction(CodecModel::EditAction::SAVE);
}
-void
-AccountDetails::on_usernameEdit_editingFinished()
-{
- currentAccount_->setUsername(ui->usernameEdit->text());
-}
-
void
AccountDetails::on_tabWidget_currentChanged(int index)
{
diff --git a/accountdetails.h b/accountdetails.h
index 88f1052afdd134ea69732037b49447823a24d759..1f4983b372e155c0cc1ed9a6d5eae624d61dff7e 100644
--- a/accountdetails.h
+++ b/accountdetails.h
@@ -55,7 +55,6 @@ private slots:
void on_downVideoButton_clicked();
void on_audioCodecView_itemSelectionChanged();
void on_videoCodecView_itemSelectionChanged();
- void on_usernameEdit_editingFinished();
void on_tabWidget_currentChanged(int index);
private slots:
diff --git a/accountdetails.ui b/accountdetails.ui
index 4d9cad5fca3212031a24d8e0c0f5464309cbcca9..8c46b87530c09c241e00f08fd2c42aff6f172650 100644
--- a/accountdetails.ui
+++ b/accountdetails.ui
@@ -55,8 +55,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>733</width>
- <height>667</height>
+ <width>746</width>
+ <height>645</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -95,13 +95,6 @@
<property name="verticalSpacing">
<number>10</number>
</property>
- <item row="1" column="0">
- <widget class="QLabel" name="typeLabel">
- <property name="text">
- <string>Type</string>
- </property>
- </widget>
- </item>
<item row="0" column="0">
<widget class="QLabel" name="aliasLabel">
<property name="text">
@@ -122,26 +115,10 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="hashLabel">
+ <item row="1" column="0">
+ <widget class="QLabel" name="typeLabel">
<property name="text">
- <string>Hash</string>
- </property>
- <property name="buddy">
- <cstring>lrcfg_username</cstring>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="lrcfg_username">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="readOnly">
- <bool>true</bool>
+ <string>Type</string>
</property>
</widget>
</item>
@@ -163,7 +140,7 @@
</layout>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,0,0">
+ <layout class="QVBoxLayout" name="verticalLayout_6" stretch="0,0,0,0,0,0,0">
<property name="spacing">
<number>5</number>
</property>
@@ -196,26 +173,6 @@
</property>
<item row="0" column="0">
<widget class="QLabel" name="hostnameLabel">
- <property name="text">
- <string>Hostname</string>
- </property>
- <property name="buddy">
- <cstring>lrcfg_hostname</cstring>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="lrcfg_hostname">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="usernameLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
@@ -223,15 +180,15 @@
</sizepolicy>
</property>
<property name="text">
- <string>Username</string>
+ <string>Hostname</string>
</property>
<property name="buddy">
- <cstring>usernameEdit</cstring>
+ <cstring>lrcfg_hostname</cstring>
</property>
</widget>
</item>
- <item row="1" column="1">
- <widget class="QLineEdit" name="usernameEdit">
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="lrcfg_hostname">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
@@ -385,45 +342,71 @@
</item>
</layout>
</item>
- <item row="9" column="0">
- <widget class="QCheckBox" name="lrcfg_allowIncomingFromUnknown">
- <property name="text">
- <string>Allow Call From Unknown</string>
+ <item row="1" column="0">
+ <widget class="QLabel" name="usernameLabel">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
- </widget>
- </item>
- <item row="11" column="0">
- <widget class="QCheckBox" name="lrcfg_allowIncomingFromContact">
<property name="text">
- <string>Allow Call From Contact</string>
+ <string>Username</string>
</property>
- </widget>
- </item>
- <item row="10" column="0">
- <widget class="QCheckBox" name="lrcfg_allowIncomingFromHistory">
- <property name="text">
- <string>Allow Call From History</string>
+ <property name="buddy">
+ <cstring>lrcfg_username</cstring>
</property>
</widget>
</item>
- <item row="8" column="0">
- <widget class="QLabel" name="label_27">
- <property name="font">
- <font>
- <weight>75</weight>
- <bold>true</bold>
- </font>
- </property>
- <property name="text">
- <string>Ring Account Settings</string>
- </property>
- <property name="buddy">
- <cstring>lrcfg_allowIncomingFromUnknown</cstring>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="lrcfg_username">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
</property>
</widget>
</item>
</layout>
</item>
+ <item>
+ <widget class="QLabel" name="label_27">
+ <property name="font">
+ <font>
+ <weight>75</weight>
+ <bold>true</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Ring Account Settings</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_allowIncomingFromUnknown</cstring>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="lrcfg_allowIncomingFromUnknown">
+ <property name="text">
+ <string>Allow Call From Unknown</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="lrcfg_allowIncomingFromHistory">
+ <property name="text">
+ <string>Allow Call From History</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="lrcfg_allowIncomingFromContact">
+ <property name="text">
+ <string>Allow Call From Contact</string>
+ </property>
+ </widget>
+ </item>
<item>
<spacer name="verticalSpacer">
<property name="orientation">
@@ -1921,7 +1904,7 @@
</connection>
</connections>
<buttongroups>
- <buttongroup name="publishGroup"/>
<buttongroup name="dtmfGroup"/>
+ <buttongroup name="publishGroup"/>
</buttongroups>
</ui>