<!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][17242] </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=17242">17242</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-04-07 22:22:41 -0500 (Wed, 07 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add hold feature.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommcallcpp">freeswitch/trunk/fscomm/call.cpp</a></li>
<li><a href="#freeswitchtrunkfscommcallh">freeswitch/trunk/fscomm/call.h</a></li>
<li><a href="#freeswitchtrunkfscommchannelcpp">freeswitch/trunk/fscomm/channel.cpp</a></li>
<li><a href="#freeswitchtrunkfscommchannelh">freeswitch/trunk/fscomm/channel.h</a></li>
<li><a href="#freeswitchtrunkfscommdebugtoolsstatedebugdialogcpp">freeswitch/trunk/fscomm/debugtools/statedebugdialog.cpp</a></li>
<li><a href="#freeswitchtrunkfscommfshostcpp">freeswitch/trunk/fscomm/fshost.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>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommcallcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.cpp (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.cpp 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/call.cpp 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -36,6 +36,27 @@
</span><span class="cx"> _answeredEpoch = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+switch_status_t Call::toggleHold(bool holdPressed)
+{
+ if (_state != FSCOMM_CALL_STATE_ANSWERED) return SWITCH_STATUS_FALSE;
+ switch_stream_handle_t stream = { 0 };
+ SWITCH_STANDARD_STREAM(stream);
+ QString holdStr;
+ if (holdPressed)
+ {
+ holdStr = _channel.data()->getUuid();
+ }
+ else
+ {
+ holdStr = "off " + _channel.data()->getUuid();
+ }
+
+ switch_status_t st = switch_api_execute("uuid_hold", holdStr.toAscii().data(), NULL, &stream);
+ switch_safe_free(stream.data);
+ return st;
+
+}
+
</ins><span class="cx"> switch_status_t Call::toggleRecord(bool startRecord)
</span><span class="cx"> {
</span><span class="cx"> QDir conf_dir = QDir::home();
</span><span class="lines">@@ -82,8 +103,7 @@
</span><span class="cx"> {
</span><span class="cx"> if (_direction == FSCOMM_CALL_DIRECTION_INBOUND)
</span><span class="cx"> {
</span><del>- /* TODO: DOESNT WORK - How do I get what time it started to ring? */
- _channel.data()->getProgressEpoch() == 0 ? time = _channel.data()->getProgressMediaEpoch() : time = _channel.data()->getProgressEpoch();
</del><ins>+ time = _channel.data()->getCreatedEpoch();
</ins><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> _otherLegChannel.data()->getProgressEpoch() == 0 ? time = _otherLegChannel.data()->getProgressMediaEpoch() : time = _otherLegChannel.data()->getProgressEpoch();
</span></span></pre></div>
<a id="freeswitchtrunkfscommcallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.h (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.h 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/call.h 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -50,8 +50,8 @@
</span><span class="cx"> public:
</span><span class="cx"> Call();
</span><span class="cx"> /* Needs rework */
</span><del>- QString getCidName(void) { return _channel.data()->getCidName(); }
- QString getCidNumber(void) { return _channel.data()->getCidNumber(); }
</del><ins>+ QString getCidName(void) { return (_direction == FSCOMM_CALL_DIRECTION_INBOUND) ? _otherLegChannel.data()->getCidName() : _channel.data()->getCidName(); }
+ QString getCidNumber(void) { return (_direction == FSCOMM_CALL_DIRECTION_INBOUND) ? _otherLegChannel.data()->getCidNumber() : _channel.data()->getCidNumber(); }
</ins><span class="cx"> QString getDestinationNumber(void) { return _otherLegChannel.data()->getDestinationNumber(); }
</span><span class="cx">
</span><span class="cx"> void setChannel(QSharedPointer<Channel> channel) { _channel = channel; }
</span><span class="lines">@@ -66,11 +66,12 @@
</span><span class="cx"> fscomm_call_direction_t getDirection() { return _direction; }
</span><span class="cx"> fscomm_call_state_t getState() { return _state; }
</span><span class="cx"> void setState(fscomm_call_state_t state) { _state = state; }
</span><del>- void setCause(QString cause) { _cause = cause; }
- QString getCause() { return _cause; }
</del><ins>+ void setCause(QString cause) { _cause = cause; qDebug()<<cause; }
+ QString getCause() { return _cause; qDebug() << _cause; }
</ins><span class="cx"> void setActive(bool isActive) { _isActive = isActive; }
</span><span class="cx"> bool isActive() { return _isActive == true; }
</span><span class="cx"> switch_status_t toggleRecord(bool);
</span><ins>+ switch_status_t toggleHold(bool);
</ins><span class="cx"> void sendDTMF(QString digit);
</span><span class="cx"> void setAnsweredEpoch(qulonglong time) { _answeredEpoch = time/1000000; }
</span><span class="cx"> QTime getCurrentStateTime();
</span></span></pre></div>
<a id="freeswitchtrunkfscommchannelcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/channel.cpp (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/channel.cpp 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/channel.cpp 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -5,4 +5,5 @@
</span><span class="cx"> {
</span><span class="cx"> _progressEpoch = 0;
</span><span class="cx"> _progressMediaEpoch = 0;
</span><ins>+ _createdEpoch = 0;
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommchannelh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/channel.h (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/channel.h 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/channel.h 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -23,6 +23,8 @@
</span><span class="cx"> qulonglong getProgressEpoch() { return _progressEpoch; }
</span><span class="cx"> void setProgressMediaEpoch(qulonglong time) { _progressMediaEpoch = time/1000000; }
</span><span class="cx"> qulonglong getProgressMediaEpoch() { return _progressMediaEpoch; }
</span><ins>+ void setCreatedEpoch(qulonglong time) { _createdEpoch = time/1000000; }
+ qulonglong getCreatedEpoch() { return _createdEpoch; }
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> QString _uuid;
</span><span class="lines">@@ -32,6 +34,7 @@
</span><span class="cx"> int _paCallId;
</span><span class="cx"> qulonglong _progressEpoch;
</span><span class="cx"> qulonglong _progressMediaEpoch;
</span><ins>+ qulonglong _createdEpoch;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> Q_DECLARE_METATYPE(Channel)
</span></span></pre></div>
<a id="freeswitchtrunkfscommdebugtoolsstatedebugdialogcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/debugtools/statedebugdialog.cpp (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/debugtools/statedebugdialog.cpp 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/debugtools/statedebugdialog.cpp 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -66,6 +66,7 @@
</span><span class="cx"> {
</span><span class="cx"> ui->listDetails->clear();
</span><span class="cx"> int r = ui->listEvents->currentRow();
</span><ins>+ if (r == -1) return;
</ins><span class="cx"> QString uuid = ui->listUUID->currentItem()->text();
</span><span class="cx"> QList<QSharedPointer<switch_event_t> > tmpListEvents = _events.value(uuid);
</span><span class="cx"> QSharedPointer<switch_event_t> e = tmpListEvents.at(r);
</span></span></pre></div>
<a id="freeswitchtrunkfscommfshostcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.cpp (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.cpp 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/fshost.cpp 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -394,13 +394,13 @@
</span><span class="cx"> else
</span><span class="cx"> {
</span><span class="cx"> Call *callPtr = new Call();
</span><del>-
</del><span class="cx"> callPtr->setCallDirection(FSCOMM_CALL_DIRECTION_INBOUND);
</span><del>- callPtr->setChannel(_channels.value(switch_event_get_header_nil(event.data(), "Other-Leg-Unique-ID")));
- callPtr->setOtherLegChannel(_channels.value(uuid));
</del><ins>+ callPtr->setChannel(_channels.value(uuid));
+ callPtr->setOtherLegChannel(_channels.value(switch_event_get_header_nil(event.data(), "Other-Leg-Unique-ID")));
</ins><span class="cx"> QSharedPointer<Call> call(callPtr);
</span><del>- _active_calls.insert(switch_event_get_header_nil(event.data(), "Other-Leg-Unique-ID"), call);
</del><ins>+ _active_calls.insert(uuid, call);
</ins><span class="cx"> call.data()->setState(FSCOMM_CALL_STATE_RINGING);
</span><ins>+ _channels.value(uuid).data()->setCreatedEpoch(QString(switch_event_get_header_nil(event.data(), "Caller-Channel-Created-Time")).toULongLong());
</ins><span class="cx"> emit ringing(call);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -426,16 +426,23 @@
</span><span class="cx"> if (time.toULongLong() > 0) _channels.value(uuid).data()->setProgressMediaEpoch(time.toULongLong());
</span><span class="cx"> }
</span><span class="cx"> void FSHost::eventChannelHangup(QSharedPointer<switch_event_t>event, QString uuid)
</span><ins>+{}
+void FSHost::eventChannelUnbridge(QSharedPointer<switch_event_t>event, QString uuid)
+{}
+void FSHost::eventChannelHangupComplete(QSharedPointer<switch_event_t>event, QString uuid)
</ins><span class="cx"> {
</span><span class="cx"> if (_active_calls.contains(uuid))
</span><span class="cx"> {
</span><ins>+ if (_active_calls.value(uuid).data()->getState() != FSCOMM_CALL_STATE_ANSWERED)
+ {
+ _active_calls.value(uuid).data()->setState(FSCOMM_CALL_STATE_FAILED);
+ _active_calls.value(uuid).data()->setCause(switch_event_get_header_nil(event.data(), "variable_originate_disposition"));
+ emit callFailed(_active_calls.value(uuid));
+ return;
+ }
</ins><span class="cx"> emit hungup(_active_calls.take(uuid));
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-void FSHost::eventChannelUnbridge(QSharedPointer<switch_event_t>event, QString uuid)
-{}
-void FSHost::eventChannelHangupComplete(QSharedPointer<switch_event_t>event, QString uuid)
-{}
</del><span class="cx"> void FSHost::eventChannelDestroy(QSharedPointer<switch_event_t>event, QString uuid)
</span><span class="cx"> {
</span><span class="cx"> _channels.take(uuid);
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -100,6 +100,7 @@
</span><span class="cx"> connect(ui->answerBtn, SIGNAL(clicked()), this, SLOT(paAnswer()));
</span><span class="cx"> connect(ui->hangupBtn, SIGNAL(clicked()), this, SLOT(paHangup()));
</span><span class="cx"> connect(ui->recoredCallBtn, SIGNAL(toggled(bool)), SLOT(recordCall(bool)));
</span><ins>+ connect(ui->btnHold, SIGNAL(toggled(bool)), this, SLOT(holdCall(bool)));
</ins><span class="cx"> connect(ui->tableCalls, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(callTableDoubleClick(QTableWidgetItem*)));
</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="lines">@@ -363,16 +364,35 @@
</span><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::recordCall(bool pressed)
</del><ins>+void MainWindow::holdCall(bool pressed)
</ins><span class="cx"> {
</span><ins>+
</ins><span class="cx"> QSharedPointer<Call> call = g_FSHost.getCurrentActiveCall();
</span><span class="cx">
</span><span class="cx"> if (call.isNull())
</span><span class="cx"> {
</span><del>- QMessageBox::warning(this,tr("Record call"),
- tr("<p>FSComm reports that there are no active calls to be recorded."
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not hold call because there is not current active call!.\n");
+ return;
+ }
+
+ if (call.data()->toggleHold(pressed) != SWITCH_STATUS_SUCCESS)
+ {
+ QMessageBox::warning(this,tr("Hold call"),
+ tr("<p>Could not get active call to hold/unhold."
</ins><span class="cx"> "<p>Please report this bug."),
</span><span class="cx"> QMessageBox::Ok);
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not hold/unhold call [%s].\n", call.data()->getUuid().toAscii().data());
+ return;
+ }
+
+}
+
+void MainWindow::recordCall(bool pressed)
+{
+ QSharedPointer<Call> call = g_FSHost.getCurrentActiveCall();
+
+ if (call.isNull())
+ {
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not record call because there is not current active call!.\n");
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -472,6 +492,9 @@
</span><span class="cx"> }
</span><span class="cx"> ui->recoredCallBtn->setEnabled(true);
</span><span class="cx"> ui->recoredCallBtn->setChecked(false);
</span><ins>+ ui->btnHold->setEnabled(true);
+ ui->btnHold->setChecked(false);
+ ui->btnTransfer->setEnabled(true);
</ins><span class="cx"> ui->dtmf0Btn->setEnabled(true);
</span><span class="cx"> ui->dtmf1Btn->setEnabled(true);
</span><span class="cx"> ui->dtmf2Btn->setEnabled(true);
</span><span class="lines">@@ -504,13 +527,26 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- ui->textEdit->setText(tr("Call with %1 (%2) failed with reason %3.").arg(call.data()->getCidName(),
- call.data()->getCidNumber(),
- call.data()->getCause()));
</del><ins>+ if (call.data()->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
+ {
+ ui->textEdit->setText(tr("Call from %1 (%2) failed with reason %3.").arg(call.data()->getCidName(),
+ call.data()->getCidNumber(),
+ call.data()->getCause()));
+ }
+ else
+ {
+ ui->textEdit->setText(tr("Call to %1 failed with reason %3.").arg(call.data()->getCidName(),
+ call.data()->getCidNumber(),
+ call.data()->getCause()));
+ }
+
</ins><span class="cx"> call.data()->setActive(false);
</span><span class="cx"> /* TODO: Will cause problems if 2 calls are received at the same time */
</span><span class="cx"> ui->recoredCallBtn->setEnabled(false);
</span><span class="cx"> ui->recoredCallBtn->setChecked(false);
</span><ins>+ ui->btnHold->setEnabled(false);
+ ui->btnHold->setChecked(false);
+ ui->btnTransfer->setEnabled(false);
</ins><span class="cx"> ui->answerBtn->setEnabled(false);
</span><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><span class="cx"> ui->dtmf0Btn->setEnabled(false);
</span><span class="lines">@@ -558,6 +594,9 @@
</span><span class="cx"> /* TODO: Will cause problems if 2 calls are received at the same time */
</span><span class="cx"> ui->recoredCallBtn->setEnabled(false);
</span><span class="cx"> ui->recoredCallBtn->setChecked(false);
</span><ins>+ ui->btnHold->setEnabled(false);
+ ui->btnHold->setChecked(false);
+ ui->btnTransfer->setEnabled(false);
</ins><span class="cx"> ui->answerBtn->setEnabled(false);
</span><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><span class="cx"> ui->dtmf0Btn->setEnabled(false);
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -76,6 +76,7 @@
</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 holdCall(bool);
</ins><span class="cx"> void setDefaultAccount();
</span><span class="cx"> void accountAdd(QSharedPointer<Account>);
</span><span class="cx"> void accountDel(QSharedPointer<Account>);
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.ui (17241 => 17242)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.ui 2010-04-08 16:58:56 UTC (rev 17241)
+++ freeswitch/trunk/fscomm/mainwindow.ui 2010-04-08 03:22:41 UTC (rev 17242)
</span><span class="lines">@@ -14,235 +14,263 @@
</span><span class="cx"> <string>FSComm - A FreeSWITCH Communicator</string>
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="centralWidget">
</span><del>- <layout class="QHBoxLayout" name="horizontalLayout_4">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_5">
</ins><span class="cx"> <item>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_2">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_3">
</ins><span class="cx"> <item>
</span><del>- <widget class="QTextEdit" name="textEdit">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_2">
</ins><span class="cx"> <item>
</span><del>- <widget class="QPushButton" name="newCallBtn">
</del><ins>+ <widget class="QTextEdit" name="textEdit">
</ins><span class="cx"> <property name="enabled">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><del>- <property name="text">
- <string>New Call</string>
</del><ins>+ <property name="readOnly">
+ <bool>true</bool>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <widget class="QPushButton" name="recoredCallBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Record</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- </widget>
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="newCallBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>New Call</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnHold">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Hold</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><del>- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QPushButton" name="answerBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Answer</string>
- </property>
- </widget>
</del><ins>+ <item>
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="answerBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Answer</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="hangupBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Hangup</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><del>- <item row="0" column="1">
- <widget class="QPushButton" name="hangupBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Hangup</string>
- </property>
- </widget>
</del><ins>+ <item>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QPushButton" name="dtmf1Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>1</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="dtmf2Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>2</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <widget class="QPushButton" name="dtmf3Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>3</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QPushButton" name="dtmf4Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>4</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="dtmf5Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>5</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <widget class="QPushButton" name="dtmf6Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>6</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QPushButton" name="dtmf7Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>7</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QPushButton" name="dtmf8Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>8</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="2">
+ <widget class="QPushButton" name="dtmf9Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>9</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="0">
+ <widget class="QPushButton" name="dtmfAstBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>*</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="1">
+ <widget class="QPushButton" name="dtmf0Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="2">
+ <widget class="QPushButton" name="dtmfPoundBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>#</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
+ <widget class="QPushButton" name="dtmfABtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>A</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="3">
+ <widget class="QPushButton" name="dtmfBBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>B</string>
+ </property>
+ </widget>
+ </item>
+ <item row="3" column="3">
+ <widget class="QPushButton" name="dtmfDBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>D</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="3">
+ <widget class="QPushButton" name="dtmfCBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>C</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QPushButton" name="dtmf1Btn">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QPushButton" name="btnTransfer">
</ins><span class="cx"> <property name="enabled">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="text">
</span><del>- <string>1</string>
</del><ins>+ <string>Transfer</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="0" column="1">
- <widget class="QPushButton" name="dtmf2Btn">
</del><ins>+ <item>
+ <widget class="QPushButton" name="recoredCallBtn">
</ins><span class="cx"> <property name="enabled">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="text">
</span><del>- <string>2</string>
</del><ins>+ <string>Record</string>
</ins><span class="cx"> </property>
</span><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <item row="0" column="2">
- <widget class="QPushButton" name="dtmf3Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>3</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QPushButton" name="dtmf4Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>4</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="dtmf5Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>5</string>
- </property>
- </widget>
- </item>
- <item row="1" column="2">
- <widget class="QPushButton" name="dtmf6Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>6</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QPushButton" name="dtmf7Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>7</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QPushButton" name="dtmf8Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>8</string>
- </property>
- </widget>
- </item>
- <item row="2" column="2">
- <widget class="QPushButton" name="dtmf9Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>9</string>
- </property>
- </widget>
- </item>
- <item row="3" column="0">
- <widget class="QPushButton" name="dtmfAstBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>*</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QPushButton" name="dtmf0Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>0</string>
- </property>
- </widget>
- </item>
- <item row="3" column="2">
- <widget class="QPushButton" name="dtmfPoundBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>#</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QPushButton" name="dtmfABtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>A</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QPushButton" name="dtmfBBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>B</string>
- </property>
- </widget>
- </item>
- <item row="3" column="3">
- <widget class="QPushButton" name="dtmfDBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>D</string>
- </property>
- </widget>
- </item>
- <item row="2" column="3">
- <widget class="QPushButton" name="dtmfCBtn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>C</string>
- </property>
- </widget>
- </item>
</del><span class="cx"> </layout>
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>