Commit 7ee23ac7 authored by Tijmen de Mes's avatar Tijmen de Mes

Added settings/preferences for sip message

parent f4614ed9
...@@ -61,6 +61,11 @@ class ServerSettings(SettingsGroup): ...@@ -61,6 +61,11 @@ class ServerSettings(SettingsGroup):
settings_url = Setting(type=HTTPURL, default=None, nillable=True) settings_url = Setting(type=HTTPURL, default=None, nillable=True)
class SMSSettings(SettingsGroup):
use_cpim = Setting(type=bool, default=True)
enable_iscomposing = Setting(type=bool, default=True)
class SoundSettings(SettingsGroup): class SoundSettings(SettingsGroup):
inbound_ringtone = Setting(type=SoundFile, default=None, nillable=True) inbound_ringtone = Setting(type=SoundFile, default=None, nillable=True)
...@@ -79,6 +84,7 @@ class AccountExtension(SettingsObjectExtension): ...@@ -79,6 +84,7 @@ class AccountExtension(SettingsObjectExtension):
rtp = RTPSettingsExtension rtp = RTPSettingsExtension
server = ServerSettings server = ServerSettings
sip = SIPSettingsExtension sip = SIPSettingsExtension
sms = SMSSettings
sounds = SoundSettings sounds = SoundSettings
xcap = XCAPSettingsExtension xcap = XCAPSettingsExtension
...@@ -88,6 +94,7 @@ class BonjourAccountExtension(SettingsObjectExtension): ...@@ -88,6 +94,7 @@ class BonjourAccountExtension(SettingsObjectExtension):
presence = PresenceSettingsExtension presence = PresenceSettingsExtension
rtp = RTPSettingsExtension rtp = RTPSettingsExtension
sip = BonjourSIPSettings sip = BonjourSIPSettings
sms = SMSSettings
sounds = SoundSettings sounds = SoundSettings
...@@ -1237,11 +1237,11 @@ ...@@ -1237,11 +1237,11 @@
</property> </property>
</widget> </widget>
</widget> </widget>
<widget class="QWidget" name="advanced_tab"> <widget class="QWidget" name="sms_tab">
<attribute name="title"> <attribute name="title">
<string>Advanced</string> <string>Messages</string>
</attribute> </attribute>
<layout class="QGridLayout" name="advanced_tab_layout"> <layout class="QGridLayout" name="gridLayout_3">
<property name="leftMargin"> <property name="leftMargin">
<number>10</number> <number>10</number>
</property> </property>
...@@ -1257,42 +1257,102 @@ ...@@ -1257,42 +1257,102 @@
<property name="spacing"> <property name="spacing">
<number>5</number> <number>5</number>
</property> </property>
<item row="6" column="0" colspan="3"> <item row="0" column="0">
<spacer name="account_tls_settings_spacer"> <widget class="QWidget" name="message_widget" native="true">
<property name="orientation"> <property name="minimumSize">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>0</width>
<height>40</height> <height>0</height>
</size> </size>
</property> </property>
</spacer> <layout class="QGridLayout" name="gridLayout_2">
</item> <property name="leftMargin">
<item row="2" column="0" colspan="3"> <number>0</number>
<widget class="QLabel" name="account_tls_settings_label"> </property>
<property name="font"> <property name="topMargin">
<font> <number>0</number>
<weight>75</weight> </property>
<bold>true</bold> <property name="rightMargin">
</font> <number>0</number>
</property> </property>
<property name="styleSheet"> <property name="bottomMargin">
<string notr="true">m</string> <number>0</number>
</property> </property>
<property name="text"> <item row="4" column="0">
<string>TLS Settings</string> <widget class="QCheckBox" name="message_cpim_enabled_button">
</property> <property name="text">
</widget> <string>Use CPIM envelope</string>
</item> </property>
<item row="3" column="0" colspan="3"> </widget>
<widget class="Line" name="line_11"> </item>
<property name="orientation"> <item row="2" column="0">
<enum>Qt::Horizontal</enum> <widget class="Line" name="line_2">
</property> <property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="6" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="0">
<widget class="QLabel" name="message_label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>When sending messages</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QCheckBox" name="message_iscomposing_enabled_button">
<property name="text">
<string>Enable Is-Composing</string>
</property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout>
</widget>
<widget class="QWidget" name="advanced_tab">
<attribute name="title">
<string>Advanced</string>
</attribute>
<layout class="QGridLayout" name="advanced_tab_layout">
<property name="leftMargin">
<number>10</number>
</property>
<property name="topMargin">
<number>10</number>
</property>
<property name="rightMargin">
<number>10</number>
</property>
<property name="bottomMargin">
<number>10</number>
</property>
<property name="spacing">
<number>5</number>
</property>
<item row="0" column="0" colspan="3"> <item row="0" column="0" colspan="3">
<widget class="QWidget" name="sip_settings_widget" native="true"> <widget class="QWidget" name="sip_settings_widget" native="true">
<layout class="QGridLayout" name="sip_settings_widget_layout"> <layout class="QGridLayout" name="sip_settings_widget_layout">
...@@ -1504,6 +1564,51 @@ ...@@ -1504,6 +1564,51 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="2" column="0" colspan="3">
<widget class="QLabel" name="account_tls_settings_label">
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">m</string>
</property>
<property name="text">
<string>TLS Settings</string>
</property>
</widget>
</item>
<item row="5" column="0">
<widget class="QLabel" name="account_peer_name_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Peer name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="3" column="0" colspan="3">
<widget class="Line" name="line_11">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
</widget>
</item>
<item row="1" column="0" colspan="3"> <item row="1" column="0" colspan="3">
<widget class="QWidget" name="pstn_widget" native="true"> <widget class="QWidget" name="pstn_widget" native="true">
<layout class="QGridLayout" name="pstn_widget_layout"> <layout class="QGridLayout" name="pstn_widget_layout">
...@@ -1679,28 +1784,6 @@ ...@@ -1679,28 +1784,6 @@
</layout> </layout>
</widget> </widget>
</item> </item>
<item row="5" column="0">
<widget class="QLabel" name="account_peer_name_label">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>140</width>
<height>0</height>
</size>
</property>
<property name="text">
<string>Peer name:</string>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="5" column="1" colspan="2"> <item row="5" column="1" colspan="2">
<widget class="QLineEdit" name="account_tls_name_editor"> <widget class="QLineEdit" name="account_tls_name_editor">
<property name="sizePolicy"> <property name="sizePolicy">
...@@ -1714,6 +1797,22 @@ ...@@ -1714,6 +1797,22 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="6" column="1">
<spacer name="account_tls_settings_spacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Expanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
</widget> </widget>
...@@ -3725,7 +3824,7 @@ ...@@ -3725,7 +3824,7 @@
<customwidget> <customwidget>
<class>QWebView</class> <class>QWebView</class>
<extends>QWidget</extends> <extends>QWidget</extends>
<header>QtWebKitWidgets/QWebView</header> <header location="global">QtWebKitWidgets/QWebView</header>
</customwidget> </customwidget>
<customwidget> <customwidget>
<class>LineEdit</class> <class>LineEdit</class>
......
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