<!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][16399] </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=16399">16399</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-18 22:03:34 -0600 (Mon, 18 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Refactor accounts and let the user select default account.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommFSCommpro">freeswitch/trunk/fscomm/FSComm.pro</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.cpp</a></li>
<li><a href="#freeswitchtrunkfscommfshosth">freeswitch/trunk/fscomm/fshost.h</a></li>
<li><a href="#freeswitchtrunkfscommmaincpp">freeswitch/trunk/fscomm/main.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowcpp">freeswitch/trunk/fscomm/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowh">freeswitch/trunk/fscomm/mainwindow.h</a></li>
<li><a href="#freeswitchtrunkfscommmainwindowui">freeswitch/trunk/fscomm/mainwindow.ui</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommaccountcpp">freeswitch/trunk/fscomm/account.cpp</a></li>
<li><a href="#freeswitchtrunkfscommaccounth">freeswitch/trunk/fscomm/account.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommFSCommpro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/FSComm.pro (16398 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/FSComm.pro 2010-01-18 23:04:56 UTC (rev 16398)
+++ freeswitch/trunk/fscomm/FSComm.pro 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -30,7 +30,8 @@
</span><span class="cx"> preferences/prefportaudio.cpp \
</span><span class="cx"> preferences/prefsofia.cpp \
</span><span class="cx"> preferences/accountdialog.cpp \
</span><del>- preferences/prefaccounts.cpp
</del><ins>+ preferences/prefaccounts.cpp \
+ account.cpp
</ins><span class="cx"> HEADERS += mainwindow.h \
</span><span class="cx"> fshost.h \
</span><span class="cx"> call.h \
</span><span class="lines">@@ -39,7 +40,8 @@
</span><span class="cx"> preferences/prefportaudio.h \
</span><span class="cx"> preferences/prefsofia.h \
</span><span class="cx"> preferences/accountdialog.h \
</span><del>- preferences/prefaccounts.h
</del><ins>+ preferences/prefaccounts.h \
+ account.h
</ins><span class="cx"> FORMS += mainwindow.ui \
</span><span class="cx"> preferences/prefdialog.ui \
</span><span class="cx"> preferences/accountdialog.ui
</span></span></pre></div>
<a id="freeswitchtrunkfscommaccountcpp"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/fscomm/account.cpp (0 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/account.cpp (rev 0)
+++ freeswitch/trunk/fscomm/account.cpp 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -0,0 +1,6 @@
</span><ins>+#include "account.h"
+
+Account::Account(QObject *parent) :
+ QObject(parent)
+{
+}
</ins></span></pre></div>
<a id="freeswitchtrunkfscommaccounth"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/fscomm/account.h (0 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/account.h (rev 0)
+++ freeswitch/trunk/fscomm/account.h 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -0,0 +1,45 @@
</span><ins>+#ifndef ACCOUNT_H
+#define ACCOUNT_H
+
+#include <QObject>
+
+#define FSCOMM_GW_STATE_TRYING 0
+#define FSCOMM_GW_STATE_REGISTER 1
+#define FSCOMM_GW_STATE_REGED 2
+#define FSCOMM_GW_STATE_UNREGED 3
+#define FSCOMM_GW_STATE_UNREGISTER 4
+#define FSCOMM_GW_STATE_FAILED 5
+#define FSCOMM_GW_STATE_FAIL_WAIT 6
+#define FSCOMM_GW_STATE_EXPIRED 7
+#define FSCOMM_GW_STATE_NOREG 8
+
+
+static QString fscomm_gw_state_names[] = {
+ QString("Trying"),
+ QString("Registering"),
+ QString("Registered"),
+ QString("Un-Registered"),
+ QString("Un-Registering"),
+ QString("Failed"),
+ QString("Failed"),
+ QString("Expired"),
+ QString("Not applicable")
+};
+
+class Account : public QObject
+{
+Q_OBJECT
+public:
+ explicit Account(QObject *parent = 0);
+ void setName(QString name) { _name = name; }
+ QString getName() { return _name; }
+ void setState(int state) { _state = state; }
+ int getState() { return _state; }
+ QString getStateName() { return fscomm_gw_state_names[_state]; }
+
+private:
+ QString _name;
+ int _state;
+};
+
+#endif // ACCOUNT_H
</ins></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (16398 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-01-18 23:04:56 UTC (rev 16398)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -43,6 +43,7 @@
</span><span class="cx"> switch_core_set_globals();
</span><span class="cx">
</span><span class="cx"> qRegisterMetaType<QSharedPointer<Call> >("QSharedPointer<Call>");
</span><ins>+ qRegisterMetaType<QSharedPointer<Account> >("QSharedPointer<Account>");
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -322,24 +323,46 @@
</span><span class="cx"> {
</span><span class="cx"> QString state = switch_event_get_header_nil(event, "State");
</span><span class="cx"> QString gw = switch_event_get_header_nil(event, "Gateway");
</span><del>- if (state == "TRYING")
- emit gwStateChange(gw, FSCOMM_GW_STATE_TRYING);
- else if (state == "REGISTER")
- emit gwStateChange(gw, FSCOMM_GW_STATE_REGISTER);
- else if (state == "REGED")
- emit gwStateChange(gw, FSCOMM_GW_STATE_REGED);
- else if (state == "UNREGED")
- emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGED);
- else if (state == "UNREGISTER")
- emit gwStateChange(gw, FSCOMM_GW_STATE_UNREGISTER);
- else if (state =="FAILED")
- emit gwStateChange(gw, FSCOMM_GW_STATE_FAILED);
- else if (state == "FAIL_WAIT")
- emit gwStateChange(gw, FSCOMM_GW_STATE_FAIL_WAIT);
- else if (state == "EXPIRED")
- emit gwStateChange(gw, FSCOMM_GW_STATE_EXPIRED);
- else if (state == "NOREG")
- emit gwStateChange(gw, FSCOMM_GW_STATE_NOREG);
</del><ins>+ QSharedPointer<Account> acc;
+ if (!_accounts.contains(gw))
+ {
+ Account * accPtr = new Account();
+ accPtr->setName(gw);
+ acc = QSharedPointer<Account>(accPtr);
+ _accounts.insert(gw, acc);
+ emit newAccount(acc);
+ }
+ else
+ acc = _accounts.value(gw);
+
+ if (state == "TRYING") {
+ acc.data()->setState(FSCOMM_GW_STATE_TRYING);
+ emit accountStateChange(acc);
+ } else if (state == "REGISTER") {
+ acc.data()->setState(FSCOMM_GW_STATE_REGISTER);
+ emit accountStateChange(acc);
+ } else if (state == "REGED") {
+ acc.data()->setState(FSCOMM_GW_STATE_REGED);
+ emit accountStateChange(acc);
+ } else if (state == "UNREGED") {
+ acc.data()->setState(FSCOMM_GW_STATE_UNREGED);
+ emit accountStateChange(acc);
+ } else if (state == "UNREGISTER") {
+ acc.data()->setState(FSCOMM_GW_STATE_UNREGISTER);
+ emit accountStateChange(acc);
+ } else if (state =="FAILED") {
+ acc.data()->setState(FSCOMM_GW_STATE_FAILED);
+ emit accountStateChange(acc);
+ } else if (state == "FAIL_WAIT") {
+ acc.data()->setState(FSCOMM_GW_STATE_FAIL_WAIT);
+ emit accountStateChange(acc);
+ } else if (state == "EXPIRED") {
+ acc.data()->setState(FSCOMM_GW_STATE_EXPIRED);
+ emit accountStateChange(acc);
+ } else if (state == "NOREG") {
+ acc.data()->setState(FSCOMM_GW_STATE_NOREG);
+ emit accountStateChange(acc);
+ }
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.h (16398 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.h 2010-01-18 23:04:56 UTC (rev 16398)
+++ freeswitch/trunk/fscomm/fshost.h 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -34,30 +34,8 @@
</span><span class="cx"> #include <QSharedPointer>
</span><span class="cx"> #include <switch.h>
</span><span class="cx"> #include "call.h"
</span><ins>+#include "account.h"
</ins><span class="cx">
</span><del>-#define FSCOMM_GW_STATE_TRYING 0
-#define FSCOMM_GW_STATE_REGISTER 1
-#define FSCOMM_GW_STATE_REGED 2
-#define FSCOMM_GW_STATE_UNREGED 3
-#define FSCOMM_GW_STATE_UNREGISTER 4
-#define FSCOMM_GW_STATE_FAILED 5
-#define FSCOMM_GW_STATE_FAIL_WAIT 6
-#define FSCOMM_GW_STATE_EXPIRED 7
-#define FSCOMM_GW_STATE_NOREG 8
-
-
-static const char *fscomm_gw_state_names[] = {
- "TRYING",
- "REGISTER",
- "REGED",
- "UNREGED",
- "UNREGISTER",
- "FAILED",
- "FAIL_WAIT",
- "EXPIRED",
- "NOREG"
-};
-
</del><span class="cx"> class FSHost : public QThread
</span><span class="cx"> {
</span><span class="cx"> Q_OBJECT
</span><span class="lines">@@ -67,7 +45,7 @@
</span><span class="cx"> void generalEventHandler(switch_event_t *event);
</span><span class="cx"> QSharedPointer<Call> getCallByUUID(QString uuid) { return _active_calls.value(uuid); }
</span><span class="cx"> QSharedPointer<Call> getCurrentActiveCall();
</span><del>- QString getGwStateName(int id) { return fscomm_gw_state_names[id]; }
</del><ins>+ QList<QSharedPointer<Account> > getAccounts() { return _accounts.values(); }
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void run(void);
</span><span class="lines">@@ -80,7 +58,8 @@
</span><span class="cx"> void newOutgoingCall(QSharedPointer<Call>);
</span><span class="cx"> void callFailed(QSharedPointer<Call>);
</span><span class="cx"> void hungup(QSharedPointer<Call>);
</span><del>- void gwStateChange(QString, int);
</del><ins>+ void accountStateChange(QSharedPointer<Account>);
+ void newAccount(QSharedPointer<Account>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> switch_status_t processBlegEvent(switch_event_t *, QString);
</span><span class="lines">@@ -88,6 +67,7 @@
</span><span class="cx"> void createFolders();
</span><span class="cx"> void printEventHeaders(switch_event_t *event);
</span><span class="cx"> QHash<QString, QSharedPointer<Call> > _active_calls;
</span><ins>+ QHash<QString, QSharedPointer<Account> > _accounts;
</ins><span class="cx"> QHash<QString, QString> _bleg_uuids;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkfscommmaincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/main.cpp (16398 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/main.cpp 2010-01-18 23:04:56 UTC (rev 16398)
+++ freeswitch/trunk/fscomm/main.cpp 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -46,6 +46,7 @@
</span><span class="cx"> QObject::connect(&g_FSHost, SIGNAL(ready()), splash, SLOT(close()));
</span><span class="cx"> MainWindow w;
</span><span class="cx"> QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(show()));
</span><ins>+ QObject::connect(&g_FSHost, SIGNAL(ready()), &w, SLOT(print()));
</ins><span class="cx"> g_FSHost.start();
</span><span class="cx"> return a.exec();
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16398 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-18 23:04:56 UTC (rev 16398)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -81,7 +81,8 @@
</span><span class="cx"> connect(&g_FSHost, SIGNAL(hungup(QSharedPointer<Call>)), this, SLOT(hungup(QSharedPointer<Call>)));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(newOutgoingCall(QSharedPointer<Call>)), this, SLOT(newOutgoingCall(QSharedPointer<Call>)));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(callFailed(QSharedPointer<Call>)), this, SLOT(callFailed(QSharedPointer<Call>)));
</span><del>- connect(&g_FSHost, SIGNAL(gwStateChange(QString,int)), this, SLOT(gwStateChanged(QString,int)));
</del><ins>+ connect(&g_FSHost, SIGNAL(accountStateChange(QSharedPointer<Account>)), this, SLOT(accountStateChanged(QSharedPointer<Account>)));
+ connect(&g_FSHost, SIGNAL(newAccount(QSharedPointer<Account>)), this, SLOT(accountAdd(QSharedPointer<Account>)));
</ins><span class="cx"> /*connect(&g_FSHost, SIGNAL(coreLoadingError(QString)), this, SLOT(coreLoadingError(QString)));*/
</span><span class="cx">
</span><span class="cx"> connect(ui->newCallBtn, SIGNAL(clicked()), this, SLOT(makeCall()));
</span><span class="lines">@@ -92,6 +93,11 @@
</span><span class="cx"> connect(ui->action_Preferences, SIGNAL(triggered()), this, SLOT(prefTriggered()));
</span><span class="cx"> connect(ui->action_Exit, SIGNAL(triggered()), this, SLOT(close()));
</span><span class="cx"> connect(ui->actionAbout, SIGNAL(triggered()), this, SLOT(showAbout()));
</span><ins>+ connect(ui->actionSetDefaultAccount, SIGNAL(triggered(bool)), this, SLOT(setDefaultAccount()));
+
+ /* Set the context menus */
+ ui->tableAccounts->addAction(ui->actionSetDefaultAccount);
+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MainWindow::~MainWindow()
</span><span class="lines">@@ -102,6 +108,20 @@
</span><span class="cx"> g_FSHost.wait();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::setDefaultAccount()
+{
+ QString accName = ui->tableAccounts->item(ui->tableAccounts->selectedRanges()[0].topRow(), 0)->text();
+
+ if (accName.isEmpty())
+ return;
+
+ QSettings settings;
+ settings.beginGroup("FreeSWITCH/conf/globals");
+ switch_core_set_variable("default_gateway", accName.toAscii().data());
+ settings.setValue("default_gateway", accName);
+ settings.endGroup();
+}
+
</ins><span class="cx"> void MainWindow::prefTriggered()
</span><span class="cx"> {
</span><span class="cx"> if (!preferences)
</span><span class="lines">@@ -118,29 +138,32 @@
</span><span class="cx"> QApplication::exit(255);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::gwStateChanged(QString gw, int state)
</del><ins>+void MainWindow::accountAdd(QSharedPointer<Account> acc)
</ins><span class="cx"> {
</span><del>- ui->statusBar->showMessage(tr("Account %1 is %2").arg(gw, g_FSHost.getGwStateName(state)));
</del><ins>+ ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()+1);
+ QTableWidgetItem *gwField = new QTableWidgetItem(acc.data()->getName());
+ QTableWidgetItem *stField = new QTableWidgetItem(acc.data()->getStateName());
+ ui->tableAccounts->setItem(ui->tableAccounts->rowCount()-1,0,gwField);
+ ui->tableAccounts->setItem(ui->tableAccounts->rowCount()-1,1,stField);
+ ui->tableAccounts->resizeColumnsToContents();
+ ui->tableAccounts->resizeRowsToContents();
+ ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+}
</ins><span class="cx">
</span><del>- /* TODO: This should be placed somewhere else when the config handler is here... */
- QList<QTableWidgetItem *> match = ui->tableAccounts->findItems(gw, Qt::MatchExactly);
- if (match.isEmpty())
</del><ins>+void MainWindow::accountStateChanged(QSharedPointer<Account> acc)
+{
+ ui->statusBar->showMessage(tr("Account %1 is %2").arg(acc.data()->getName(), acc.data()->getStateName()));
+ foreach (QTableWidgetItem *i, ui->tableAccounts->findItems(acc.data()->getName(), Qt::MatchExactly))
</ins><span class="cx"> {
</span><del>- /* Create the damn thing */
- ui->tableAccounts->setRowCount(ui->tableAccounts->rowCount()+1);
- QTableWidgetItem *gwField = new QTableWidgetItem(gw);
- QTableWidgetItem *stField = new QTableWidgetItem(g_FSHost.getGwStateName(state));
- ui->tableAccounts->setItem(0,0,gwField);
- ui->tableAccounts->setItem(0,1,stField);
- ui->tableAccounts->resizeColumnsToContents();
- return;
</del><ins>+ if (i->text() == acc.data()->getName())
+ {
+ ui->tableAccounts->item(i->row(), 1)->setText(acc.data()->getStateName());
+ ui->tableAccounts->resizeColumnsToContents();
+ ui->tableAccounts->resizeRowsToContents();
+ ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
+ return;
+ }
</ins><span class="cx"> }
</span><del>-
- QTableWidgetItem *gwField = match.at(0);
- QTableWidgetItem *stField = ui->tableAccounts->item(gwField->row(),1);
- stField->setText(g_FSHost.getGwStateName(state));
- ui->tableAccounts->resizeColumnsToContents();
-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::dialDTMF(QString dtmf)
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (16398 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-01-18 23:04:56 UTC (rev 16398)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> #include <switch.h>
</span><span class="cx"> #include <fshost.h>
</span><span class="cx"> #include <call.h>
</span><ins>+#include <account.h>
</ins><span class="cx"> #include "preferences/prefdialog.h"
</span><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="lines">@@ -60,7 +61,6 @@
</span><span class="cx"> void showAbout();
</span><span class="cx"> void prefTriggered();
</span><span class="cx"> void coreLoadingError(QString);
</span><del>- void gwStateChanged(QString, int);
</del><span class="cx"> void dialDTMF(QString);
</span><span class="cx"> void callListDoubleClick(QListWidgetItem *);
</span><span class="cx"> void makeCall();
</span><span class="lines">@@ -74,6 +74,9 @@
</span><span class="cx"> void hungup(QSharedPointer<Call>);
</span><span class="cx"> void callFailed(QSharedPointer<Call>);
</span><span class="cx"> void recordCall(bool);
</span><ins>+ void setDefaultAccount();
+ void accountAdd(QSharedPointer<Account>);
+ void accountStateChanged(QSharedPointer<Account>);
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::MainWindow *ui;
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.ui (16398 => 16399)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.ui 2010-01-18 23:04:56 UTC (rev 16398)
+++ freeswitch/trunk/fscomm/mainwindow.ui 2010-01-19 04:03:34 UTC (rev 16399)
</span><span class="lines">@@ -269,6 +269,9 @@
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_2">
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QTableWidget" name="tableAccounts">
</span><ins>+ <property name="contextMenuPolicy">
+ <enum>Qt::ActionsContextMenu</enum>
+ </property>
</ins><span class="cx"> <property name="editTriggers">
</span><span class="cx"> <set>QAbstractItemView::NoEditTriggers</set>
</span><span class="cx"> </property>
</span><span class="lines">@@ -371,6 +374,14 @@
</span><span class="cx"> <string>About</string>
</span><span class="cx"> </property>
</span><span class="cx"> </action>
</span><ins>+ <action name="actionSetDefaultAccount">
+ <property name="text">
+ <string>Set Default Account</string>
+ </property>
+ <property name="toolTip">
+ <string>Set the default account for dialing out.</string>
+ </property>
+ </action>
</ins><span class="cx"> </widget>
</span><span class="cx"> <layoutdefault spacing="6" margin="11"/>
</span><span class="cx"> <resources/>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>