<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16203] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16203">16203</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-07 17:00:34 -0600 (Thu, 07 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start doing the accounts configurations. It does not work yet, only dialogs are designed.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommFSCommpro">freeswitch/trunk/fscomm/FSComm.pro</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogcpp">freeswitch/trunk/fscomm/preferences/prefdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogh">freeswitch/trunk/fscomm/preferences/prefdialog.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogui">freeswitch/trunk/fscomm/preferences/prefdialog.ui</a></li>
<li><a href="#freeswitchtrunkfscommresourcesqrc">freeswitch/trunk/fscomm/resources.qrc</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconfaccountconfxml">freeswitch/trunk/fscomm/conf/account.conf.xml</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogcpp">freeswitch/trunk/fscomm/preferences/accountdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogh">freeswitch/trunk/fscomm/preferences/accountdialog.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesaccountdialogui">freeswitch/trunk/fscomm/preferences/accountdialog.ui</a></li>
<li><a href="#freeswitchtrunkfscommresourcespref_accountsjpg">freeswitch/trunk/fscomm/resources/pref_accounts.jpg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommFSCommpro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/FSComm.pro (16202 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/FSComm.pro 2010-01-07 22:04:32 UTC (rev 16202)
+++ freeswitch/trunk/fscomm/FSComm.pro 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -28,18 +28,22 @@
</span><span class="cx"> mod_qsettings/mod_qsettings.cpp \
</span><span class="cx"> preferences/prefdialog.cpp \
</span><span class="cx"> preferences/prefportaudio.cpp \
</span><del>- preferences/prefsofia.cpp
</del><ins>+ preferences/prefsofia.cpp \
+ preferences/accountdialog.cpp
</ins><span class="cx"> HEADERS += mainwindow.h \
</span><span class="cx"> fshost.h \
</span><span class="cx"> call.h \
</span><span class="cx"> mod_qsettings/mod_qsettings.h \
</span><span class="cx"> preferences/prefdialog.h \
</span><span class="cx"> preferences/prefportaudio.h \
</span><del>- preferences/prefsofia.h
</del><ins>+ preferences/prefsofia.h \
+ preferences/accountdialog.h
</ins><span class="cx"> FORMS += mainwindow.ui \
</span><del>- preferences/prefdialog.ui
</del><ins>+ preferences/prefdialog.ui \
+ preferences/accountdialog.ui
</ins><span class="cx"> RESOURCES += resources.qrc
</span><span class="cx"> OTHER_FILES += conf/portaudio.conf.xml \
</span><span class="cx"> conf/event_socket.conf.xml \
</span><span class="cx"> conf/freeswitch.xml \
</span><del>- conf/sofia.conf.xml
</del><ins>+ conf/sofia.conf.xml \
+ conf/account.conf.xml
</ins></span></pre></div>
<a id="freeswitchtrunkfscommconfaccountconfxml"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/fscomm/conf/account.conf.xml (0 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/account.conf.xml (rev 0)
+++ freeswitch/trunk/fscomm/conf/account.conf.xml 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -0,0 +1,17 @@
</span><ins>+<gateway name="${name}">
+ <param name="username" value="${username}"/>
+ <param name="realm" value="${realm}"/>
+ <param name="from-user" value="${from-user}"/>
+ <param name="from-domain" value="${from-domain}"/>
+ <param name="password" value="${password}"/>
+ <param name="extension" value="${extension}"/>
+ <param name="proxy" value="${proxy}"/>
+ <param name="register-proxy" value="${register-proxy}"/>
+ <param name="expire-seconds" value="${expire-seconds}"/>
+ <param name="register" value="${register}"/>
+ <param name="register-transport" value="${register-transport}"/>
+ <param name="retry-seconds" value="${retry-seconds}"/>
+ <param name="caller-id-in-from" value="${caller-id-in-from}"/>
+ <param name="contact-params" value="${contact-params}"/>
+ <param name="ping" value="${ping}"/>
+</gateway>
</ins></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (0 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp (rev 0)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -0,0 +1,26 @@
</span><ins>+#include "accountdialog.h"
+#include "ui_accountdialog.h"
+
+AccountDialog::AccountDialog(QWidget *parent) :
+ QDialog(parent),
+ ui(new Ui::AccountDialog)
+{
+ ui->setupUi(this);
+}
+
+AccountDialog::~AccountDialog()
+{
+ delete ui;
+}
+
+void AccountDialog::changeEvent(QEvent *e)
+{
+ QDialog::changeEvent(e);
+ switch (e->type()) {
+ case QEvent::LanguageChange:
+ ui->retranslateUi(this);
+ break;
+ default:
+ break;
+ }
+}
</ins></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogh"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/fscomm/preferences/accountdialog.h (0 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.h (rev 0)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+#ifndef ACCOUNTDIALOG_H
+#define ACCOUNTDIALOG_H
+
+#include <QDialog>
+
+namespace Ui {
+ class AccountDialog;
+}
+
+class AccountDialog : public QDialog {
+ Q_OBJECT
+public:
+ AccountDialog(QWidget *parent = 0);
+ ~AccountDialog();
+
+protected:
+ void changeEvent(QEvent *e);
+
+private:
+ Ui::AccountDialog *ui;
+};
+
+#endif // ACCOUNTDIALOG_H
</ins></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogui"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/fscomm/preferences/accountdialog.ui (0 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.ui (rev 0)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.ui 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -0,0 +1,272 @@
</span><ins>+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>AccountDialog</class>
+ <widget class="QDialog" name="AccountDialog">
+ <property name="windowModality">
+ <enum>Qt::WindowModal</enum>
+ </property>
+ <property name="geometry">
+ <rect>
+ <x>0</x>
+ <y>0</y>
+ <width>495</width>
+ <height>573</height>
+ </rect>
+ </property>
+ <property name="windowTitle">
+ <string>Account</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>name</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="sofiaGwNameEdit"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>username</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="sofiaGwUsernameEdit"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>realm</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="sofiaGwRealmEdit"/>
+ </item>
+ <item row="3" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>from-user</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QLineEdit" name="sofiaGwFromUserEdit"/>
+ </item>
+ <item row="4" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>from-domain</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="1">
+ <widget class="QLineEdit" name="sofiaGwFromDomainEdit"/>
+ </item>
+ <item row="5" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>password</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QLineEdit" name="sofiaGwPasswordEdit"/>
+ </item>
+ <item row="6" column="0">
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>extension</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
+ <widget class="QLineEdit" name="sofiaGwExtensionEdit"/>
+ </item>
+ <item row="7" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>proxy</string>
+ </property>
+ </widget>
+ </item>
+ <item row="7" column="1">
+ <widget class="QLineEdit" name="sofiaGwProxyEdit"/>
+ </item>
+ <item row="8" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>register-proxy</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QLineEdit" name="sofiaGwRegisterProxyEdit"/>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>expire-seconds</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <widget class="QSpinBox" name="sofiaGwExpireSecondsSpin">
+ <property name="value">
+ <number>60</number>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="0">
+ <widget class="QLabel" name="label_11">
+ <property name="text">
+ <string>register</string>
+ </property>
+ </widget>
+ </item>
+ <item row="10" column="1">
+ <widget class="QComboBox" name="sofiaGwRegisterCombo">
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="11" column="0">
+ <widget class="QLabel" name="label_12">
+ <property name="text">
+ <string>register-transport</string>
+ </property>
+ </widget>
+ </item>
+ <item row="11" column="1">
+ <widget class="QComboBox" name="sofiaGwRegisterTransportCombo">
+ <item>
+ <property name="text">
+ <string>udp</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>tcp</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="12" column="0">
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string>retry-seconds</string>
+ </property>
+ </widget>
+ </item>
+ <item row="12" column="1">
+ <widget class="QSpinBox" name="sofiaGwRetrySecondsSpin">
+ <property name="value">
+ <number>30</number>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="0">
+ <widget class="QLabel" name="label_15">
+ <property name="text">
+ <string>contact-params</string>
+ </property>
+ </widget>
+ </item>
+ <item row="13" column="1">
+ <widget class="QLineEdit" name="sofiaGwContactParamsEdit"/>
+ </item>
+ <item row="14" column="0">
+ <widget class="QLabel" name="label_14">
+ <property name="text">
+ <string>caller-id-in-from</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="0">
+ <widget class="QLabel" name="label_16">
+ <property name="text">
+ <string>ping</string>
+ </property>
+ </widget>
+ </item>
+ <item row="15" column="1">
+ <widget class="QSpinBox" name="sofiaGwPingSpin">
+ <property name="value">
+ <number>25</number>
+ </property>
+ </widget>
+ </item>
+ <item row="16" column="1">
+ <widget class="QDialogButtonBox" name="buttonBox">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="standardButtons">
+ <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+ </property>
+ </widget>
+ </item>
+ <item row="14" column="1">
+ <widget class="QComboBox" name="sofiaGwCallerIdInFromCombo">
+ <item>
+ <property name="text">
+ <string>false</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>true</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <resources/>
+ <connections>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>accepted()</signal>
+ <receiver>AccountDialog</receiver>
+ <slot>accept()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>248</x>
+ <y>254</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>157</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ <connection>
+ <sender>buttonBox</sender>
+ <signal>rejected()</signal>
+ <receiver>AccountDialog</receiver>
+ <slot>reject()</slot>
+ <hints>
+ <hint type="sourcelabel">
+ <x>316</x>
+ <y>260</y>
+ </hint>
+ <hint type="destinationlabel">
+ <x>286</x>
+ <y>274</y>
+ </hint>
+ </hints>
+ </connection>
+ </connections>
+</ui>
</ins></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.cpp (16202 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-01-07 22:04:32 UTC (rev 16202)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.cpp 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> #include "ui_prefdialog.h"
</span><span class="cx"> #include "prefportaudio.h"
</span><span class="cx"> #include "prefsofia.h"
</span><ins>+#include "accountdialog.h"
</ins><span class="cx">
</span><span class="cx"> PrefDialog::PrefDialog(QWidget *parent) :
</span><span class="cx"> QDialog(parent),
</span><span class="lines">@@ -11,7 +12,9 @@
</span><span class="cx"> ui->setupUi(this);
</span><span class="cx"> _settings = new QSettings();
</span><span class="cx"> connect(this, SIGNAL(accepted()), this, SLOT(writeConfig()));
</span><ins>+ connect(ui->sofiaGwAddBtn, SIGNAL(clicked()), this, SLOT(addAccountBtnClicked()));
</ins><span class="cx">
</span><ins>+ _accDlg = NULL;
</ins><span class="cx"> _mod_portaudio = new PrefPortaudio(ui, this);
</span><span class="cx"> _mod_sofia = new PrefSofia(ui, this);
</span><span class="cx"> readConfig();
</span><span class="lines">@@ -22,6 +25,16 @@
</span><span class="cx"> delete ui;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefDialog::addAccountBtnClicked()
+{
+ if (!_accDlg)
+ _accDlg = new AccountDialog();
+
+ _accDlg->show();
+ _accDlg->raise();
+ _accDlg->activateWindow();
+}
+
</ins><span class="cx"> void PrefDialog::writeConfig()
</span><span class="cx"> {
</span><span class="cx"> _mod_portaudio->writeConfig();
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.h (16202 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.h 2010-01-07 22:04:32 UTC (rev 16202)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.h 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -8,6 +8,7 @@
</span><span class="cx">
</span><span class="cx"> class PrefPortaudio;
</span><span class="cx"> class PrefSofia;
</span><ins>+class AccountDialog;
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class PrefDialog;
</span><span class="lines">@@ -23,11 +24,13 @@
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><ins>+ void addAccountBtnClicked();
</ins><span class="cx"> void writeConfig();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> void readConfig();
</span><span class="cx"> QSettings *_settings;
</span><ins>+ AccountDialog *_accDlg;
</ins><span class="cx"> Ui::PrefDialog *ui;
</span><span class="cx"> PrefPortaudio *_mod_portaudio;
</span><span class="cx"> PrefSofia *_mod_sofia;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.ui (16202 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-07 22:04:32 UTC (rev 16202)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -66,6 +66,15 @@
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span><span class="cx"> <property name="text">
</span><ins>+ <string>Accounts</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../resources.qrc">
+ <normaloff>:/images/pref_accounts.jpg</normaloff>:/images/pref_accounts.jpg</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
</ins><span class="cx"> <string>Sofia</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><span class="lines">@@ -87,9 +96,9 @@
</span><span class="cx"> <item row="0" column="1">
</span><span class="cx"> <widget class="QStackedWidget" name="stackedWidget">
</span><span class="cx"> <property name="currentIndex">
</span><del>- <number>0</number>
</del><ins>+ <number>1</number>
</ins><span class="cx"> </property>
</span><del>- <widget class="QWidget" name="page_3">
</del><ins>+ <widget class="QWidget" name="generalPage">
</ins><span class="cx"> <layout class="QVBoxLayout" name="verticalLayout_3">
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QGroupBox" name="groupBox_5">
</span><span class="lines">@@ -122,7 +131,71 @@
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><del>- <widget class="QWidget" name="page">
</del><ins>+ <widget class="QWidget" name="accountsPage">
+ <layout class="QHBoxLayout" name="horizontalLayout_5">
+ <item>
+ <widget class="QTableWidget" name="sofiaGwListWidget">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <column>
+ <property name="text">
+ <string>Enabled</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Name</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Username</string>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_7">
+ <item>
+ <widget class="QPushButton" name="sofiaGwAddBtn">
+ <property name="text">
+ <string>Add</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="sofiaGwRemBtn">
+ <property name="text">
+ <string>Remove</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="sofiaGwEditBtn">
+ <property name="text">
+ <string>Edit</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="sofiaPage">
</ins><span class="cx"> <layout class="QVBoxLayout" name="verticalLayout_2">
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QTabWidget" name="tabWidget">
</span><span class="lines">@@ -716,7 +789,7 @@
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><del>- <widget class="QWidget" name="page_2">
</del><ins>+ <widget class="QWidget" name="portaudioPage">
</ins><span class="cx"> <layout class="QVBoxLayout" name="verticalLayout">
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QGroupBox" name="groupBox_3">
</span></span></pre></div>
<a id="freeswitchtrunkfscommresourcespref_accountsjpg"></a>
<div class="binary"><h4>Added: freeswitch/trunk/fscomm/resources/pref_accounts.jpg</h4>
<pre class="diff"><span>
<span class="cx">(Binary files differ)
</span></span></pre></div>
<span class="cx">Property changes on: freeswitch/trunk/fscomm/resources/pref_accounts.jpg
</span><span class="cx">___________________________________________________________________
</span><span class="cx">Name: svn:mime-type
</span><span class="cx"> + application/octet-stream
</span><a id="freeswitchtrunkfscommresourcesqrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/resources.qrc (16202 => 16203)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/resources.qrc 2010-01-07 22:04:32 UTC (rev 16202)
+++ freeswitch/trunk/fscomm/resources.qrc 2010-01-07 23:00:34 UTC (rev 16203)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> <file alias="pref_sip.png">resources/pref_sip.png</file>
</span><span class="cx"> <file alias="pref_audio.gif">resources/pref_audio.gif</file>
</span><span class="cx"> <file alias="pref_general.jpg">resources/pref_general.jpg</file>
</span><ins>+ <file alias="pref_accounts.jpg">resources/pref_accounts.jpg</file>
</ins><span class="cx"> </qresource>
</span><span class="cx"> <qresource prefix="/confs">
</span><span class="cx"> <file alias="freeswitch.xml">conf/freeswitch.xml</file>
</span><span class="lines">@@ -11,6 +12,7 @@
</span><span class="cx"> <file alias="event_socket.conf.xml">conf/event_socket.conf.xml</file>
</span><span class="cx"> <file alias="portaudio.conf.xml">conf/portaudio.conf.xml</file>
</span><span class="cx"> <file alias="sofia.conf.xml">conf/sofia.conf.xml</file>
</span><ins>+ <file alias="account.conf.xml">conf/account.conf.xml</file>
</ins><span class="cx"> </qresource>
</span><span class="cx"> <qresource prefix="/sounds">
</span><span class="cx"> <file alias="test.wav">resources/test.wav</file>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>