settings: remove dtmf configuration
DTMF is not well supported in the daemon so this option shouldn't be
presented to the user.
Change-Id: Ieb1b35ba82c4771e0de283a1741c5ea33bb5d916
Tuleap: #1626
diff --git a/accountdetails.cpp b/accountdetails.cpp
index 9000d64..2f412b4 100644
--- a/accountdetails.cpp
+++ b/accountdetails.cpp
@@ -161,22 +161,6 @@
currentAccount_->setPublishedSameAsLocal(static_cast<bool>(id));
});
- switch (currentAccount_->DTMFType()) {
- case DtmfType::OverRtp:
- ui->rtpRadio->setChecked(true);
- break;
- case DtmfType::OverSip:
- ui->sipRadio->setChecked(true);
- break;
- }
-
- ui->dtmfGroup->disconnect();
- ui->dtmfGroup->setId(ui->rtpRadio, DtmfType::OverRtp);
- ui->dtmfGroup->setId(ui->sipRadio, DtmfType::OverSip);
-
- connect(ui->dtmfGroup, static_cast<void(QButtonGroup::*)(int)>(&QButtonGroup::buttonClicked),
- [=](int id){ currentAccount_->setDTMFType(static_cast<DtmfType>(id)); });
-
if (currentAccount_->tlsCaListCertificate())
ui->lrcfg_tlsCaListCertificate->setText(currentAccount_->tlsCaListCertificate()->path());
if (currentAccount_->tlsCertificate())
diff --git a/accountdetails.ui b/accountdetails.ui
index 1f406e6..f2614cd 100644
--- a/accountdetails.ui
+++ b/accountdetails.ui
@@ -94,8 +94,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>829</width>
- <height>756</height>
+ <width>825</width>
+ <height>722</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_12">
@@ -357,6 +357,74 @@
</item>
</layout>
</item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="nameServiceURLLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Name service URL</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_nameServiceURL</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="lrcfg_nameServiceURL">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="usernameLabel">
+ <property name="font">
+ <font>
+ <pointsize>11</pointsize>
+ </font>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">color: rgb(77, 77, 77);</string>
+ </property>
+ <property name="text">
+ <string>Username</string>
+ </property>
+ <property name="buddy">
+ <cstring>lrcfg_username</cstring>
+ </property>
+ </widget>
+ </item>
+ <item row="3" 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="minimumSize">
+ <size>
+ <width>0</width>
+ <height>30</height>
+ </size>
+ </property>
+ </widget>
+ </item>
<item row="4" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="sizePolicy">
@@ -513,145 +581,6 @@
</property>
</widget>
</item>
- <item row="9" column="0">
- <widget class="QLabel" name="label">
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">color: rgb(77, 77, 77);</string>
- </property>
- <property name="text">
- <string>DTMF tone type</string>
- </property>
- </widget>
- </item>
- <item row="9" column="1">
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <widget class="QRadioButton" name="rtpRadio">
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">color: rgb(77, 77, 77);</string>
- </property>
- <property name="text">
- <string>RTP</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">dtmfGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <widget class="QRadioButton" name="sipRadio">
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">color: rgb(77, 77, 77);</string>
- </property>
- <property name="text">
- <string>SIP</string>
- </property>
- <attribute name="buttonGroup">
- <string notr="true">dtmfGroup</string>
- </attribute>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::MinimumExpanding</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="lrcfg_nameServiceURL">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="minimumSize">
- <size>
- <width>0</width>
- <height>30</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="nameServiceURLLabel">
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">color: rgb(77, 77, 77);</string>
- </property>
- <property name="text">
- <string>Name service URL</string>
- </property>
- <property name="buddy">
- <cstring>lrcfg_nameServiceURL</cstring>
- </property>
- </widget>
- </item>
- <item row="3" 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="minimumSize">
- <size>
- <width>0</width>
- <height>30</height>
- </size>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QLabel" name="usernameLabel">
- <property name="font">
- <font>
- <pointsize>11</pointsize>
- </font>
- </property>
- <property name="styleSheet">
- <string notr="true">color: rgb(77, 77, 77);</string>
- </property>
- <property name="text">
- <string>Username</string>
- </property>
- <property name="buddy">
- <cstring>lrcfg_username</cstring>
- </property>
- </widget>
- </item>
</layout>
</item>
<item>
@@ -1138,8 +1067,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>811</width>
- <height>956</height>
+ <width>813</width>
+ <height>1025</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_11">
@@ -1995,8 +1924,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>829</width>
- <height>923</height>
+ <width>825</width>
+ <height>905</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_13">
@@ -2831,6 +2760,5 @@
</connections>
<buttongroups>
<buttongroup name="publishGroup"/>
- <buttongroup name="dtmfGroup"/>
</buttongroups>
</ui>