<!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][16298] </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=16298">16298</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-13 21:25:27 -0600 (Wed, 13 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Configuration is more mature now. We can add and remove several accounts. Still have to edit account and start doing some work on the events to treat them right.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp">freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.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>
<li><a href="#freeswitchtrunkfscommpreferencesprefaccountscpp">freeswitch/trunk/fscomm/preferences/prefaccounts.cpp</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefaccountsh">freeswitch/trunk/fscomm/preferences/prefaccounts.h</a></li>
<li><a href="#freeswitchtrunkfscommpreferencesprefdialogui">freeswitch/trunk/fscomm/preferences/prefdialog.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommmod_qsettingsmod_qsettingscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-14 02:32:20 UTC (rev 16297)
+++ freeswitch/trunk/fscomm/mod_qsettings/mod_qsettings.cpp 2010-01-14 03:25:27 UTC (rev 16298)
</span><span class="lines">@@ -91,7 +91,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (group == "params")
</del><ins>+ if (group == "params" || group == "customParams")
</ins><span class="cx"> {
</span><span class="cx"> _settings->beginGroup(group);
</span><span class="cx"> foreach(QString param, _settings->childKeys())
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.cpp (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-14 02:32:20 UTC (rev 16297)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.cpp 2010-01-14 03:25:27 UTC (rev 16298)
</span><span class="lines">@@ -4,7 +4,7 @@
</span><span class="cx"> #include "ui_accountdialog.h"
</span><span class="cx"> #include "fshost.h"
</span><span class="cx">
</span><del>-AccountDialog::AccountDialog(int accId, QWidget *parent) :
</del><ins>+AccountDialog::AccountDialog(QString accId, QWidget *parent) :
</ins><span class="cx"> QDialog(parent),
</span><span class="cx"> _accId(accId),
</span><span class="cx"> ui(new Ui::AccountDialog)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> {
</span><span class="cx"> _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
</span><span class="cx">
</span><del>- _settings->beginGroup(QString::number(_accId));
</del><ins>+ _settings->beginGroup(_accId);
</ins><span class="cx">
</span><span class="cx"> _settings->beginGroup("gateway/attrs");
</span><span class="cx"> _settings->setValue("name", ui->sofiaGwNameEdit->text());
</span><span class="lines">@@ -77,6 +77,9 @@
</span><span class="cx"> _settings->setValue("register", ui->sofiaGwRegisterCombo->currentText());
</span><span class="cx"> _settings->setValue("register-transport", ui->sofiaGwRegisterTransportCombo->currentText());
</span><span class="cx"> _settings->setValue("retry-seconds", ui->sofiaGwRetrySecondsSpin->value());
</span><ins>+ _settings->endGroup();
+
+ _settings->beginGroup("gateway/customParams");
</ins><span class="cx"> for (int i = 0; i< ui->sofiaExtraParamTable->rowCount(); i++)
</span><span class="cx"> {
</span><span class="cx"> _settings->setValue(ui->sofiaExtraParamTable->item(i, 0)->text(),
</span><span class="lines">@@ -97,6 +100,27 @@
</span><span class="cx"> emit gwAdded();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void AccountDialog::clear()
+{
+ ui->sofiaExtraParamTable->clearContents();
+ ui->sofiaExtraParamTable->setRowCount(0);
+
+ ui->sofiaGwNameEdit->clear();
+ ui->sofiaGwUsernameEdit->clear();
+ ui->sofiaGwRealmEdit->clear();
+ ui->sofiaGwPasswordEdit->clear();
+ ui->sofiaGwExtensionEdit->clear();
+ ui->sofiaGwExpireSecondsSpin->setValue(60);
+ ui->sofiaGwRegisterCombo->setCurrentIndex(0);
+ ui->sofiaGwRegisterTransportCombo->setCurrentIndex(0);
+ ui->sofiaGwRetrySecondsSpin->setValue(30);
+}
+
+void AccountDialog::setAccId(QString accId)
+{
+ _accId = accId;
+}
+
</ins><span class="cx"> void AccountDialog::changeEvent(QEvent *e)
</span><span class="cx"> {
</span><span class="cx"> QDialog::changeEvent(e);
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.h (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-14 02:32:20 UTC (rev 16297)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.h 2010-01-14 03:25:27 UTC (rev 16298)
</span><span class="lines">@@ -12,8 +12,10 @@
</span><span class="cx"> class AccountDialog : public QDialog {
</span><span class="cx"> Q_OBJECT
</span><span class="cx"> public:
</span><del>- AccountDialog(int accId, QWidget *parent = 0);
</del><ins>+ AccountDialog(QString accId, QWidget *parent = 0);
</ins><span class="cx"> ~AccountDialog();
</span><ins>+ void clear();
+ void setAccId(QString);
</ins><span class="cx">
</span><span class="cx"> signals:
</span><span class="cx"> void gwAdded();
</span><span class="lines">@@ -27,7 +29,7 @@
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- int _accId;
</del><ins>+ QString _accId;
</ins><span class="cx"> Ui::AccountDialog *ui;
</span><span class="cx"> QSettings *_settings;
</span><span class="cx"> };
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesaccountdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/accountdialog.ui (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/accountdialog.ui 2010-01-14 02:32:20 UTC (rev 16297)
+++ freeswitch/trunk/fscomm/preferences/accountdialog.ui 2010-01-14 03:25:27 UTC (rev 16298)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QTabWidget" name="tabWidget">
</span><span class="cx"> <property name="currentIndex">
</span><del>- <number>1</number>
</del><ins>+ <number>0</number>
</ins><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="tab">
</span><span class="cx"> <attribute name="title">
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.cpp (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-14 02:32:20 UTC (rev 16297)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.cpp 2010-01-14 03:25:27 UTC (rev 16298)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> #include <QtGui>
</span><span class="cx"> #include "prefaccounts.h"
</span><span class="cx"> #include "accountdialog.h"
</span><ins>+#include "fshost.h"
</ins><span class="cx">
</span><span class="cx"> PrefAccounts::PrefAccounts(Ui::PrefDialog *ui) :
</span><span class="cx"> _ui(ui)
</span><span class="lines">@@ -8,21 +9,70 @@
</span><span class="cx"> _settings = new QSettings();
</span><span class="cx"> _accDlg = NULL;
</span><span class="cx"> connect(_ui->sofiaGwAddBtn, SIGNAL(clicked()), this, SLOT(addAccountBtnClicked()));
</span><ins>+ connect(_ui->sofiaGwRemBtn, SIGNAL(clicked()), this, SLOT(remAccountBtnClicked()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void PrefAccounts::addAccountBtnClicked()
</span><span class="cx"> {
</span><span class="cx"> if (!_accDlg)
</span><span class="cx"> {
</span><del>- _accDlg = new AccountDialog(_ui->accountsTable->rowCount());
</del><ins>+ QString uuid;
+ if (g_FSHost.sendCmd("create_uuid", "", &uuid) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not create UUID for account. Reason: %s\n", uuid.toAscii().constData());
+ return;
+ }
+ _accDlg = new AccountDialog(uuid);
</ins><span class="cx"> connect(_accDlg, SIGNAL(gwAdded()), this, SLOT(readConfig()));
</span><span class="cx"> }
</span><ins>+ else
+ {
+ QString uuid;
+ if (g_FSHost.sendCmd("create_uuid", "", &uuid) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not create UUID for account. Reason: %s\n", uuid.toAscii().constData());
+ return;
+ }
+ _accDlg->setAccId(uuid);
+ _accDlg->clear();
+ }
</ins><span class="cx">
</span><span class="cx"> _accDlg->show();
</span><span class="cx"> _accDlg->raise();
</span><span class="cx"> _accDlg->activateWindow();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PrefAccounts::remAccountBtnClicked()
+{
+ QList<QTableWidgetSelectionRange> sel = _ui->accountsTable->selectedRanges();
+ int offset =0;
+
+ foreach(QTableWidgetSelectionRange range, sel)
+ {
+ for(int row = range.topRow(); row<=range.bottomRow(); row++)
+ {
+ QTableWidgetItem *item = _ui->accountsTable->item(row-offset,0);
+
+ _settings->beginGroup("FreeSWITCH/conf/sofia.conf/profiles/profile/gateways");
+ _settings->remove(item->data(Qt::UserRole).toString());
+ _settings->endGroup();
+ _ui->accountsTable->removeRow(row-offset);
+ offset++;
+ }
+ }
+
+ if (offset > 0)
+ {
+ QString res;
+ if (g_FSHost.sendCmd("sofia", "profile softphone rescan", &res) != SWITCH_STATUS_SUCCESS)
+ {
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not rescan the softphone profile.\n");
+ return;
+ }
+ readConfig();
+ }
+}
+
</ins><span class="cx"> void PrefAccounts::writeConfig()
</span><span class="cx"> {
</span><span class="cx"> return;
</span><span class="lines">@@ -41,9 +91,11 @@
</span><span class="cx"> _settings->beginGroup(accId);
</span><span class="cx"> _settings->beginGroup("gateway/attrs");
</span><span class="cx"> QTableWidgetItem *item0 = new QTableWidgetItem(_settings->value("name").toString());
</span><ins>+ item0->setData(Qt::UserRole, accId);
</ins><span class="cx"> _settings->endGroup();
</span><span class="cx"> _settings->beginGroup("gateway/params");
</span><span class="cx"> QTableWidgetItem *item1 = new QTableWidgetItem(_settings->value("username").toString());
</span><ins>+ item1->setData(Qt::UserRole, accId);
</ins><span class="cx"> _settings->endGroup();
</span><span class="cx"> _settings->endGroup();
</span><span class="cx"> _ui->accountsTable->setRowCount(_ui->accountsTable->rowCount()+1);
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefaccountsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefaccounts.h (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-14 02:32:20 UTC (rev 16297)
+++ freeswitch/trunk/fscomm/preferences/prefaccounts.h 2010-01-14 03:25:27 UTC (rev 16298)
</span><span class="lines">@@ -18,6 +18,8 @@
</span><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void addAccountBtnClicked();
</span><ins>+ void editAccountBtnClicked();
+ void remAccountBtnClicked();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::PrefDialog *_ui;
</span></span></pre></div>
<a id="freeswitchtrunkfscommpreferencesprefdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/preferences/prefdialog.ui (16297 => 16298)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-14 02:32:20 UTC (rev 16297)
+++ freeswitch/trunk/fscomm/preferences/prefdialog.ui 2010-01-14 03:25:27 UTC (rev 16298)
</span><span class="lines">@@ -96,7 +96,7 @@
</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>1</number>
</del><ins>+ <number>0</number>
</ins><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="generalPage">
</span><span class="cx"> <layout class="QVBoxLayout" name="verticalLayout_3">
</span><span class="lines">@@ -168,6 +168,9 @@
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QPushButton" name="sofiaGwEditBtn">
</span><ins>+ <property name="enabled">
+ <bool>false</bool>
+ </property>
</ins><span class="cx"> <property name="text">
</span><span class="cx"> <string>Edit</string>
</span><span class="cx"> </property>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>