<!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][16113] </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=16113">16113</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-01 14:00:18 -0600 (Fri, 01 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>We now can receive multiple calls.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowcpp">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowh">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitaFSPhonemainwindowui">freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp (16112 => 16113)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2010-01-01 19:35:56 UTC (rev 16112)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2010-01-01 20:00:18 UTC (rev 16113)
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> connect(&g_FSHost, SIGNAL(ringing(Call *)), this, SLOT(ringing(Call *)));
</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><ins>+ connect(ui->listCalls, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(callListDoubleClick(QListWidgetItem*)));
</ins><span class="cx">
</span><span class="cx"> g_FSHost.start();
</span><span class="cx"> }
</span><span class="lines">@@ -23,6 +24,18 @@
</span><span class="cx"> g_FSHost.wait();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::callListDoubleClick(QListWidgetItem *item)
+{
+ Call *call = _lines.value(item->data(Qt::UserRole).toString());
+ QString switch_str = QString("switch %1").arg(call->getCallID());
+ QString result;
+ if (g_FSHost.sendCmd("pa", switch_str.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+ ui->textEdit->setText(QString("Error switching to call %1").arg(call->getCallID()));
+ return;
+ }
+ ui->hangupBtn->setEnabled(true);
+}
+
</ins><span class="cx"> void MainWindow::fshostReady()
</span><span class="cx"> {
</span><span class="cx"> ui->statusBar->showMessage("Ready", 0);
</span><span class="lines">@@ -75,7 +88,10 @@
</span><span class="cx"> }
</span><span class="cx"> else
</span><span class="cx"> {
</span><ins>+ _lines.insert(call->getUUID(), call);
</ins><span class="cx"> ui->textEdit->setText(QString("Number: %1\nName: %3").arg(call->getCidNumber(), call->getCidName()));
</span><ins>+ QListWidgetItem *item = new QListWidgetItem(tr("%1 - %2 (Ringing)").arg(call->getCidName(), call->getCidNumber()), ui->listCalls);
+ item->setData(Qt::UserRole, call->getUUID());
</ins><span class="cx"> }
</span><span class="cx"> ui->answerBtn->setEnabled(true);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h (16112 => 16113)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2010-01-01 19:35:56 UTC (rev 16112)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2010-01-01 20:00:18 UTC (rev 16113)
</span><span class="lines">@@ -34,7 +34,7 @@
</span><span class="cx"> #define MAINWINDOW_H
</span><span class="cx">
</span><span class="cx"> #include <QMainWindow>
</span><del>-#include <QPushButton>
</del><ins>+#include <QListWidgetItem>
</ins><span class="cx"> #include <switch.h>
</span><span class="cx"> #include <fshost.h>
</span><span class="cx"> #include <call.h>
</span><span class="lines">@@ -53,6 +53,7 @@
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><ins>+ void callListDoubleClick(QListWidgetItem *);
</ins><span class="cx"> void fshostReady();
</span><span class="cx"> void paAnswer();
</span><span class="cx"> void paCall();
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui (16112 => 16113)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2010-01-01 19:35:56 UTC (rev 16112)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2010-01-01 20:00:18 UTC (rev 16113)
</span><span class="lines">@@ -6,151 +6,205 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>287</width>
- <height>438</height>
</del><ins>+ <width>805</width>
+ <height>500</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>MainWindow</string>
</span><span class="cx"> </property>
</span><span class="cx"> <widget class="QWidget" name="centralWidget">
</span><del>- <layout class="QVBoxLayout" name="verticalLayout">
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_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="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QPushButton" name="answerBtn">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_2">
+ <item>
+ <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>Answer</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><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="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>
+ </layout>
</ins><span class="cx"> </item>
</span><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>
+ </item>
+ <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>
+ </layout>
+ </item>
</ins><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">
- <property name="enabled">
- <bool>false</bool>
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QGroupBox" name="groupBox">
+ <property name="title">
+ <string>Active Calls</string>
</ins><span class="cx"> </property>
</span><del>- <property name="text">
- <string>1</string>
- </property>
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <widget class="QListWidget" name="listCalls"/>
+ </item>
+ </layout>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><del>- <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="1">
- <widget class="QPushButton" name="dtmf0Btn">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>0</string>
- </property>
- </widget>
- </item>
</del><span class="cx"> </layout>
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="lines">@@ -160,7 +214,7 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>287</width>
</del><ins>+ <width>805</width>
</ins><span class="cx"> <height>24</height>
</span><span class="cx"> </rect>
</span><span class="cx"> </property>
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>