<!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][16301] </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=16301">16301</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-13 22:54:03 -0600 (Wed, 13 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Edit gateway works too. Now we need to start parsing events right.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommconffreeswitchxml">freeswitch/trunk/fscomm/conf/freeswitch.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="#freeswitchtrunkfscommpreferencesprefaccountscpp">freeswitch/trunk/fscomm/preferences/prefaccounts.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogui">freeswitch/trunk/fscomm/preferences/prefdialog.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommconffreeswitchxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/conf/freeswitch.xml (16300 => 16301)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-14 04:01:32 UTC (rev 16300)
+++ freeswitch/trunk/fscomm/conf/freeswitch.xml 2010-01-14 04:54:03 UTC (rev 16301)
</span><span class="lines">@@ -139,9 +139,6 @@
</span><span class="cx"> </global_settings>
</span><span class="cx"> <profiles>
</span><span class="cx"> <profile name="softphone">
</span><del>- <gateways>
- <X-PRE-PROCESS cmd="include" data="accounts/*.xml"/>
- </gateways>
</del><span class="cx"> <settings>
</span><span class="cx"> <!--<param name="media-option" value="bypass-media-after-att-xfer"/>-->
</span><span class="cx"> <param name="user-agent-string" value="FreeSWITCH/FSComm"/>
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16300 => 16301)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-14 04:01:32 UTC (rev 16300)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-14 04:54:03 UTC (rev 16301)
</span><span class="lines">@@ -57,6 +57,45 @@
</span><span class="cx"> ui->sofiaExtraParamTable->setItem(ui->sofiaExtraParamTable->rowCount()-1,1,paramValItem);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccountDialog::readConfig()
+{
+ _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+ _settings->beginGroup(_accId);
+
+ _settings->beginGroup("gateway/attrs");
+ ui->sofiaGwNameEdit->setText(_settings->value("name").toString());
+ _settings->endGroup();
+
+ _settings->beginGroup("gateway/params");
+ ui->sofiaGwUsernameEdit->setText(_settings->value("username").toString());
+ ui->sofiaGwRealmEdit->setText(_settings->value("realm").toString());
+ ui->sofiaGwPasswordEdit->setText(_settings->value("password").toString());
+ ui->sofiaGwExtensionEdit->setText(_settings->value("extension").toString());
+ ui->sofiaGwExpireSecondsSpin->setValue(_settings->value("expire-seconds").toInt());
+ ui->sofiaGwRegisterCombo->setCurrentIndex(ui->sofiaGwRegisterCombo->findText(_settings->value("register").toString(),
+ Qt::MatchExactly));
+ ui->sofiaGwRegisterTransportCombo->setCurrentIndex(ui->sofiaGwRegisterTransportCombo->findText(_settings->value("register-transport").toString(),
+ Qt::MatchExactly));
+ ui->sofiaGwRetrySecondsSpin->setValue(_settings->value("retry-seconds").toInt());
+ _settings->endGroup();
+
+ _settings->beginGroup("gateway/customParams");
+ int row = 0;
+ foreach(QString k, _settings->childKeys())
+ {
+ row++;
+ ui->sofiaExtraParamTable->setRowCount(row);
+ QTableWidgetItem *varName = new QTableWidgetItem(k);
+ QTableWidgetItem *varVal = new QTableWidgetItem(_settings->value(k).toString());
+ ui->sofiaExtraParamTable->setItem(row-1, 0,varName);
+ ui->sofiaExtraParamTable->setItem(row-1, 1,varVal);
+ }
+ _settings->endGroup();
+
+ _settings->endGroup();
+ _settings->endGroup();
+}
+
</ins><span class="cx"> void AccountDialog::writeConfig()
</span><span class="cx"> {
</span><span class="cx"> _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
</span><span class="lines">@@ -91,8 +130,6 @@
</span><span class="cx">
</span><span class="cx"> _settings->endGroup();
</span><span class="cx">
</span><del>- _settings->endGroup();
-
</del><span class="cx"> QString res;
</span><span class="cx"> if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.h (16300 => 16301)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-14 04:01:32 UTC (rev 16300)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-14 04:54:03 UTC (rev 16301)
</span><span class="lines">@@ -16,6 +16,7 @@
</span><span class="cx"> ~AccountDialog();
</span><span class="cx"> void clear();
</span><span class="cx"> void setAccId(QString);
</span><ins>+ void readConfig();
</ins><span class="cx">
</span><span class="cx"> signals:
</span><span class="cx"> void gwAdded();
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.cpp (16300 => 16301)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-14 04:01:32 UTC (rev 16300)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-14 04:54:03 UTC (rev 16301)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> _accDlg = NULL;
</span><span class="cx"> connect(_ui->sofiaGwAddBtn, SIGNAL(clicked()), this, SLOT(addAccountBtnClicked()));
</span><span class="cx"> connect(_ui->sofiaGwRemBtn, SIGNAL(clicked()), this, SLOT(remAccountBtnClicked()));
</span><ins>+ connect(_ui->sofiaGwEditBtn, SIGNAL(clicked()), this, SLOT(editAccountBtnClicked()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefAccounts::addAccountBtnClicked()
</span><span class="lines">@@ -42,6 +43,33 @@
</span><span class="cx"> _accDlg->activateWindow();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefAccounts::editAccountBtnClicked()
+{
+ QList<QTableWidgetSelectionRange> selList = _ui->accountsTable->selectedRanges();
+
+ if (selList.isEmpty())
+ return;
+ QTableWidgetSelectionRange range = selList[0];
+
+ QString uuid = _ui->accountsTable->item(range.topRow(),0)->data(Qt::UserRole).toString();
+
+ if (!_accDlg)
+ {
+ _accDlg = new AccountDialog(uuid);
+ connect(_accDlg, SIGNAL(gwAdded()), this, SLOT(readConfig()));
+ }
+ else
+ {
+ _accDlg->setAccId(uuid);
+ }
+
+ _accDlg->readConfig();
+
+ _accDlg->show();
+ _accDlg->raise();
+ _accDlg->activateWindow();
+}
+
</ins><span class="cx"> void PrefAccounts::remAccountBtnClicked()
</span><span class="cx"> {
</span><span class="cx"> QList<QTableWidgetSelectionRange> sel = _ui->accountsTable->selectedRanges();
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.ui (16300 => 16301)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-14 04:01:32 UTC (rev 16300)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-14 04:54:03 UTC (rev 16301)
</span><span class="lines">@@ -169,7 +169,7 @@
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QPushButton" name="sofiaGwEditBtn">
</span><span class="cx"> <property name="enabled">
</span><del>- <bool>false</bool>
</del><ins>+ <bool>true</bool>
</ins><span class="cx"> </property>
</span><span class="cx"> <property name="text">
</span><span class="cx"> <string>Edit</string>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>