<!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][16507] </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=16507">16507</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-25 00:18:35 -0600 (Mon, 25 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Prepare UI modifications for codec and profile clid configuration.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16506 => 16507)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-24 21:12:04 UTC (rev 16506)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-25 06:18:35 UTC (rev 16507)
</span><span class="lines">@@ -168,7 +168,6 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::accountAdd(QSharedPointer<Account> acc)
</span><span class="cx"> {
</span><del>- qDebug() << "Adding: " << acc.data()->getName();
</del><span class="cx"> ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()+1);
</span><span class="cx"> QTableWidgetItem *gwField = new QTableWidgetItem(acc.data()->getName());
</span><span class="cx"> QTableWidgetItem *stField = new QTableWidgetItem(acc.data()->getStateName());
</span><span class="lines">@@ -181,7 +180,6 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::accountDel(QSharedPointer<Account> acc)
</span><span class="cx"> {
</span><del>- qDebug() << "Deleting: " << acc.data()->getName();
</del><span class="cx"> foreach (QTableWidgetItem *i, ui->tableAccounts->findItems(acc.data()->getName(), Qt::MatchExactly))
</span><span class="cx"> {
</span><span class="cx"> if (i->text() == acc.data()->getName())
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16506 => 16507)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-24 21:12:04 UTC (rev 16506)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-25 06:18:35 UTC (rev 16507)
</span><span class="lines">@@ -8,14 +8,18 @@
</span><span class="cx"> QDialog(parent),
</span><span class="cx"> _accId(accId),
</span><span class="cx"> ui(new Ui::AccountDialog)
</span><del>-{
</del><ins>+{
</ins><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><span class="cx"> connect(ui->sofiaExtraParamAddBtn, SIGNAL(clicked()), this, SLOT(addExtraParam()));
</span><span class="cx"> connect(ui->sofiaExtraParamRemBtn, SIGNAL(clicked()), this, SLOT(remExtraParam()));
</span><ins>+ connect(ui->clidSettingsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(clidSettingsComboChanged(int)));
+ connect(ui->codecSettingsCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(codecSettingsComboChanged(int)));
</ins><span class="cx">
</span><span class="cx"> ui->sofiaExtraParamTable->horizontalHeader()->setStretchLastSection(true);
</span><ins>+ ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->codecPage));
+ ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->clidPage));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> AccountDialog::~AccountDialog()
</span><span class="lines">@@ -23,6 +27,23 @@
</span><span class="cx"> delete ui;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccountDialog::codecSettingsComboChanged(int index)
+{
+ if (index == 0)
+ ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->codecPage));
+ else
+ ui->tabWidget->insertTab(1,ui->codecPage,tr("Codecs"));
+
+}
+
+void AccountDialog::clidSettingsComboChanged(int index)
+{
+ if (index == 0)
+ ui->tabWidget->removeTab(ui->tabWidget->indexOf(ui->clidPage));
+ else
+ ui->tabWidget->insertTab(1,ui->clidPage,tr("Caller ID"));
+}
+
</ins><span class="cx"> void AccountDialog::remExtraParam()
</span><span class="cx"> {
</span><span class="cx"> QList<QTableWidgetSelectionRange> sel = ui->sofiaExtraParamTable->selectedRanges();
</span><span class="lines">@@ -75,7 +96,6 @@
</span><span class="cx"> ui->sofiaGwUsernameEdit->setText(_settings->value("username").toString());
</span><span class="cx"> ui->sofiaGwRealmEdit->setText(_settings->value("realm").toString());
</span><span class="cx"> ui->sofiaGwPasswordEdit->setText(_settings->value("password").toString());
</span><del>- ui->sofiaGwExtensionEdit->setText(_settings->value("extension").toString());
</del><span class="cx"> ui->sofiaGwExpireSecondsSpin->setValue(_settings->value("expire-seconds").toInt());
</span><span class="cx"> ui->sofiaGwRegisterCombo->setCurrentIndex(ui->sofiaGwRegisterCombo->findText(_settings->value("register").toString(),
</span><span class="cx"> Qt::MatchExactly));
</span><span class="lines">@@ -127,7 +147,6 @@
</span><span class="cx"> _settings->setValue("username", ui->sofiaGwUsernameEdit->text());
</span><span class="cx"> _settings->setValue("realm", ui->sofiaGwRealmEdit->text());
</span><span class="cx"> _settings->setValue("password", ui->sofiaGwPasswordEdit->text());
</span><del>- _settings->setValue("extension", ui->sofiaGwExtensionEdit->text());
</del><span class="cx"> _settings->setValue("expire-seconds", ui->sofiaGwExpireSecondsSpin->value());
</span><span class="cx"> _settings->setValue("register", ui->sofiaGwRegisterCombo->currentText());
</span><span class="cx"> _settings->setValue("register-transport", ui->sofiaGwRegisterTransportCombo->currentText());
</span><span class="lines">@@ -158,7 +177,6 @@
</span><span class="cx"> ui->sofiaGwUsernameEdit->clear();
</span><span class="cx"> ui->sofiaGwRealmEdit->clear();
</span><span class="cx"> ui->sofiaGwPasswordEdit->clear();
</span><del>- ui->sofiaGwExtensionEdit->clear();
</del><span class="cx"> ui->sofiaGwExpireSecondsSpin->setValue(60);
</span><span class="cx"> ui->sofiaGwRegisterCombo->setCurrentIndex(0);
</span><span class="cx"> ui->sofiaGwRegisterTransportCombo->setCurrentIndex(0);
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.h (16506 => 16507)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-24 21:12:04 UTC (rev 16506)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-25 06:18:35 UTC (rev 16507)
</span><span class="lines">@@ -25,6 +25,8 @@
</span><span class="cx"> void writeConfig();
</span><span class="cx"> void addExtraParam();
</span><span class="cx"> void remExtraParam();
</span><ins>+ void codecSettingsComboChanged(int);
+ void clidSettingsComboChanged(int);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void changeEvent(QEvent *e);
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.ui (16506 => 16507)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.ui 2010-01-24 21:12:04 UTC (rev 16506)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.ui 2010-01-25 06:18:35 UTC (rev 16507)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><span class="cx"> <width>389</width>
</span><del>- <height>394</height>
</del><ins>+ <height>427</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> <item row="0" column="0">
</span><span class="cx"> <widget class="QLabel" name="label">
</span><span class="cx"> <property name="text">
</span><del>- <string>name</string>
</del><ins>+ <string>Account Name</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="lines">@@ -43,7 +43,7 @@
</span><span class="cx"> <item row="1" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_2">
</span><span class="cx"> <property name="text">
</span><del>- <string>username</string>
</del><ins>+ <string>Usernane</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx"> <item row="2" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_3">
</span><span class="cx"> <property name="text">
</span><del>- <string>realm</string>
</del><ins>+ <string>Domain</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="lines">@@ -63,46 +63,49 @@
</span><span class="cx"> <item row="3" column="0">
</span><span class="cx"> <widget class="QLabel" name="label_6">
</span><span class="cx"> <property name="text">
</span><del>- <string>password</string>
</del><ins>+ <string>Password</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item row="3" column="1">
</span><del>- <widget class="QLineEdit" name="sofiaGwPasswordEdit"/>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_7">
- <property name="text">
- <string>extension</string>
</del><ins>+ <widget class="QLineEdit" name="sofiaGwPasswordEdit">
+ <property name="toolTip">
+ <string>Account password </string>
</ins><span class="cx"> </property>
</span><ins>+ <property name="echoMode">
+ <enum>QLineEdit::Password</enum>
+ </property>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="4" column="1">
- <widget class="QLineEdit" name="sofiaGwExtensionEdit"/>
- </item>
- <item row="5" column="0">
</del><ins>+ <item row="4" column="0">
</ins><span class="cx"> <widget class="QLabel" name="label_10">
</span><span class="cx"> <property name="text">
</span><del>- <string>expire-seconds</string>
</del><ins>+ <string>Expire</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="5" column="1">
</del><ins>+ <item row="4" column="1">
</ins><span class="cx"> <widget class="QSpinBox" name="sofiaGwExpireSecondsSpin">
</span><ins>+ <property name="toolTip">
+ <string>Seconds before account expires</string>
+ </property>
</ins><span class="cx"> <property name="value">
</span><span class="cx"> <number>60</number>
</span><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="6" column="0">
</del><ins>+ <item row="5" column="0">
</ins><span class="cx"> <widget class="QLabel" name="label_11">
</span><span class="cx"> <property name="text">
</span><del>- <string>register</string>
</del><ins>+ <string>Register</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="6" column="1">
</del><ins>+ <item row="5" column="1">
</ins><span class="cx"> <widget class="QComboBox" name="sofiaGwRegisterCombo">
</span><ins>+ <property name="toolTip">
+ <string>Account must register or must not register</string>
+ </property>
</ins><span class="cx"> <item>
</span><span class="cx"> <property name="text">
</span><span class="cx"> <string>true</string>
</span><span class="lines">@@ -115,15 +118,18 @@
</span><span class="cx"> </item>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="7" column="0">
</del><ins>+ <item row="6" column="0">
</ins><span class="cx"> <widget class="QLabel" name="label_12">
</span><span class="cx"> <property name="text">
</span><del>- <string>register-transport</string>
</del><ins>+ <string>Transport</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="7" column="1">
</del><ins>+ <item row="6" column="1">
</ins><span class="cx"> <widget class="QComboBox" name="sofiaGwRegisterTransportCombo">
</span><ins>+ <property name="toolTip">
+ <string>What transport to use for this account</string>
+ </property>
</ins><span class="cx"> <item>
</span><span class="cx"> <property name="text">
</span><span class="cx"> <string>udp</string>
</span><span class="lines">@@ -136,22 +142,105 @@
</span><span class="cx"> </item>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="8" column="0">
</del><ins>+ <item row="7" column="0">
</ins><span class="cx"> <widget class="QLabel" name="label_13">
</span><span class="cx"> <property name="text">
</span><del>- <string>retry-seconds</string>
</del><ins>+ <string>Retry</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="8" column="1">
</del><ins>+ <item row="7" column="1">
</ins><span class="cx"> <widget class="QSpinBox" name="sofiaGwRetrySecondsSpin">
</span><ins>+ <property name="toolTip">
+ <string>How many seconds to retry registration</string>
+ </property>
</ins><span class="cx"> <property name="value">
</span><span class="cx"> <number>30</number>
</span><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><ins>+ <item row="8" column="0">
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Codec Settings</string>
+ </property>
+ </widget>
+ </item>
+ <item row="9" column="0">
+ <widget class="QLabel" name="label_5">
+ <property name="text">
+ <string>CallerID Settings</string>
+ </property>
+ </widget>
+ </item>
+ <item row="8" column="1">
+ <widget class="QComboBox" name="codecSettingsCombo">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <item>
+ <property name="text">
+ <string>Global</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Custom</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <widget class="QComboBox" name="clidSettingsCombo">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <item>
+ <property name="text">
+ <string>Global</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Custom</string>
+ </property>
+ </item>
+ </widget>
+ </item>
</ins><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><ins>+ <widget class="QWidget" name="codecPage">
+ <attribute name="title">
+ <string>Codecs</string>
+ </attribute>
+ </widget>
+ <widget class="QWidget" name="clidPage">
+ <attribute name="title">
+ <string>CallerID</string>
+ </attribute>
+ <layout class="QFormLayout" name="formLayout_2">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_15">
+ <property name="text">
+ <string>CallerID Name:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLineEdit" name="sofiaCallerIDName"/>
+ </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="sofiaCallerIDNum"/>
+ </item>
+ </layout>
+ </widget>
</ins><span class="cx"> <widget class="QWidget" name="tab_2">
</span><span class="cx"> <attribute name="title">
</span><span class="cx"> <string>Advanced</string>
</span><span class="lines">@@ -230,8 +319,8 @@
</span><span class="cx"> <slot>accept()</slot>
</span><span class="cx"> <hints>
</span><span class="cx"> <hint type="sourcelabel">
</span><del>- <x>257</x>
- <y>563</y>
</del><ins>+ <x>266</x>
+ <y>417</y>
</ins><span class="cx"> </hint>
</span><span class="cx"> <hint type="destinationlabel">
</span><span class="cx"> <x>157</x>
</span><span class="lines">@@ -246,8 +335,8 @@
</span><span class="cx"> <slot>reject()</slot>
</span><span class="cx"> <hints>
</span><span class="cx"> <hint type="sourcelabel">
</span><del>- <x>325</x>
- <y>563</y>
</del><ins>+ <x>334</x>
+ <y>417</y>
</ins><span class="cx"> </hint>
</span><span class="cx"> <hint type="destinationlabel">
</span><span class="cx"> <x>286</x>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>