From ef60a5cb7b04f8b826c19e84bf25500c4206f407 Mon Sep 17 00:00:00 2001
From: jpbl <jpbl>
Date: Mon, 17 Oct 2005 21:04:47 +0000
Subject: [PATCH] We display the configuration
---
src/gui/official/ConfigurationManagerImpl.cpp | 16 +
src/gui/official/ConfigurationManagerImpl.hpp | 8 +-
src/gui/official/ConfigurationPanel.ui | 1912 +++++++++--------
src/gui/official/ConfigurationPanel.ui.h | 218 +-
src/gui/official/Request.cpp | 5 +-
src/gui/official/SFLRequest.cpp | 22 +-
src/gui/official/Url.cpp | 40 +
src/gui/official/Url.hpp | 13 +
src/gui/official/globals.h | 20 +
src/gui/official/sflphone.pro | 2 +
10 files changed, 1200 insertions(+), 1056 deletions(-)
create mode 100644 src/gui/official/Url.cpp
create mode 100644 src/gui/official/Url.hpp
diff --git a/src/gui/official/ConfigurationManagerImpl.cpp b/src/gui/official/ConfigurationManagerImpl.cpp
index 40a6e58638..b37160d417 100644
--- a/src/gui/official/ConfigurationManagerImpl.cpp
+++ b/src/gui/official/ConfigurationManagerImpl.cpp
@@ -57,3 +57,19 @@ ConfigurationManagerImpl::set(const QString §ion,
}
}
+QString
+ConfigurationManagerImpl::get(const QString §ion,
+ const QString &name)
+{
+ QString value;
+ SectionMap::iterator pos = mEntries.find(section);
+ if(pos != mEntries.end()) {
+ VariableMap::iterator vpos = pos->second.find(name);
+ if(vpos != pos->second.end()) {
+ value = vpos->second.value;
+ }
+ }
+
+ return value;
+}
+
diff --git a/src/gui/official/ConfigurationManagerImpl.hpp b/src/gui/official/ConfigurationManagerImpl.hpp
index 6d85fcb809..9b396905e5 100644
--- a/src/gui/official/ConfigurationManagerImpl.hpp
+++ b/src/gui/official/ConfigurationManagerImpl.hpp
@@ -91,7 +91,11 @@ public:
void set(const QString §ion,
const QString &name,
const QString &value);
-
+
+ QString get(const QString §ion,
+ const QString &name);
+
+
void add(const ConfigEntry &entry);
void add(const AudioDevice &entry);
@@ -104,6 +108,8 @@ public:
void complete()
{emit updated();}
+ void save();
+
private:
typedef std::map< QString, ConfigEntry > VariableMap;
typedef std::map< QString, VariableMap > SectionMap;
diff --git a/src/gui/official/ConfigurationPanel.ui b/src/gui/official/ConfigurationPanel.ui
index 5c639ffd1b..2de3520301 100644
--- a/src/gui/official/ConfigurationPanel.ui
+++ b/src/gui/official/ConfigurationPanel.ui
@@ -9,7 +9,7 @@
<x>0</x>
<y>0</y>
<width>561</width>
- <height>552</height>
+ <height>546</height>
</rect>
</property>
<property name="caption">
@@ -18,1150 +18,1186 @@
<property name="sizeGripEnabled">
<bool>true</bool>
</property>
- <grid>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>layout19</cstring>
</property>
- <widget class="QLayoutWidget" row="1" column="0" rowspan="1" colspan="2">
+ <property name="geometry">
+ <rect>
+ <x>11</x>
+ <y>501</y>
+ <width>543</width>
+ <height>36</height>
+ </rect>
+ </property>
+ <vbox>
<property name="name">
- <cstring>layout19</cstring>
+ <cstring>unnamed</cstring>
</property>
- <vbox>
+ <widget class="Line">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>line1</cstring>
</property>
- <widget class="Line">
- <property name="name">
- <cstring>line1</cstring>
- </property>
- <property name="frameShape">
- <enum>HLine</enum>
- </property>
- <property name="frameShadow">
- <enum>Sunken</enum>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- </widget>
- <widget class="QLayoutWidget">
+ <property name="frameShape">
+ <enum>HLine</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Sunken</enum>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout28</cstring>
+ </property>
+ <hbox>
<property name="name">
- <cstring>layout28</cstring>
+ <cstring>unnamed</cstring>
</property>
- <hbox>
+ <widget class="QPushButton">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>buttonHelp</cstring>
</property>
- <widget class="QPushButton">
- <property name="name">
- <cstring>buttonHelp</cstring>
- </property>
- <property name="text">
- <string>&Help</string>
- </property>
- <property name="accel">
- <string>F1</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>Horizontal Spacing2</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>160</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="QPushButton">
- <property name="name">
- <cstring>buttonSave</cstring>
- </property>
- <property name="text">
- <string>&Save</string>
- </property>
- <property name="accel">
- <string>Alt+S</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- <property name="default">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>buttonOk</cstring>
- </property>
- <property name="text">
- <string>&OK</string>
- </property>
- <property name="accel">
- <string>Alt+O</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>buttonCancel</cstring>
- </property>
- <property name="text">
- <string>&Cancel</string>
- </property>
- <property name="accel">
- <string>F, Backspace</string>
- </property>
- <property name="autoDefault">
- <bool>true</bool>
- </property>
- </widget>
- </hbox>
- </widget>
- </vbox>
- </widget>
- <widget class="QListBox" row="0" column="0">
- <property name="name">
- <cstring>Menu</cstring>
- </property>
- <property name="sizePolicy">
- <sizepolicy>
- <hsizetype>0</hsizetype>
- <vsizetype>7</vsizetype>
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="cursor">
- <cursor>13</cursor>
- </property>
- <property name="currentItem">
- <number>-1</number>
- </property>
- <property name="selectionMode">
- <enum>Single</enum>
- </property>
- </widget>
- <widget class="QLayoutWidget" row="0" column="1">
+ <property name="text">
+ <string>&Help</string>
+ </property>
+ <property name="accel">
+ <string>F1</string>
+ </property>
+ <property name="autoDefault">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>Horizontal Spacing2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>160</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>buttonSave</cstring>
+ </property>
+ <property name="text">
+ <string>&Save</string>
+ </property>
+ <property name="accel">
+ <string>Alt+S</string>
+ </property>
+ <property name="autoDefault">
+ <bool>true</bool>
+ </property>
+ <property name="default">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>buttonOk</cstring>
+ </property>
+ <property name="text">
+ <string>&OK</string>
+ </property>
+ <property name="accel">
+ <string>Alt+O</string>
+ </property>
+ <property name="autoDefault">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>buttonCancel</cstring>
+ </property>
+ <property name="text">
+ <string>&Cancel</string>
+ </property>
+ <property name="accel">
+ <string>F, Backspace</string>
+ </property>
+ <property name="autoDefault">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout17</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>117</x>
+ <y>11</y>
+ <width>437</width>
+ <height>484</height>
+ </rect>
+ </property>
+ <vbox>
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>unnamed</cstring>
</property>
- <vbox>
+ <widget class="QLabel">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>TitleTab</cstring>
</property>
- <widget class="QLabel">
- <property name="name">
- <cstring>TitleTab</cstring>
- </property>
- <property name="font">
- <font>
- <bold>1</bold>
- </font>
- </property>
- <property name="text">
- <string>Setup signalisation</string>
- </property>
- </widget>
- <widget class="Line">
- <property name="name">
- <cstring>line2</cstring>
- </property>
- <property name="frameShape">
- <enum>HLine</enum>
- </property>
- <property name="frameShadow">
- <enum>Sunken</enum>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- </widget>
- <widget class="QTabWidget">
+ <property name="font">
+ <font>
+ <bold>1</bold>
+ </font>
+ </property>
+ <property name="text">
+ <string>Setup signalisation</string>
+ </property>
+ </widget>
+ <widget class="Line">
+ <property name="name">
+ <cstring>line2</cstring>
+ </property>
+ <property name="frameShape">
+ <enum>HLine</enum>
+ </property>
+ <property name="frameShadow">
+ <enum>Sunken</enum>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ </widget>
+ <widget class="QTabWidget">
+ <property name="name">
+ <cstring>Tab_Signalisations</cstring>
+ </property>
+ <widget class="QWidget">
<property name="name">
- <cstring>Tab_Signalisations</cstring>
+ <cstring>SIPPage</cstring>
</property>
- <widget class="QWidget">
+ <attribute name="title">
+ <string>SIP Authentication</string>
+ </attribute>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>SIPPage</cstring>
+ <cstring>layout24</cstring>
</property>
- <attribute name="title">
- <string>SIP Authentication</string>
- </attribute>
- <widget class="QLayoutWidget">
+ <property name="geometry">
+ <rect>
+ <x>16</x>
+ <y>12</y>
+ <width>401</width>
+ <height>393</height>
+ </rect>
+ </property>
+ <vbox>
<property name="name">
- <cstring>layout24</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>16</x>
- <y>12</y>
- <width>401</width>
- <height>393</height>
- </rect>
+ <cstring>unnamed</cstring>
</property>
- <vbox>
+ <widget class="QGroupBox">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>groupBox1</cstring>
</property>
- <widget class="QGroupBox">
+ <property name="title">
+ <string></string>
+ </property>
+ <grid>
<property name="name">
- <cstring>groupBox1</cstring>
- </property>
- <property name="title">
- <string></string>
+ <cstring>unnamed</cstring>
</property>
- <grid>
+ <widget class="QLabel" row="0" column="0">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>textLabel2</cstring>
</property>
- <widget class="QLabel" row="0" column="0">
- <property name="name">
- <cstring>textLabel2</cstring>
- </property>
- <property name="text">
- <string>Full name</string>
- </property>
- </widget>
- <widget class="QLineEdit" row="1" column="0">
- <property name="name">
- <cstring>fullName</cstring>
- </property>
- </widget>
- <widget class="QLineEdit" row="3" column="0">
- <property name="name">
- <cstring>userPart</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="2" column="0">
- <property name="name">
- <cstring>textLabel3</cstring>
- </property>
- <property name="text">
- <string>User Part of SIP URL</string>
- </property>
- </widget>
- <widget class="QLabel" row="4" column="0">
- <property name="name">
- <cstring>textLabel2_3</cstring>
- </property>
- <property name="text">
- <string>Authorization user</string>
- </property>
- </widget>
- <widget class="QLineEdit" row="5" column="0">
- <property name="name">
- <cstring>username</cstring>
- </property>
- </widget>
- <widget class="QLineEdit" row="9" column="0">
- <property name="name">
- <cstring>hostPart</cstring>
- </property>
- </widget>
- <widget class="QLineEdit" row="11" column="0">
- <property name="name">
- <cstring>sipproxy</cstring>
- </property>
- </widget>
- <widget class="QLabel" row="10" column="0">
- <property name="name">
- <cstring>textLabel3_2_2</cstring>
- </property>
- <property name="text">
- <string>SIP proxy</string>
- </property>
- </widget>
- <widget class="QLineEdit" row="7" column="0">
- <property name="name">
- <cstring>password</cstring>
- </property>
- <property name="echoMode">
- <enum>Password</enum>
- </property>
- </widget>
- <widget class="QLabel" row="6" column="0">
- <property name="name">
- <cstring>textLabel1_3</cstring>
- </property>
- <property name="text">
- <string>Password</string>
- </property>
- </widget>
- <widget class="QLabel" row="8" column="0">
- <property name="name">
- <cstring>textLabel3_2</cstring>
- </property>
- <property name="text">
- <string>Host part of SIP URL</string>
- </property>
- </widget>
- </grid>
- </widget>
- <widget class="QLayoutWidget">
+ <property name="text">
+ <string>Full name</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="1" column="0">
+ <property name="name">
+ <cstring>fullName</cstring>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="3" column="0">
+ <property name="name">
+ <cstring>userPart</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="2" column="0">
+ <property name="name">
+ <cstring>textLabel3</cstring>
+ </property>
+ <property name="text">
+ <string>User Part of SIP URL</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="4" column="0">
+ <property name="name">
+ <cstring>textLabel2_3</cstring>
+ </property>
+ <property name="text">
+ <string>Authorization user</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="5" column="0">
+ <property name="name">
+ <cstring>username</cstring>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="9" column="0">
+ <property name="name">
+ <cstring>hostPart</cstring>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="11" column="0">
+ <property name="name">
+ <cstring>sipproxy</cstring>
+ </property>
+ </widget>
+ <widget class="QLabel" row="10" column="0">
+ <property name="name">
+ <cstring>textLabel3_2_2</cstring>
+ </property>
+ <property name="text">
+ <string>SIP proxy</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit" row="7" column="0">
+ <property name="name">
+ <cstring>password</cstring>
+ </property>
+ <property name="echoMode">
+ <enum>Password</enum>
+ </property>
+ </widget>
+ <widget class="QLabel" row="6" column="0">
+ <property name="name">
+ <cstring>textLabel1_3</cstring>
+ </property>
+ <property name="text">
+ <string>Password</string>
+ </property>
+ </widget>
+ <widget class="QLabel" row="8" column="0">
+ <property name="name">
+ <cstring>textLabel3_2</cstring>
+ </property>
+ <property name="text">
+ <string>Host part of SIP URL</string>
+ </property>
+ </widget>
+ </grid>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout23</cstring>
+ </property>
+ <vbox>
<property name="name">
- <cstring>layout23</cstring>
+ <cstring>unnamed</cstring>
</property>
- <vbox>
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>layout19</cstring>
</property>
- <widget class="QLayoutWidget">
+ <hbox>
<property name="name">
- <cstring>layout19</cstring>
+ <cstring>unnamed</cstring>
</property>
- <hbox>
+ <widget class="QCheckBox">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>autoregister</cstring>
</property>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>autoregister</cstring>
- </property>
- <property name="text">
- <string>Auto-register</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer7</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>201</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- <widget class="QPushButton">
- <property name="name">
- <cstring>Register</cstring>
- </property>
- <property name="text">
- <string>Register</string>
- </property>
- </widget>
- </hbox>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer9</cstring>
- </property>
- <property name="orientation">
- <enum>Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>20</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </vbox>
- </widget>
- </vbox>
- </widget>
+ <property name="text">
+ <string>Auto-register</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer7</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>201</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>Register</cstring>
+ </property>
+ <property name="text">
+ <string>Register</string>
+ </property>
+ </widget>
+ </hbox>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer9</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Vertical</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>20</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </vbox>
+ </widget>
+ </vbox>
</widget>
- <widget class="QWidget">
+ </widget>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>STUNPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>STUN</string>
+ </attribute>
+ <widget class="QGroupBox">
<property name="name">
- <cstring>STUNPage</cstring>
+ <cstring>groupBox3</cstring>
</property>
- <attribute name="title">
- <string>STUN</string>
- </attribute>
- <widget class="QGroupBox">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>110</y>
+ <width>253</width>
+ <height>100</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Settings </string>
+ </property>
+ <widget class="QLabel">
<property name="name">
- <cstring>groupBox3</cstring>
+ <cstring>textLabel1_5</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>110</y>
- <width>253</width>
- <height>100</height>
+ <y>38</y>
+ <width>229</width>
+ <height>16</height>
</rect>
</property>
- <property name="title">
- <string>Settings </string>
+ <property name="text">
+ <string>STUN server (address:port)</string>
</property>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1_5</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>38</y>
- <width>229</width>
- <height>16</height>
- </rect>
- </property>
- <property name="text">
- <string>STUN server (address:port)</string>
- </property>
- </widget>
- <widget class="QLineEdit">
- <property name="name">
- <cstring>STUNserver</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>60</y>
- <width>229</width>
- <height>23</height>
- </rect>
- </property>
- </widget>
</widget>
- <widget class="QButtonGroup">
+ <widget class="QLineEdit">
<property name="name">
- <cstring>stunButtonGroup</cstring>
+ <cstring>STUNserver</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>10</y>
- <width>90</width>
- <height>81</height>
+ <y>60</y>
+ <width>229</width>
+ <height>23</height>
</rect>
</property>
- <property name="title">
- <string>Use STUN</string>
- </property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>useStunNo</cstring>
- </property>
- <property name="text">
- <string>No</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QRadioButton">
- <property name="name">
- <cstring>useStunYes</cstring>
- </property>
- <property name="text">
- <string>Yes</string>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
- </vbox>
</widget>
</widget>
- <widget class="QWidget">
+ <widget class="QButtonGroup">
<property name="name">
- <cstring>DTMFPage</cstring>
+ <cstring>stunButtonGroup</cstring>
</property>
- <attribute name="title">
- <string>DTMF</string>
- </attribute>
- <widget class="QGroupBox">
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>90</width>
+ <height>81</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Use STUN</string>
+ </property>
+ <vbox>
<property name="name">
- <cstring>SettingsDTMF</cstring>
+ <cstring>unnamed</cstring>
</property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>301</width>
- <height>130</height>
- </rect>
- </property>
- <property name="title">
- <string>Settings</string>
- </property>
- <grid>
+ <widget class="QRadioButton">
<property name="name">
- <cstring>unnamed</cstring>
+ <cstring>useStunNo</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
- <property name="name">
- <cstring>layout11</cstring>
- </property>
- <vbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout10</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>playTones</cstring>
- </property>
- <property name="text">
- <string>Play tones locally</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer6</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>111</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </hbox>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout7</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>labelPulseLength</cstring>
- </property>
- <property name="text">
- <string>Pulse length</string>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer3</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>115</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="QSpinBox">
- <property name="name">
- <cstring>pulseLength</cstring>
- </property>
- <property name="suffix">
- <string> ms</string>
- </property>
- <property name="maxValue">
- <number>1500</number>
- </property>
- <property name="minValue">
- <number>10</number>
- </property>
- <property name="value">
- <number>250</number>
- </property>
- </widget>
- </hbox>
- </widget>
- <widget class="QLayoutWidget">
- <property name="name">
- <cstring>layout8</cstring>
- </property>
- <hbox>
- <property name="name">
- <cstring>unnamed</cstring>
- </property>
- <widget class="QLabel">
- <property name="name">
- <cstring>labelSendDTMF</cstring>
- </property>
- <property name="text">
- <string>Send DTMF as</string>
- </property>
- </widget>
- <spacer>
- <property name="name">
- <cstring>spacer4</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>85</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- <widget class="QComboBox">
- <item>
- <property name="text">
- <string>SIP INFO</string>
- </property>
- </item>
- <property name="name">
- <cstring>sendDTMFas</cstring>
- </property>
- <property name="currentItem">
- <number>0</number>
- </property>
- </widget>
- </hbox>
- </widget>
- </vbox>
- </widget>
- </grid>
- </widget>
+ <property name="text">
+ <string>No</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QRadioButton">
+ <property name="name">
+ <cstring>useStunYes</cstring>
+ </property>
+ <property name="text">
+ <string>Yes</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </vbox>
</widget>
</widget>
- <widget class="QTabWidget">
+ <widget class="QWidget">
<property name="name">
- <cstring>Tab_Audio</cstring>
+ <cstring>DTMFPage</cstring>
</property>
- <widget class="QWidget">
+ <attribute name="title">
+ <string>DTMF</string>
+ </attribute>
+ <widget class="QGroupBox">
<property name="name">
- <cstring>DriversPage</cstring>
+ <cstring>SettingsDTMF</cstring>
</property>
- <attribute name="title">
- <string>Drivers</string>
- </attribute>
- <widget class="QButtonGroup">
- <property name="name">
- <cstring>DriverChoice</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>10</y>
- <width>410</width>
- <height>180</height>
- </rect>
- </property>
- <property name="title">
- <string>Drivers list</string>
- </property>
- </widget>
- </widget>
- <widget class="QWidget">
- <property name="name">
- <cstring>CodecsPage</cstring>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>301</width>
+ <height>130</height>
+ </rect>
</property>
- <attribute name="title">
- <string>Codecs</string>
- </attribute>
- <widget class="QButtonGroup">
+ <property name="title">
+ <string>Settings</string>
+ </property>
+ <grid>
<property name="name">
- <cstring>CodecsChoice</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>10</y>
- <width>133</width>
- <height>157</height>
- </rect>
+ <cstring>unnamed</cstring>
</property>
- <property name="title">
- <string>Supported codecs</string>
- </property>
- <widget class="QLayoutWidget">
+ <widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout18</cstring>
+ <cstring>layout11</cstring>
</property>
- <property name="geometry">
- <rect>
- <x>10</x>
- <y>20</y>
- <width>110</width>
- <height>120</height>
- </rect>
- </property>
- <grid>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget" row="0" column="0">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>layout10</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QComboBox">
- <item>
- <property name="text">
- <string>G711u</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>G711a</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>GSM</string>
- </property>
- </item>
+ <widget class="QCheckBox">
<property name="name">
- <cstring>codec1</cstring>
+ <cstring>playTones</cstring>
</property>
- </widget>
- <widget class="QComboBox">
- <item>
- <property name="text">
- <string>G711a</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>G711u</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>GSM</string>
- </property>
- </item>
- <property name="name">
- <cstring>codec2</cstring>
+ <property name="text">
+ <string>Play tones locally</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
</property>
</widget>
- <widget class="QComboBox">
- <item>
- <property name="text">
- <string>G711u</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>G711a</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>GSM</string>
- </property>
- </item>
+ <spacer>
<property name="name">
- <cstring>codec3</cstring>
+ <cstring>spacer6</cstring>
</property>
- </widget>
- </vbox>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>111</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
</widget>
- <widget class="QLayoutWidget" row="0" column="1">
+ <widget class="QLayoutWidget">
<property name="name">
- <cstring>layout18</cstring>
+ <cstring>layout7</cstring>
</property>
- <vbox>
+ <hbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_4</cstring>
+ <cstring>labelPulseLength</cstring>
</property>
<property name="text">
- <string>1</string>
+ <string>Pulse length</string>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer3</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>115</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QSpinBox">
+ <property name="name">
+ <cstring>pulseLength</cstring>
+ </property>
+ <property name="suffix">
+ <string> ms</string>
+ </property>
+ <property name="maxValue">
+ <number>1500</number>
+ </property>
+ <property name="minValue">
+ <number>10</number>
+ </property>
+ <property name="value">
+ <number>250</number>
</property>
</widget>
+ </hbox>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout8</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_4_2</cstring>
+ <cstring>labelSendDTMF</cstring>
</property>
<property name="text">
- <string>2</string>
+ <string>Send DTMF as</string>
</property>
</widget>
- <widget class="QLabel">
+ <spacer>
+ <property name="name">
+ <cstring>spacer4</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>85</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>SIP INFO</string>
+ </property>
+ </item>
<property name="name">
- <cstring>textLabel1_4_3</cstring>
+ <cstring>sendDTMFas</cstring>
</property>
- <property name="text">
- <string>3</string>
+ <property name="currentItem">
+ <number>0</number>
</property>
</widget>
- </vbox>
+ </hbox>
</widget>
- </grid>
+ </vbox>
</widget>
- </widget>
+ </grid>
</widget>
- <widget class="QWidget">
+ </widget>
+ </widget>
+ <widget class="QTabWidget">
+ <property name="name">
+ <cstring>Tab_Audio</cstring>
+ </property>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>DriversPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>Drivers</string>
+ </attribute>
+ <widget class="QButtonGroup">
<property name="name">
- <cstring>RingPage</cstring>
+ <cstring>DriverChoice</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>410</width>
+ <height>180</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Drivers list</string>
</property>
- <attribute name="title">
- <string>Ringtones</string>
- </attribute>
- <widget class="QComboBox">
- <property name="name">
- <cstring>ringsChoice</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>21</y>
- <width>150</width>
- <height>30</height>
- </rect>
- </property>
- </widget>
</widget>
</widget>
- <widget class="QTabWidget">
+ <widget class="QWidget">
<property name="name">
- <cstring>Tab_Preferences</cstring>
+ <cstring>CodecsPage</cstring>
</property>
- <widget class="QWidget">
+ <attribute name="title">
+ <string>Codecs</string>
+ </attribute>
+ <widget class="QButtonGroup">
<property name="name">
- <cstring>DriversPage</cstring>
+ <cstring>CodecsChoice</cstring>
</property>
- <attribute name="title">
- <string>Themes</string>
- </attribute>
- <widget class="QComboBox">
- <property name="name">
- <cstring>SkinChoice</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>12</x>
- <y>42</y>
- <width>110</width>
- <height>27</height>
- </rect>
- </property>
- </widget>
- <widget class="QPushButton">
- <property name="name">
- <cstring>buttonApplySkin</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>136</x>
- <y>40</y>
- <width>80</width>
- <height>32</height>
- </rect>
- </property>
- <property name="text">
- <string>&Apply</string>
- </property>
- <property name="accel">
- <string>Alt+A</string>
- </property>
- </widget>
- </widget>
- <widget class="QWidget">
- <property name="name">
- <cstring>TabPage</cstring>
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>10</y>
+ <width>133</width>
+ <height>157</height>
+ </rect>
+ </property>
+ <property name="title">
+ <string>Supported codecs</string>
</property>
- <attribute name="title">
- <string>Options</string>
- </attribute>
<widget class="QLayoutWidget">
<property name="name">
- <cstring>layout17</cstring>
+ <cstring>layout18</cstring>
</property>
<property name="geometry">
<rect>
<x>10</x>
- <y>10</y>
- <width>262</width>
- <height>200</height>
+ <y>20</y>
+ <width>110</width>
+ <height>120</height>
</rect>
</property>
- <vbox>
+ <grid>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLayoutWidget">
+ <widget class="QLayoutWidget" row="0" column="0">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>layout17</cstring>
</property>
- <hbox>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
- <widget class="QLabel">
- <property name="name">
- <cstring>labelToneZone</cstring>
- </property>
- <property name="text">
- <string>Zone tone:</string>
- </property>
- </widget>
<widget class="QComboBox">
<item>
<property name="text">
- <string>North America</string>
+ <string>G711u</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>G711a</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>GSM</string>
</property>
</item>
+ <property name="name">
+ <cstring>codec1</cstring>
+ </property>
+ </widget>
+ <widget class="QComboBox">
<item>
<property name="text">
- <string>France</string>
+ <string>G711a</string>
</property>
</item>
<item>
<property name="text">
- <string>Australia</string>
+ <string>G711u</string>
</property>
</item>
<item>
<property name="text">
- <string>United Kingdom</string>
+ <string>GSM</string>
</property>
</item>
+ <property name="name">
+ <cstring>codec2</cstring>
+ </property>
+ </widget>
+ <widget class="QComboBox">
<item>
<property name="text">
- <string>Spain</string>
+ <string>G711u</string>
</property>
</item>
<item>
<property name="text">
- <string>Italy</string>
+ <string>G711a</string>
</property>
</item>
<item>
<property name="text">
- <string>Japan</string>
+ <string>GSM</string>
</property>
</item>
<property name="name">
- <cstring>zoneToneChoice</cstring>
+ <cstring>codec3</cstring>
</property>
</widget>
- <spacer>
- <property name="name">
- <cstring>spacer5</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>31</width>
- <height>21</height>
- </size>
- </property>
- </spacer>
- </hbox>
- </widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>confirmationToQuit</cstring>
- </property>
- <property name="text">
- <string>Show confirmation to quit.</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QCheckBox">
- <property name="name">
- <cstring>checkedTray</cstring>
- </property>
- <property name="text">
- <string>Minimize to tray</string>
- </property>
+ </vbox>
</widget>
- <widget class="QLayoutWidget">
+ <widget class="QLayoutWidget" row="0" column="1">
<property name="name">
- <cstring>layout16</cstring>
+ <cstring>layout18</cstring>
</property>
- <hbox>
+ <vbox>
<property name="name">
<cstring>unnamed</cstring>
</property>
<widget class="QLabel">
<property name="name">
- <cstring>textLabel1_6</cstring>
+ <cstring>textLabel1_4</cstring>
</property>
<property name="text">
- <string>Voicemail:</string>
+ <string>1</string>
</property>
</widget>
- <widget class="QLineEdit">
+ <widget class="QLabel">
<property name="name">
- <cstring>voicemailNumber</cstring>
+ <cstring>textLabel1_4_2</cstring>
+ </property>
+ <property name="text">
+ <string>2</string>
</property>
</widget>
- <spacer>
+ <widget class="QLabel">
<property name="name">
- <cstring>spacer6_2</cstring>
- </property>
- <property name="orientation">
- <enum>Horizontal</enum>
+ <cstring>textLabel1_4_3</cstring>
</property>
- <property name="sizeType">
- <enum>Expanding</enum>
- </property>
- <property name="sizeHint">
- <size>
- <width>61</width>
- <height>21</height>
- </size>
+ <property name="text">
+ <string>3</string>
</property>
- </spacer>
- </hbox>
+ </widget>
+ </vbox>
</widget>
- </vbox>
+ </grid>
</widget>
</widget>
</widget>
- <widget class="QTabWidget">
+ <widget class="QWidget">
<property name="name">
- <cstring>Tab_About</cstring>
+ <cstring>RingPage</cstring>
</property>
- <widget class="QWidget">
+ <attribute name="title">
+ <string>Ringtones</string>
+ </attribute>
+ <widget class="QComboBox">
<property name="name">
- <cstring>DriversPage</cstring>
+ <cstring>ringsChoice</cstring>
</property>
- <attribute name="title">
- <string>About SFLPhone</string>
- </attribute>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel1</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>50</x>
- <y>40</y>
- <width>312</width>
- <height>91</height>
- </rect>
- </property>
- <property name="pixmap">
- <pixmap>image0</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
- <widget class="QLabel">
+ <property name="geometry">
+ <rect>
+ <x>20</x>
+ <y>21</y>
+ <width>150</width>
+ <height>30</height>
+ </rect>
+ </property>
+ </widget>
+ </widget>
+ </widget>
+ <widget class="QTabWidget">
+ <property name="name">
+ <cstring>Tab_Preferences</cstring>
+ </property>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>DriversPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>Themes</string>
+ </attribute>
+ <widget class="QComboBox">
+ <property name="name">
+ <cstring>SkinChoice</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>12</x>
+ <y>42</y>
+ <width>110</width>
+ <height>27</height>
+ </rect>
+ </property>
+ </widget>
+ <widget class="QPushButton">
+ <property name="name">
+ <cstring>buttonApplySkin</cstring>
+ </property>
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>136</x>
+ <y>40</y>
+ <width>80</width>
+ <height>32</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string>&Apply</string>
+ </property>
+ <property name="accel">
+ <string>Alt+A</string>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>TabPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>Options</string>
+ </attribute>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout17</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>10</x>
+ <y>10</y>
+ <width>262</width>
+ <height>200</height>
+ </rect>
+ </property>
+ <vbox>
<property name="name">
- <cstring>textLabel2_2</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>20</x>
- <y>170</y>
- <width>371</width>
- <height>121</height>
- </rect>
+ <cstring>unnamed</cstring>
</property>
- <property name="text">
- <string><p align="center">
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout16</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>labelToneZone</cstring>
+ </property>
+ <property name="text">
+ <string>Zone tone:</string>
+ </property>
+ </widget>
+ <widget class="QComboBox">
+ <item>
+ <property name="text">
+ <string>North America</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>France</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Australia</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>United Kingdom</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Spain</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Italy</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Japan</string>
+ </property>
+ </item>
+ <property name="name">
+ <cstring>zoneToneChoice</cstring>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer5</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>31</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>confirmationToQuit</cstring>
+ </property>
+ <property name="text">
+ <string>Show confirmation to quit.</string>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ </widget>
+ <widget class="QCheckBox">
+ <property name="name">
+ <cstring>checkedTray</cstring>
+ </property>
+ <property name="text">
+ <string>Minimize to tray</string>
+ </property>
+ </widget>
+ <widget class="QLayoutWidget">
+ <property name="name">
+ <cstring>layout16</cstring>
+ </property>
+ <hbox>
+ <property name="name">
+ <cstring>unnamed</cstring>
+ </property>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel1_6</cstring>
+ </property>
+ <property name="text">
+ <string>Voicemail:</string>
+ </property>
+ </widget>
+ <widget class="QLineEdit">
+ <property name="name">
+ <cstring>voicemailNumber</cstring>
+ </property>
+ </widget>
+ <spacer>
+ <property name="name">
+ <cstring>spacer6_2</cstring>
+ </property>
+ <property name="orientation">
+ <enum>Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>Expanding</enum>
+ </property>
+ <property name="sizeHint">
+ <size>
+ <width>61</width>
+ <height>21</height>
+ </size>
+ </property>
+ </spacer>
+ </hbox>
+ </widget>
+ </vbox>
+ </widget>
+ </widget>
+ </widget>
+ <widget class="QTabWidget">
+ <property name="name">
+ <cstring>Tab_About</cstring>
+ </property>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>DriversPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>About SFLPhone</string>
+ </attribute>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel2_2</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>170</y>
+ <width>435</width>
+ <height>121</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>4</hsizetype>
+ <vsizetype>4</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><p align="center">
Copyright (C) 2004-2005 Savoir-faire Linux inc.<br><br>
-Laurielle LEA &lt;laurielle.lea@savoirfairelinux.com&gt;<br><br>
+Jean-Philippe Barrette-LaPierre &lt;jean-philippe.barrette-lapierre@savoirfairelinux.com&gt;<br>
+Laurielle LEA &lt;laurielle.lea@savoirfairelinux.com&gt;<br>
+Yannick Morin &lt;yannick.morin@savoirfairelinux.com&gt;<br>
+J&eacute;rome Oufella &lt;jerome.oufella@savoirfairelinux.com&gt;<br><br>
SFLPhone-0.4.1-pre1 is released under <br>the General Public License.<br>
For more information, see http://www.sflphone.org<br>
</p></string>
- </property>
- </widget>
+ </property>
</widget>
- <widget class="QWidget">
+ <widget class="QLabel">
<property name="name">
- <cstring>CodecsPage</cstring>
+ <cstring>pixmapLabel1</cstring>
</property>
- <attribute name="title">
- <string>About Savoir-faire Linux inc.</string>
- </attribute>
- <widget class="QLabel">
- <property name="name">
- <cstring>textLabel1</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>85</x>
- <y>126</y>
- <width>291</width>
- <height>131</height>
- </rect>
- </property>
- <property name="text">
- <string><p align="center">Website: http://www.savoirfairelinux.com<br><br>
+ <property name="geometry">
+ <rect>
+ <x>50</x>
+ <y>40</y>
+ <width>312</width>
+ <height>91</height>
+ </rect>
+ </property>
+ <property name="pixmap">
+ <pixmap>image0</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </widget>
+ <widget class="QWidget">
+ <property name="name">
+ <cstring>CodecsPage</cstring>
+ </property>
+ <attribute name="title">
+ <string>About Savoir-faire Linux inc.</string>
+ </attribute>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>textLabel1</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>85</x>
+ <y>126</y>
+ <width>291</width>
+ <height>131</height>
+ </rect>
+ </property>
+ <property name="text">
+ <string><p align="center">Website: http://www.savoirfairelinux.com<br><br>
5505, Saint-Laurent - bureau 3030<br>
Montreal, Quebec H2T 1S6</p></string>
- </property>
- </widget>
- <widget class="QLabel">
- <property name="name">
- <cstring>pixmapLabel2</cstring>
- </property>
- <property name="geometry">
- <rect>
- <x>130</x>
- <y>50</y>
- <width>173</width>
- <height>48</height>
- </rect>
- </property>
- <property name="pixmap">
- <pixmap>image1</pixmap>
- </property>
- <property name="scaledContents">
- <bool>true</bool>
- </property>
- </widget>
+ </property>
+ </widget>
+ <widget class="QLabel">
+ <property name="name">
+ <cstring>pixmapLabel2</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>130</x>
+ <y>50</y>
+ <width>173</width>
+ <height>48</height>
+ </rect>
+ </property>
+ <property name="pixmap">
+ <pixmap>image1</pixmap>
+ </property>
+ <property name="scaledContents">
+ <bool>true</bool>
+ </property>
</widget>
</widget>
- </vbox>
- </widget>
- </grid>
+ </widget>
+ </vbox>
+ </widget>
+ <widget class="QListBox">
+ <property name="name">
+ <cstring>Menu</cstring>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>11</x>
+ <y>11</y>
+ <width>100</width>
+ <height>484</height>
+ </rect>
+ </property>
+ <property name="sizePolicy">
+ <sizepolicy>
+ <hsizetype>0</hsizetype>
+ <vsizetype>7</vsizetype>
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="cursor">
+ <cursor>13</cursor>
+ </property>
+ <property name="currentItem">
+ <number>-1</number>
+ </property>
+ <property name="selectionMode">
+ <enum>Single</enum>
+ </property>
+ </widget>
</widget>
<images>
<image name="image0">
diff --git a/src/gui/official/ConfigurationPanel.ui.h b/src/gui/official/ConfigurationPanel.ui.h
index b1f0ae7af5..df4c4609b0 100644
--- a/src/gui/official/ConfigurationPanel.ui.h
+++ b/src/gui/official/ConfigurationPanel.ui.h
@@ -13,6 +13,7 @@
#include <qmessagebox.h>
#include <qstringlist.h>
+#include "globals.h"
#include "ConfigurationManager.hpp"
#include "DebugOutput.hpp"
#include "QjListBoxPixmap.hpp"
@@ -73,45 +74,6 @@ void ConfigurationPanel::init()
}
*/
- // Set position of the button group, with appropriate length
- //DriverChoice->setGeometry( QRect( 10, 10, 410, top + 30 ) );
-
- //ManagerImpl& manager = Manager::instance();
- // For signalisations tab
- /*
- fullName->setText(QString(manager.getConfigString(
-SIGNALISATION , FULL_NAME)));
- userPart->setText(QString(manager.getConfigString(SIGNALISATION,
-USER_PART)));
- username->setText(QString(manager.getConfigString(SIGNALISATION,
-AUTH_USER_NAME)));
- password->setText(QString(manager.getConfigString(SIGNALISATION, PASSWORD)));
- hostPart->setText(QString(manager.getConfigString(SIGNALISATION,
-HOST_PART)));
- sipproxy->setText(QString(manager.getConfigString(SIGNALISATION, PROXY)));
- autoregister->setChecked(manager.getConfigInt(SIGNALISATION,
-AUTO_REGISTER));
- playTones->setChecked(manager.getConfigInt(SIGNALISATION, PLAY_TONES));
- pulseLength->setValue(manager.getConfigInt(SIGNALISATION, PULSE_LENGTH));
- sendDTMFas->setCurrentItem(manager.getConfigInt(SIGNALISATION,
-SEND_DTMF_AS));
- STUNserver->setText(QString(manager.getConfigString(SIGNALISATION,
-STUN_SERVER)));
-((QRadioButton*)stunButtonGroup->find(manager.getConfigInt(SIGNALISATION,
-USE_STUN)))->setChecked(true);
-*/
-
-
- // For audio tab
- /*
-((QRadioButton*)DriverChoice->find(manager.getConfigInt(AUDIO,
-DRIVER_NAME)))->setChecked(true);
-
- codec1->setCurrentText(QString(manager.getConfigString(AUDIO, CODEC1)));
- codec2->setCurrentText(QString(manager.getConfigString(AUDIO, CODEC2)));
- codec3->setCurrentText(QString(manager.getConfigString(AUDIO, CODEC3)));
-*/
-
/*
ringsChoice->setCurrentText(QString(manager.getConfigString(AUDIO,
RING_CHOICE)));
@@ -154,89 +116,139 @@ RING_CHOICE)));
void
ConfigurationPanel::generate()
{
- DebugOutput::instance() << "ConfigurationPanel::generate()\n";
- int top = 0;
- std::list< AudioDevice > audio = ConfigurationManager::instance().getAudioDevices();
- std::list< AudioDevice >::iterator pos;
+ // For audio tab
+ codec1->setCurrentText(ConfigurationManager::instance()
+ .get(AUDIO_SECTION, AUDIO_CODEC1));
+ codec2->setCurrentText(ConfigurationManager::instance()
+ .get(AUDIO_SECTION, AUDIO_CODEC2));
+ codec3->setCurrentText(ConfigurationManager::instance()
+ .get(AUDIO_SECTION, AUDIO_CODEC3));
+
+ int top = 0;
+ std::list< AudioDevice > audio = ConfigurationManager::instance().getAudioDevices();
+ std::list< AudioDevice >::iterator pos;
- for (pos = audio.begin(); pos != audio.end(); pos++) {
- QString name = pos->description;
- DebugOutput::instance() <<
- QObject::tr("ConfigurationPanel::generate(): name: %1\n").arg(name);
+ for (pos = audio.begin(); pos != audio.end(); pos++) {
+ QString name = pos->description;
- // New radio button with found device name
- QRadioButton* device = new QRadioButton(DriverChoice);
- device->setGeometry( QRect( 10, 30 + top, 390, 21 ) );
- // Set label of radio button
- device->setText(name);
+ // New radio button with found device name
+ QRadioButton* device = new QRadioButton(DriverChoice);
+ device->setGeometry( QRect( 10, 30 + top, 390, 21 ) );
+ // Set label of radio button
+ device->setText(name);
- // Add tooltip for each one
- //QToolTip::add(device , name);
-
- top += 30;
- //if (ConfigurationManager::instance().(i)) {
- // device->setChecked(true);
- //}
+ top += 30;
+ if (ConfigurationManager::instance().get(AUDIO_SECTION,
+ AUDIO_DEFAULT_DEVICE) == pos->index) {
+ device->setChecked(true);
}
- // Set position of the button group, with appropriate length
- DriverChoice->setGeometry( QRect( 10, 10, 410, top + 30 ) );
+ }
+ // Set position of the button group, with appropriate length
+ DriverChoice->setGeometry( QRect( 10, 10, 410, top + 30 ) );
+
+
+ // For signalisations tab
+ fullName->setText(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_FULL_NAME));
+ userPart->setText(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_USER_PART));
+ username->setText(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_AUTH_USER_NAME));
+ password->setText(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_PASSWORD));
+ hostPart->setText(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_HOST_PART));
+ sipproxy->setText(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_PROXY));
+ autoregister->setChecked(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_AUTO_REGISTER));
+ playTones->setChecked(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_PLAY_TONES).toUInt());
+ pulseLength->setValue(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_PULSE_LENGTH).toUInt());
+ sendDTMFas->setCurrentItem(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_SEND_DTMF_AS).toUInt());
+ STUNserver->setText(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_STUN_SERVER));
+ ((QRadioButton*)stunButtonGroup->find(ConfigurationManager::instance()
+ .get(SIGNALISATION_SECTION,
+ SIGNALISATION_USE_STUN).toUInt()))->setChecked(true);
+
+
+
+ /*
+ ringsChoice->setCurrentText(QString(manager.getConfigString(AUDIO,
+RING_CHOICE)));
+ */
+
}
// For saving settings at application 'save'
void ConfigurationPanel::saveSlot()
{
- /*
- manager.setConfig("VoIPLink", "SIP.fullName",
- string(fullName->text().ascii()));
- manager.setConfig("VoIPLink", "SIP.userPart",
- string(userPart->text().ascii()));
- manager.setConfig("VoIPLink", "SIP.username",
- string(username->text().ascii()));
- manager.setConfig("VoIPLink", "SIP.password",
- string(password->text().ascii()));
- manager.setConfig("VoIPLink", "SIP.hostPart",
- string(hostPart->text().ascii()));
- manager.setConfig("VoIPLink", "SIP.proxy",
- string(sipproxy->text().ascii()));
- manager.setConfig("VoIPLink", "SIP.autoregister",
- autoregister->isChecked());
- manager.setConfig("VoIPLink", "DTMF.pulseLength",
- pulseLength->value());
- manager.setConfig("VoIPLink", "DTMF.playTones",
- playTones->isChecked());
- manager.setConfig("VoIPLink", "DTMF.sendDTMFas" ,
- sendDTMFas->currentItem());
- manager.setConfig("VoIPLink", "STUN.STUNserver",
- string(STUNserver->text().ascii()));
+ ConfigurationManager::instance().set("VoIPLink", "SIP.fullName",
+ fullName->text());
+ ConfigurationManager::instance().set("VoIPLink", "SIP.userPart",
+ userPart->text());
+ ConfigurationManager::instance().set("VoIPLink", "SIP.username",
+ username->text());
+ ConfigurationManager::instance().set("VoIPLink", "SIP.password",
+ password->text());
+ ConfigurationManager::instance().set("VoIPLink", "SIP.hostPart",
+ hostPart->text());
+ ConfigurationManager::instance().set("VoIPLink", "SIP.proxy",
+ sipproxy->text());
+ ConfigurationManager::instance().set("VoIPLink", "SIP.autoregister",
+ QString::number(autoregister->isChecked()));
+ ConfigurationManager::instance().set("VoIPLink", "DTMF.pulseLength",
+ QString::number(pulseLength->value()));
+ ConfigurationManager::instance().set("VoIPLink", "DTMF.playTones",
+ QString::number(playTones->isChecked()));
+ ConfigurationManager::instance().set("VoIPLink", "DTMF.sendDTMFas" ,
+ QString::number(sendDTMFas->currentItem()));
+ ConfigurationManager::instance().set("VoIPLink", "STUN.STUNserver",
+ STUNserver->text());
- manager.setConfig("Audio", "Codecs.codec1",
- string(codec1->currentText().ascii()));
- manager.setConfig("Audio", "Codecs.codec2",
- string(codec2->currentText().ascii()));
- manager.setConfig("Audio", "Codecs.codec3",
- string(codec3->currentText().ascii()));
+ ConfigurationManager::instance().set("Audio", "Codecs.codec1",
+ codec1->currentText());
+ ConfigurationManager::instance().set("Audio", "Codecs.codec2",
+ codec2->currentText());
+ ConfigurationManager::instance().set("Audio", "Codecs.codec3",
+ codec3->currentText());
if (ringsChoice->currentText() != NULL)
- manager.setConfig("Audio", "Rings.ringChoice",
- string(ringsChoice->currentText().ascii()));
+ ConfigurationManager::instance().set("Audio", "Rings.ringChoice",
+ ringsChoice->currentText());
- manager.setConfig("Preferences", "Themes.skinChoice",
- string(SkinChoice->currentText().ascii()));
- manager.setConfig("Preferences", "Options.zoneToneChoice",
- string(zoneToneChoice->currentText().ascii()));
- manager.setConfig("Preferences", "Options.confirmQuit",
- confirmationToQuit->isChecked());
- manager.setConfig("Preferences", "Options.checkedTray",
- checkedTray->isChecked());
+ ConfigurationManager::instance().set("Preferences", "Themes.skinChoice",
+ SkinChoice->currentText());
+ ConfigurationManager::instance().set("Preferences", "Options.zoneToneChoice",
+ zoneToneChoice->currentText());
+ ConfigurationManager::instance().set("Preferences", "Options.confirmQuit",
+ QString::number(confirmationToQuit->isChecked()));
+ ConfigurationManager::instance().set("Preferences", "Options.checkedTray",
+ QString::number(checkedTray->isChecked()));
- manager.setConfig("Preferences", "Options.voicemailNumber",
- string(voicemailNumber->text().ascii()));
- */
+ ConfigurationManager::instance().set("Preferences", "Options.voicemailNumber",
+ voicemailNumber->text());
#if 0
QMessageBox::information(this, "Save settings",
"You must restart SFLPhone",
QMessageBox::Yes);
#endif
+
+ ConfigurationManager::instance().save();
}
// Handle tab view according to current item of listbox
diff --git a/src/gui/official/Request.cpp b/src/gui/official/Request.cpp
index 24ef1e232b..4d981e6873 100644
--- a/src/gui/official/Request.cpp
+++ b/src/gui/official/Request.cpp
@@ -19,6 +19,7 @@
*/
#include <qobject.h>
+#include <Url.hpp>
#include <sstream>
#include "globals.h"
@@ -43,7 +44,9 @@ Request::parseArgs(const QString &message)
std::list< QString > args;
while(stream.good()) {
stream >> s;
- args.push_back(s);
+ QString qs(s);
+ Url::decode(qs);
+ args.push_back(qs);
}
return args;
diff --git a/src/gui/official/SFLRequest.cpp b/src/gui/official/SFLRequest.cpp
index c22d0c154f..c9121fc747 100644
--- a/src/gui/official/SFLRequest.cpp
+++ b/src/gui/official/SFLRequest.cpp
@@ -283,8 +283,8 @@ CallRequest::onSuccess(Account,
ConfigGetAllRequest::ConfigGetAllRequest(const QString &sequenceId,
- const QString &command,
- const std::list< QString > &args)
+ const QString &command,
+ const std::list< QString > &args)
: Request(sequenceId, command, args)
{}
@@ -298,13 +298,10 @@ ConfigGetAllRequest::onError(const QString &code, const QString &message)
}
void
-ConfigGetAllRequest::onEntry(const QString &code, const QString &message)
+ConfigGetAllRequest::onEntry(const QString &, const QString &message)
{
- DebugOutput::instance() << QObject::tr("ConfigGetAllRequest entry: (%1) %1\n")
- .arg(code)
- .arg(message);
std::list< QString > args = Request::parseArgs(message);
- if(args.size() >= 5) {
+ if(args.size() >= 4) {
QString section, variable, type, def, val;
section = *args.begin();
args.pop_front();
@@ -312,19 +309,18 @@ ConfigGetAllRequest::onEntry(const QString &code, const QString &message)
args.pop_front();
type = *args.begin();
args.pop_front();
- def = *args.begin();
- args.pop_front();
val = *args.begin();
+ args.pop_front();
+ if(args.size() >= 1) {
+ def = *args.begin();
+ }
ConfigurationManager::instance().add(ConfigEntry(section, variable, type, def, val));
}
}
void
-ConfigGetAllRequest::onSuccess(const QString &code, const QString &message)
+ConfigGetAllRequest::onSuccess(const QString &, const QString &)
{
- DebugOutput::instance() << QObject::tr("ConfigGetAllRequest success: (%1) %1\n")
- .arg(code)
- .arg(message);
ConfigurationManager::instance().complete();
}
diff --git a/src/gui/official/Url.cpp b/src/gui/official/Url.cpp
new file mode 100644
index 0000000000..e808eb24de
--- /dev/null
+++ b/src/gui/official/Url.cpp
@@ -0,0 +1,40 @@
+#include <qurl.h>
+
+#include "Url.hpp"
+
+static uchar hex_to_int( uchar c )
+{
+ if ( c >= 'A' && c <= 'F' )
+ return c - 'A' + 10;
+ if ( c >= 'a' && c <= 'f')
+ return c - 'a' + 10;
+ if ( c >= '0' && c <= '9')
+ return c - '0';
+ return 0;
+}
+
+void Url::decode( QString& url )
+{
+ int oldlen = url.length();
+ if ( !oldlen )
+ return;
+
+ int newlen = 0;
+
+ QString newUrl;
+
+ int i = 0;
+ while ( i < oldlen ) {
+ ushort c = url[ i++ ].unicode();
+ if ( c == '%' ) {
+ c = hex_to_int( url[ i ].unicode() ) * 16 + hex_to_int( url[ i + 1 ].unicode() );
+ i += 2;
+ }
+ else if ( c == '+' ) {
+ c = ' ';
+ }
+ newUrl [ newlen++ ] = c;
+ }
+
+ url = newUrl;
+}
diff --git a/src/gui/official/Url.hpp b/src/gui/official/Url.hpp
new file mode 100644
index 0000000000..88a7424565
--- /dev/null
+++ b/src/gui/official/Url.hpp
@@ -0,0 +1,13 @@
+
+#ifndef __URL_HPP__
+#define __URL_HPP__
+
+#include <qstring.h>
+
+namespace Url
+{
+ void decode(QString &url);
+}
+
+#endif
+
diff --git a/src/gui/official/globals.h b/src/gui/official/globals.h
index 5744341997..1b39337ca6 100644
--- a/src/gui/official/globals.h
+++ b/src/gui/official/globals.h
@@ -7,5 +7,25 @@
#define PROGNAME "SFLPhone"
#define VERSION "0.4.2"
+#define AUDIO_SECTION "Audio"
+#define AUDIO_DEFAULT_DEVICE "Drivers.driverName"
+#define AUDIO_CODEC1 "Codecs.codec1"
+#define AUDIO_CODEC2 "Codecs.codec2"
+#define AUDIO_CODEC3 "Codecs.codec3"
+
+#define SIGNALISATION_SECTION "VoIPLink"
+#define SIGNALISATION_FULL_NAME "SIP.fullName"
+#define SIGNALISATION_USER_PART "SIP.userPart"
+#define SIGNALISATION_AUTH_USER_NAME "SIP.username"
+#define SIGNALISATION_PASSWORD "SIP.password"
+#define SIGNALISATION_HOST_PART "SIP.hostPart"
+#define SIGNALISATION_PROXY "SIP.proxy"
+#define SIGNALISATION_AUTO_REGISTER "SIP.autoregister"
+#define SIGNALISATION_PLAY_TONES "DTMF.playTones"
+#define SIGNALISATION_PULSE_LENGTH "DTMF.pulseLength"
+#define SIGNALISATION_SEND_DTMF_AS "DTMF.sendDTMFas"
+#define SIGNALISATION_STUN_SERVER "STUN.STUNserver"
+#define SIGNALISATION_USE_STUN "STUN.useStun"
+
#endif
diff --git a/src/gui/official/sflphone.pro b/src/gui/official/sflphone.pro
index c3eab02d7f..af7c8eec56 100644
--- a/src/gui/official/sflphone.pro
+++ b/src/gui/official/sflphone.pro
@@ -138,6 +138,7 @@ HEADERS += Account.hpp \
TCPSessionIO.hpp \
TCPSessionIOCreator.hpp \
TransparentWidget.hpp \
+ Url.hpp \
VolumeControl.hpp
SOURCES += Account.cpp \
Call.cpp \
@@ -164,5 +165,6 @@ SOURCES += Account.cpp \
TCPSessionIO.cpp \
TCPSessionIOCreator.cpp \
TransparentWidget.cpp \
+ Url.cpp \
VolumeControl.cpp
RESOURCES += sflphone.qrc
--
GitLab