Commit 63727498 authored by Anthony Léonard's avatar Anthony Léonard

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
parent 199a575c
......@@ -161,22 +161,6 @@ AccountDetails::setAccount(Account* currentAccount) {
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())
......
......@@ -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,14 +357,8 @@
</item>
</layout>
</item>
<item row="4" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="2" column="0">
<widget class="QLabel" name="nameServiceURLLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
......@@ -374,15 +368,15 @@
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text">
<string>Password</string>
<string>Name service URL</string>
</property>
<property name="buddy">
<cstring>lrcfg_password</cstring>
<cstring>lrcfg_nameServiceURL</cstring>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QLineEdit" name="lrcfg_password">
<item row="2" column="1">
<widget class="QLineEdit" name="lrcfg_nameServiceURL">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -395,19 +389,10 @@
<height>30</height>
</size>
</property>
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="proxyLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item row="3" column="0">
<widget class="QLabel" name="usernameLabel">
<property name="font">
<font>
<pointsize>11</pointsize>
......@@ -417,15 +402,15 @@
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text">
<string>Proxy</string>
<string>Username</string>
</property>
<property name="buddy">
<cstring>lrcfg_proxy</cstring>
<cstring>lrcfg_username</cstring>
</property>
</widget>
</item>
<item row="5" column="1">
<widget class="QLineEdit" name="lrcfg_proxy">
<item row="3" column="1">
<widget class="QLineEdit" name="lrcfg_username">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -440,8 +425,8 @@
</property>
</widget>
</item>
<item row="6" column="0">
<widget class="QLabel" name="voicemailLabel">
<item row="4" column="0">
<widget class="QLabel" name="passwordLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
......@@ -457,15 +442,15 @@
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text">
<string>Voicemail number</string>
<string>Password</string>
</property>
<property name="buddy">
<cstring>lrcfg_mailbox</cstring>
<cstring>lrcfg_password</cstring>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QLineEdit" name="lrcfg_mailbox">
<item row="4" column="1">
<widget class="QLineEdit" name="lrcfg_password">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -478,27 +463,18 @@
<height>30</height>
</size>
</property>
</widget>
</item>
<item row="7" column="0">
<widget class="QCheckBox" name="lrcfg_autoAnswer">
<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>Auto-answer calls</string>
<property name="echoMode">
<enum>QLineEdit::PasswordEchoOnEdit</enum>
</property>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="lrcfg_upnpEnabled">
<property name="enabled">
<bool>true</bool>
<item row="5" column="0">
<widget class="QLabel" name="proxyLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
......@@ -509,83 +485,15 @@
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text">
<string>UPnP enabled</string>
</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>
<string>Proxy</string>
</property>
<property name="text">
<string>DTMF tone type</string>
<property name="buddy">
<cstring>lrcfg_proxy</cstring>
</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">
<item row="5" column="1">
<widget class="QLineEdit" name="lrcfg_proxy">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -600,8 +508,14 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="nameServiceURLLabel">
<item row="6" column="0">
<widget class="QLabel" name="voicemailLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<pointsize>11</pointsize>
......@@ -611,15 +525,15 @@
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text">
<string>Name service URL</string>
<string>Voicemail number</string>
</property>
<property name="buddy">
<cstring>lrcfg_nameServiceURL</cstring>
<cstring>lrcfg_mailbox</cstring>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLineEdit" name="lrcfg_username">
<item row="6" column="1">
<widget class="QLineEdit" name="lrcfg_mailbox">
<property name="sizePolicy">
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
<horstretch>0</horstretch>
......@@ -634,8 +548,8 @@
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="usernameLabel">
<item row="7" column="0">
<widget class="QCheckBox" name="lrcfg_autoAnswer">
<property name="font">
<font>
<pointsize>11</pointsize>
......@@ -645,10 +559,25 @@
<string notr="true">color: rgb(77, 77, 77);</string>
</property>
<property name="text">
<string>Username</string>
<string>Auto-answer calls</string>
</property>
<property name="buddy">
<cstring>lrcfg_username</cstring>
</widget>
</item>
<item row="8" column="0">
<widget class="QCheckBox" name="lrcfg_upnpEnabled">
<property name="enabled">
<bool>true</bool>
</property>
<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>UPnP enabled</string>
</property>
</widget>
</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>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment