<!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][16106] </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=16106">16106</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-12-31 13:00:00 -0600 (Thu, 31 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>We can now make calls too.</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 (16105 => 16106)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2009-12-31 18:30:42 UTC (rev 16105)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.cpp 2009-12-31 19:00:00 UTC (rev 16106)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx"> connect(&g_FSHost, SIGNAL(ready()),this, SLOT(fshostReady()));
</span><span class="cx"> connect(&g_FSHost, SIGNAL(ringing(QString,QString,QString)), this, SLOT(ringing(QString,QString,QString)));
</span><span class="cx"> connect(ui->answerBtn, SIGNAL(clicked()), this, SLOT(paAnswer()));
</span><ins>+ connect(ui->callBtn, SIGNAL(clicked()), this, SLOT(paCall()));
</ins><span class="cx"> connect(ui->hangupBtn, SIGNAL(clicked()), this, SLOT(paHangup()));
</span><span class="cx"> connect(ui->paDevlistBtn, SIGNAL(clicked()), this, SLOT(paDevlist()));
</span><span class="cx">
</span><span class="lines">@@ -26,9 +27,11 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::fshostReady()
</span><span class="cx"> {
</span><del>- ui->statusBar->showMessage("FreeSWITCH is ready!", 0);
</del><ins>+ ui->statusBar->showMessage("Ready", 0);
</ins><span class="cx"> ui->paDevlistBtn->setEnabled(true);
</span><span class="cx"> ui->textEdit->setEnabled(true);
</span><ins>+ ui->callBtn->setEnabled(true);
+ ui->textEdit->setText("Click to dial number...");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::paDevlist()
</span><span class="lines">@@ -48,11 +51,26 @@
</span><span class="cx"> ui->textEdit->setText("Error sending that command");
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ ui->textEdit->setReadOnly(true);
</ins><span class="cx"> ui->textEdit->setText("Talking...");
</span><span class="cx"> ui->hangupBtn->setEnabled(true);
</span><span class="cx"> ui->answerBtn->setEnabled(false);
</span><ins>+ ui->callBtn->setEnabled(false);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::paCall()
+{
+ QString result;
+
+ QString callstring = QString("call %1").arg(ui->textEdit->toPlainText());
+
+ if (g_FSHost.sendCmd("pa", callstring.toAscii(), &result) == SWITCH_STATUS_FALSE) {
+ ui->textEdit->setText("Error sending that command");
+ }
+
+ ui->hangupBtn->setEnabled(true);
+}
+
</ins><span class="cx"> void MainWindow::paHangup()
</span><span class="cx"> {
</span><span class="cx"> QString result;
</span><span class="lines">@@ -60,8 +78,11 @@
</span><span class="cx"> ui->textEdit->setText("Error sending that command");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- ui->textEdit->setText("Hungup ...");
</del><ins>+ ui->textEdit->setText("Click to dial number...");
+ ui->statusBar->showMessage("Call hungup", 10);
</ins><span class="cx"> ui->hangupBtn->setEnabled(false);
</span><ins>+ ui->textEdit->setReadOnly(false);
+ ui->callBtn->setEnabled(true);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::ringing(QString uuid, QString caller_id_number, QString caller_id_name)
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h (16105 => 16106)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2009-12-31 18:30:42 UTC (rev 16105)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.h 2009-12-31 19:00:00 UTC (rev 16106)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> void fshostReady();
</span><span class="cx"> void paDevlist();
</span><span class="cx"> void paAnswer();
</span><ins>+ void paCall();
</ins><span class="cx"> void paHangup();
</span><span class="cx"> void ringing(QString, QString, QString);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitaFSPhonemainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui (16105 => 16106)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2009-12-31 18:30:42 UTC (rev 16105)
+++ freeswitch/trunk/contrib/jmesquita/FSPhone/mainwindow.ui 2009-12-31 19:00:00 UTC (rev 16106)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><span class="cx"> <width>287</width>
</span><del>- <height>304</height>
</del><ins>+ <height>471</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="lines">@@ -20,9 +20,22 @@
</span><span class="cx"> <property name="enabled">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><ins>+ <property name="readOnly">
+ <bool>false</bool>
+ </property>
</ins><span class="cx"> </widget>
</span><span class="cx"> </item>
</span><span class="cx"> <item>
</span><ins>+ <widget class="QPushButton" name="callBtn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>Call</string>
+ </property>
+ </widget>
+ </item>
+ <item>
</ins><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout">
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QPushButton" name="answerBtn">
</span><span class="lines">@@ -56,6 +69,110 @@
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </item>
</span><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="1">
+ <widget class="QPushButton" name="dtmf0Btn">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>0</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</ins><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="cx"> <widget class="QMenuBar" name="menuBar">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>