<!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][16164] </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=16164">16164</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-05 16:16:46 -0600 (Tue, 05 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Start persisting settings. Portaudio devices are persisted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconfportaudioconfxml">freeswitch/trunk/fscomm/conf/portaudio.conf.xml</a></li>
<li><a href="#freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp">freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp</a></li>
<li><a href="#freeswitchtrunkfscommprefdialogcpp">freeswitch/trunk/fscomm/prefdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommprefdialogh">freeswitch/trunk/fscomm/prefdialog.h</a></li>
<li><a href="#freeswitchtrunkfscommprefdialogui">freeswitch/trunk/fscomm/prefdialog.ui</a></li>
<li><a href="#freeswitchtrunkfscommresourcesqrc">freeswitch/trunk/fscomm/resources.qrc</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommresourcespref_generaljpg">freeswitch/trunk/fscomm/resources/pref_general.jpg</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommconfportaudioconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/portaudio.conf.xml (16163 => 16164)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/portaudio.conf.xml 2010-01-05 20:54:45 UTC (rev 16163)
+++ freeswitch/trunk/fscomm/conf/portaudio.conf.xml 2010-01-05 22:16:46 UTC (rev 16164)
</span><span class="lines">@@ -8,11 +8,11 @@
</span><span class="cx"> <!--<param name="ringdev" value="${ringdev}"/>-->
</span><span class="cx"> <param name="ring-file" value="${ring-file}"/>
</span><span class="cx"> <param name="ring-interval" value="${ring-interval}"/>
</span><del>- <param name="hold-file" value="$${hold_music}"/>
</del><ins>+ <param name="hold-file" value="${hold-file}"/>
</ins><span class="cx"> <!--<param name="timer-name" value="soft"/>-->
</span><span class="cx"> <param name="dialplan" value="XML"/>
</span><del>- <param name="cid-name" value="$${outbound_caller_name}"/>
- <param name="cid-num" value="$${outbound_caller_number}"/>
</del><ins>+ <param name="cid-name" value="${cid-name}"/>
+ <param name="cid-num" value="${cid-num}"/>
</ins><span class="cx"> <param name="sample-rate" value="48000"/>
</span><span class="cx"> <param name="codec-ms" value="10"/>
</span><span class="cx"> </settings>
</span></span></pre></div>
<a id="freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16163 => 16164)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-05 20:54:45 UTC (rev 16163)
+++ freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-05 22:16:46 UTC (rev 16164)
</span><span class="lines">@@ -66,12 +66,15 @@
</span><span class="cx"> /* Open template file and expand all strings based on QSettings */
</span><span class="cx"> QByteArray tmplContents(tmplFile.readAll());
</span><span class="cx"> tmplFile.close();
</span><del>- _settings->beginGroup("FreeSIWTCH/conf");
</del><ins>+
+ _settings->beginGroup("FreeSWITCH/conf");
</ins><span class="cx"> _settings->beginGroup(tmpl);
</span><span class="cx"> foreach(QString k, _settings->childKeys())
</span><span class="cx"> {
</span><span class="cx"> switch_event_add_header_string(e, SWITCH_STACK_BOTTOM, k.toAscii().constData(), _settings->value(k).toByteArray().constData());
</span><span class="cx"> }
</span><ins>+ _settings->endGroup();
+ _settings->endGroup();
</ins><span class="cx">
</span><span class="cx"> char *res = switch_event_expand_headers(e, tmplContents.data());
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Template %s as follows:\n%s", tmpl.toAscii().constData(), res);
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefdialog.cpp (16163 => 16164)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefdialog.cpp 2010-01-05 20:54:45 UTC (rev 16163)
+++ freeswitch/trunk/fscomm/prefdialog.cpp 2010-01-05 22:16:46 UTC (rev 16164)
</span><span class="lines">@@ -7,6 +7,8 @@
</span><span class="cx"> ui(new Ui::PrefDialog)
</span><span class="cx"> {
</span><span class="cx"> ui->setupUi(this);
</span><ins>+ _settings = new QSettings();
+ connect(this, SIGNAL(accepted()), this, SLOT(configAccepted()));
</ins><span class="cx"> getPaDevlist();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -15,6 +17,25 @@
</span><span class="cx"> delete ui;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefDialog::configAccepted()
+{
+ _settings->beginGroup("FreeSWITCH/conf");
+
+ _settings->beginGroup("portaudio.conf");
+ _settings->setValue("cid-name", ui->PaCallerIdNameEdit->text());
+ _settings->setValue("cid-num", ui->PaCallerIdNumEdit->text());
+ _settings->setValue("indev", ui->PaIndevCombo->currentIndex());
+ _settings->setValue("outdev", ui->PaOutdevCombo->currentIndex());
+ _settings->setValue("ringdev", ui->PaRingdevCombo->currentIndex());
+ _settings->setValue("ring-file", ui->PaRingFileEdit->text());
+ _settings->setValue("ring-interval", ui->PaRingIntervalSpin->value());
+ _settings->setValue("hold-file", ui->PaHoldFileEdit->text());
+ _settings->endGroup();
+
+ _settings->endGroup();
+
+}
+
</ins><span class="cx"> void PrefDialog::getPaDevlist()
</span><span class="cx"> {
</span><span class="cx"> QString result;
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefdialog.h (16163 => 16164)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefdialog.h 2010-01-05 20:54:45 UTC (rev 16163)
+++ freeswitch/trunk/fscomm/prefdialog.h 2010-01-05 22:16:46 UTC (rev 16164)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx">
</span><span class="cx"> #include <QDialog>
</span><span class="cx"> #include <QDomDocument>
</span><ins>+#include <QSettings>
</ins><span class="cx"> #include <fshost.h>
</span><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="lines">@@ -18,10 +19,14 @@
</span><span class="cx"> protected:
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><ins>+private slots:
+ void configAccepted();
+
</ins><span class="cx"> private:
</span><span class="cx"> void getPaDevlist(void);
</span><span class="cx"> Ui::PrefDialog *ui;
</span><span class="cx"> QDomDocument _xmlPaDevList;
</span><ins>+ QSettings *_settings;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // PREFDIALOG_H
</span></span></pre></div>
<a id="freeswitchtrunkfscommprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/prefdialog.ui (16163 => 16164)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/prefdialog.ui 2010-01-05 20:54:45 UTC (rev 16163)
+++ freeswitch/trunk/fscomm/prefdialog.ui 2010-01-05 22:16:46 UTC (rev 16164)
</span><span class="lines">@@ -6,317 +6,301 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>477</width>
- <height>356</height>
</del><ins>+ <width>661</width>
+ <height>437</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>Preferences</string>
</span><span class="cx"> </property>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
</del><ins>+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QListWidget" name="listSections">
+ <property name="minimumSize">
+ <size>
+ <width>120</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="maximumSize">
+ <size>
+ <width>120</width>
+ <height>16777215</height>
+ </size>
+ </property>
+ <property name="showDropIndicator" stdset="0">
+ <bool>false</bool>
+ </property>
+ <property name="dragDropMode">
+ <enum>QAbstractItemView::NoDragDrop</enum>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>96</width>
+ <height>84</height>
+ </size>
+ </property>
+ <property name="movement">
+ <enum>QListView::Static</enum>
+ </property>
+ <property name="flow">
+ <enum>QListView::LeftToRight</enum>
+ </property>
+ <property name="isWrapping" stdset="0">
+ <bool>true</bool>
+ </property>
+ <property name="spacing">
+ <number>12</number>
+ </property>
+ <property name="viewMode">
+ <enum>QListView::IconMode</enum>
+ </property>
</ins><span class="cx"> <item>
</span><del>- <widget class="QListWidget" name="listSections">
- <property name="minimumSize">
- <size>
- <width>120</width>
- <height>0</height>
- </size>
- </property>
- <property name="maximumSize">
- <size>
- <width>120</width>
- <height>16777215</height>
- </size>
- </property>
- <property name="showDropIndicator" stdset="0">
- <bool>false</bool>
- </property>
- <property name="dragDropMode">
- <enum>QAbstractItemView::NoDragDrop</enum>
- </property>
- <property name="iconSize">
- <size>
- <width>96</width>
- <height>84</height>
- </size>
- </property>
- <property name="movement">
- <enum>QListView::Static</enum>
- </property>
- <property name="flow">
- <enum>QListView::LeftToRight</enum>
- </property>
- <property name="isWrapping" stdset="0">
- <bool>true</bool>
- </property>
- <property name="spacing">
- <number>12</number>
- </property>
- <property name="viewMode">
- <enum>QListView::IconMode</enum>
- </property>
</del><ins>+ <property name="text">
+ <string>Sofia</string>
+ </property>
+ <property name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/images/pref_sip.png</normaloff>:/images/pref_sip.png</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>PortAudio</string>
+ </property>
+ <property name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/images/pref_audio.gif</normaloff>:/images/pref_audio.gif</iconset>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>General</string>
+ </property>
+ <property name="icon">
+ <iconset resource="resources.qrc">
+ <normaloff>:/images/pref_general.jpg</normaloff>:/images/pref_general.jpg</iconset>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QStackedWidget" name="stackedWidget">
+ <property name="currentIndex">
+ <number>1</number>
+ </property>
+ <widget class="QWidget" name="page">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
</ins><span class="cx"> <item>
</span><del>- <property name="text">
- <string>Sofia</string>
- </property>
- <property name="icon">
- <iconset resource="resources.qrc">
- <normaloff>:/images/pref_sip.png</normaloff>:/images/pref_sip.png</iconset>
- </property>
</del><ins>+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Global Settings</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>log-level</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QSpinBox" name="logLevelSpin"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>auto-restart</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="autoRestartCombo"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>debug-presence</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QSpinBox" name="debugPresenceSpin"/>
+ </item>
+ </layout>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <property name="text">
- <string>PortAudio</string>
- </property>
- <property name="icon">
- <iconset resource="resources.qrc">
- <normaloff>:/images/pref_audio.gif</normaloff>:/images/pref_audio.gif</iconset>
- </property>
</del><ins>+ <widget class="QGroupBox" name="groupBox_2">
+ <property name="title">
+ <string>Softphone Profile</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>user-agent-string</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="userAgentStringEdit"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>debug</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="debugSpin"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_6">
+ <property name="text">
+ <string>sip-trace</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="sipTraceCombo"/>
+ </item>
+ </layout>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- </widget>
- </item>
- <item>
- <widget class="QStackedWidget" name="stackedWidget">
- <property name="currentIndex">
- <number>1</number>
- </property>
- <widget class="QWidget" name="page">
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <widget class="QGroupBox" name="groupBox">
- <property name="title">
- <string>Global Settings</string>
- </property>
- <layout class="QFormLayout" name="formLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>log-level</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QSpinBox" name="spinBox"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>auto-restart</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="comboBox"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>debug-presence</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QSpinBox" name="spinBox_2"/>
- </item>
- </layout>
- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_2">
- <property name="title">
- <string>Softphone Profile</string>
- </property>
- <layout class="QFormLayout" name="formLayout_2">
- <item row="0" column="0">
- <widget class="QLabel" name="label_4">
- <property name="text">
- <string>user-agent-string</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="lineEdit"/>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_5">
- <property name="text">
- <string>debug</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_3"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_6">
- <property name="text">
- <string>sip-trace</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="comboBox_2"/>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- <widget class="QWidget" name="page_2">
- <layout class="QVBoxLayout" name="verticalLayout">
- <item>
- <widget class="QGroupBox" name="groupBox_3">
- <property name="title">
- <string>Devices</string>
- </property>
</del><ins>+ </layout>
+ </widget>
+ <widget class="QWidget" name="page_2">
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Devices</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_3">
+ <item row="0" column="0">
</ins><span class="cx"> <widget class="QLabel" name="label_7">
</span><del>- <property name="geometry">
- <rect>
- <x>72</x>
- <y>34</y>
- <width>34</width>
- <height>17</height>
- </rect>
- </property>
</del><span class="cx"> <property name="text">
</span><span class="cx"> <string>indev</string>
</span><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><del>- <widget class="QComboBox" name="PaIndevCombo">
- <property name="geometry">
- <rect>
- <x>111</x>
- <y>32</y>
- <width>111</width>
- <height>26</height>
- </rect>
</del><ins>+ </item>
+ <item row="0" column="1">
+ <widget class="QComboBox" name="PaIndevCombo"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>outdev</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><del>- <widget class="QLabel" name="label_8">
- <property name="geometry">
- <rect>
- <x>63</x>
- <y>64</y>
- <width>43</width>
- <height>17</height>
- </rect>
</del><ins>+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="PaOutdevCombo"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_9">
+ <property name="text">
+ <string>rindgev</string>
</ins><span class="cx"> </property>
</span><ins>+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="PaRingdevCombo"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="groupBox_4">
+ <property name="title">
+ <string>Files</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_10">
</ins><span class="cx"> <property name="text">
</span><del>- <string>outdev</string>
</del><ins>+ <string>ring-file</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><del>- <widget class="QComboBox" name="PaOutdevCombo">
- <property name="geometry">
- <rect>
- <x>111</x>
- <y>62</y>
- <width>111</width>
- <height>26</height>
- </rect>
</del><ins>+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="PaRingFileEdit">
+ <property name="text">
+ <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><del>- <widget class="QLabel" name="label_9">
- <property name="geometry">
- <rect>
- <x>59</x>
- <y>94</y>
- <width>47</width>
- <height>17</height>
- </rect>
</del><ins>+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_12">
+ <property name="text">
+ <string>ring-interval</string>
</ins><span class="cx"> </property>
</span><ins>+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QSpinBox" name="PaRingIntervalSpin"/>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_11">
</ins><span class="cx"> <property name="text">
</span><del>- <string>rindgev</string>
</del><ins>+ <string>hold-file</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><del>- <widget class="QComboBox" name="PaRingdevCombo">
- <property name="geometry">
- <rect>
- <x>111</x>
- <y>92</y>
- <width>111</width>
- <height>26</height>
- </rect>
</del><ins>+ </item>
+ <item row="2" column="1">
+ <widget class="QLineEdit" name="PaHoldFileEdit"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ <widget class="QWidget" name="page_3">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QGroupBox" name="groupBox_5">
+ <property name="title">
+ <string>User Information</string>
+ </property>
+ <layout class="QFormLayout" name="formLayout_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_13">
+ <property name="text">
+ <string>CallerID Name:</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><del>- </widget>
- </item>
- <item>
- <widget class="QGroupBox" name="groupBox_4">
- <property name="title">
- <string>Files</string>
- </property>
- <layout class="QFormLayout" name="formLayout_3">
- <item row="0" column="0">
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>ring-file</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QLineEdit" name="lineEdit_2">
- <property name="text">
- <string>tone_stream://%(2000,4000,440.0,480.0);loops=20</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_12">
- <property name="text">
- <string>ring-interval</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QSpinBox" name="spinBox_4"/>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_11">
- <property name="text">
- <string>hold-file</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QLineEdit" name="lineEdit_3"/>
- </item>
- </layout>
- </widget>
- </item>
- </layout>
- </widget>
- </widget>
- </item>
- </layout>
</del><ins>+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="PaCallerIdNameEdit"/>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_14">
+ <property name="text">
+ <string>CallerID Number:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QLineEdit" name="PaCallerIdNumEdit"/>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </widget>
</ins><span class="cx"> </item>
</span><del>- <item>
- <layout class="QHBoxLayout" name="horizontalLayout_2">
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <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>
- </layout>
</del><ins>+ <item row="1" 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>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span></span></pre></div>
<a id="freeswitchtrunkfscommresourcespref_generaljpg"></a>
<div class="binary"><h4>Added: freeswitch/trunk/fscomm/resources/pref_general.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_general.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 (16163 => 16164)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/resources.qrc 2010-01-05 20:54:45 UTC (rev 16163)
+++ freeswitch/trunk/fscomm/resources.qrc 2010-01-05 22:16:46 UTC (rev 16164)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <file alias="splash.png">resources/splash.png</file>
</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><ins>+ <file alias="pref_general.jpg">resources/pref_general.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></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>