<!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][16431] </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=16431">16431</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-20 23:05:56 -0600 (Wed, 20 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make UI enhancements and refactor some code. We still have bugs on handling multiple calls and switching between them.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommcallh">freeswitch/trunk/fscomm/call.h</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="freeswitchtrunkfscommcallh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/call.h (16430 => 16431)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/call.h 2010-01-21 02:51:04 UTC (rev 16430)
+++ freeswitch/trunk/fscomm/call.h 2010-01-21 05:05:56 UTC (rev 16431)
</span><span class="lines">@@ -45,10 +45,9 @@
</span><span class="cx"> FSCOMM_CALL_DIRECTION_OUTBOUND = 1
</span><span class="cx"> } fscomm_call_direction_t;
</span><span class="cx">
</span><del>-class Call
-{
</del><ins>+class Call {
</ins><span class="cx"> public:
</span><del>- Call(void);
</del><ins>+ Call();
</ins><span class="cx"> Call(int call_id, QString cid_name, QString cid_number, fscomm_call_direction_t direction, QString uuid);
</span><span class="cx"> QString getCidName(void) { return _cid_name; }
</span><span class="cx"> QString getCidNumber(void) { return _cid_number; }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16430 => 16431)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-21 02:51:04 UTC (rev 16430)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-21 05:05:56 UTC (rev 16431)
</span><span class="lines">@@ -97,7 +97,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><del>- connect(ui->listCalls, SIGNAL(itemDoubleClicked(QListWidgetItem*)), this, SLOT(callListDoubleClick(QListWidgetItem*)));
</del><ins>+ connect(ui->tableCalls, SIGNAL(itemDoubleClicked(QTableWidgetItem*)), this, SLOT(callTableDoubleClick(QTableWidgetItem*)));
</ins><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><span class="lines">@@ -199,7 +199,8 @@
</span><span class="cx"> g_FSHost.getCurrentActiveCall().data()->sendDTMF(dtmf);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MainWindow::callListDoubleClick(QListWidgetItem *item)
</del><ins>+/* TODO: Update the timers and the item text! */
+void MainWindow::callTableDoubleClick(QTableWidgetItem *item)
</ins><span class="cx"> {
</span><span class="cx"> QSharedPointer<Call> lastCall = g_FSHost.getCurrentActiveCall();
</span><span class="cx"> QSharedPointer<Call> call = g_FSHost.getCallByUUID(item->data(Qt::UserRole).toString());
</span><span class="lines">@@ -301,9 +302,20 @@
</span><span class="cx"> void MainWindow::newOutgoingCall(QSharedPointer<Call> call)
</span><span class="cx"> {
</span><span class="cx"> ui->textEdit->setText(QString("Calling %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
</span><del>- QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Calling").arg(call.data()->getCidName(), call.data()->getCidNumber()));
- item->setData(Qt::UserRole, call.data()->getUUID());
- ui->listCalls->addItem(item);
</del><ins>+
+ ui->tableCalls->setRowCount(ui->tableCalls->rowCount()+1);
+ QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+ item0->setData(Qt::UserRole, call.data()->getUUID());
+ ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,0,item0);
+
+ QTableWidgetItem *item1 = new QTableWidgetItem(tr("Dialing..."));
+ item1->setData(Qt::UserRole, call.data()->getUUID());
+ ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,1,item1);
+
+ ui->tableCalls->resizeColumnsToContents();
+ ui->tableCalls->resizeRowsToContents();
+ ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+
</ins><span class="cx"> ui->hangupBtn->setEnabled(true);
</span><span class="cx"> call.data()->setActive(true);
</span><span class="cx"> }
</span><span class="lines">@@ -311,42 +323,48 @@
</span><span class="cx"> void MainWindow::ringing(QSharedPointer<Call> call)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- for (int i=0; i<ui->listCalls->count(); i++)
</del><ins>+ for (int i=0; i<ui->tableCalls->rowCount(); i++)
</ins><span class="cx"> {
</span><del>- QListWidgetItem *item = ui->listCalls->item(i);
</del><ins>+ QTableWidgetItem *item = ui->tableCalls->item(i, 1);
</ins><span class="cx"> if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
</span><span class="cx"> {
</span><del>- item->setText(tr("%1 - Ringing").arg(call.data()->getCidNumber()));
</del><ins>+ item->setText(tr("Ringing"));
</ins><span class="cx"> ui->textEdit->setText(QString("Call from %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ui->textEdit->setText(QString("Call from %1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
</span><del>- QListWidgetItem *item = new QListWidgetItem(tr("%1 (%2) - Ringing").arg(call.data()->getCidName(), call.data()->getCidNumber()));
- item->setData(Qt::UserRole, call.data()->getUUID());
- ui->listCalls->addItem(item);
</del><ins>+
+ ui->tableCalls->setRowCount(ui->tableCalls->rowCount()+1);
+ QTableWidgetItem *item0 = new QTableWidgetItem(QString("%1 (%2)").arg(call.data()->getCidName(), call.data()->getCidNumber()));
+ item0->setData(Qt::UserRole, call.data()->getUUID());
+ ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,0,item0);
+
+ QTableWidgetItem *item1 = new QTableWidgetItem(tr("Ringing"));
+ item1->setData(Qt::UserRole, call.data()->getUUID());
+ ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,1,item1);
+
+ ui->tableCalls->resizeColumnsToContents();
+ ui->tableCalls->resizeRowsToContents();
+ ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+
</ins><span class="cx"> ui->answerBtn->setEnabled(true);
</span><span class="cx"> call.data()->setActive(true);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void MainWindow::answered(QSharedPointer<Call> call)
</span><span class="cx"> {
</span><del>- for (int i=0; i<ui->listCalls->count(); i++)
</del><ins>+ for (int i=0; i<ui->tableCalls->rowCount(); i++)
</ins><span class="cx"> {
</span><del>- QListWidgetItem *item = ui->listCalls->item(i);
</del><ins>+ QTableWidgetItem *item = ui->tableCalls->item(i, 1);
</ins><span class="cx"> if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
</span><span class="cx"> {
</span><del>- if (call.data()->getDirection() == FSCOMM_CALL_DIRECTION_INBOUND)
- {
- item->setText(tr("%1 (%2) - Active").arg(call.data()->getCidName(), call.data()->getCidNumber()));
- break;
- }
- else
- {
- item->setText(tr("%1 - Active").arg(call.data()->getCidNumber()));
- break;
- }
</del><ins>+ item->setText(tr("Answered"));
+ ui->tableCalls->resizeColumnsToContents();
+ ui->tableCalls->resizeRowsToContents();
+ ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
+ break;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> ui->recoredCallBtn->setEnabled(true);
</span><span class="lines">@@ -371,12 +389,15 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::callFailed(QSharedPointer<Call> call)
</span><span class="cx"> {
</span><del>- for (int i=0; i<ui->listCalls->count(); i++)
</del><ins>+ for (int i=0; i<ui->tableCalls->rowCount(); i++)
</ins><span class="cx"> {
</span><del>- QListWidgetItem *item = ui->listCalls->item(i);
</del><ins>+ QTableWidgetItem *item = ui->tableCalls->item(i, 1);
</ins><span class="cx"> if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
</span><span class="cx"> {
</span><del>- delete ui->listCalls->takeItem(i);
</del><ins>+ ui->tableCalls->removeRow(i);
+ ui->tableCalls->resizeColumnsToContents();
+ ui->tableCalls->resizeRowsToContents();
+ ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -410,12 +431,15 @@
</span><span class="cx">
</span><span class="cx"> void MainWindow::hungup(QSharedPointer<Call> call)
</span><span class="cx"> {
</span><del>- for (int i=0; i<ui->listCalls->count(); i++)
</del><ins>+ for (int i=0; i<ui->tableCalls->rowCount(); i++)
</ins><span class="cx"> {
</span><del>- QListWidgetItem *item = ui->listCalls->item(i);
</del><ins>+ QTableWidgetItem *item = ui->tableCalls->item(i, 1);
</ins><span class="cx"> if (item->data(Qt::UserRole).toString() == call.data()->getUUID())
</span><span class="cx"> {
</span><del>- delete ui->listCalls->takeItem(i);
</del><ins>+ ui->tableCalls->removeRow(i);
+ ui->tableCalls->resizeColumnsToContents();
+ ui->tableCalls->resizeRowsToContents();
+ ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (16430 => 16431)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-01-21 02:51:04 UTC (rev 16430)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-01-21 05:05:56 UTC (rev 16431)
</span><span class="lines">@@ -32,7 +32,7 @@
</span><span class="cx"> #define MAINWINDOW_H
</span><span class="cx">
</span><span class="cx"> #include <QMainWindow>
</span><del>-#include <QListWidgetItem>
</del><ins>+#include <QTableWidgetItem>
</ins><span class="cx"> #include <QSignalMapper>
</span><span class="cx"> #include <QSystemTrayIcon>
</span><span class="cx"> #include <switch.h>
</span><span class="lines">@@ -62,7 +62,7 @@
</span><span class="cx"> void prefTriggered();
</span><span class="cx"> void coreLoadingError(QString);
</span><span class="cx"> void sendDTMF(QString);
</span><del>- void callListDoubleClick(QListWidgetItem *);
</del><ins>+ void callTableDoubleClick(QTableWidgetItem*);
</ins><span class="cx"> void makeCall();
</span><span class="cx"> void fshostReady();
</span><span class="cx"> void paAnswer();
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.ui (16430 => 16431)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.ui 2010-01-21 02:51:04 UTC (rev 16430)
+++ freeswitch/trunk/fscomm/mainwindow.ui 2010-01-21 05:05:56 UTC (rev 16431)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>670</width>
</del><ins>+ <width>716</width>
</ins><span class="cx"> <height>541</height>
</span><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="lines">@@ -256,7 +256,35 @@
</span><span class="cx"> </property>
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_3">
</span><span class="cx"> <item>
</span><del>- <widget class="QListWidget" name="listCalls"/>
</del><ins>+ <widget class="QTableWidget" name="tableCalls">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::SingleSelection</enum>
+ </property>
+ <property name="selectionBehavior">
+ <enum>QAbstractItemView::SelectRows</enum>
+ </property>
+ <property name="showGrid">
+ <bool>false</bool>
+ </property>
+ <column>
+ <property name="text">
+ <string>To/From</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Status</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Time</string>
+ </property>
+ </column>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="lines">@@ -329,7 +357,7 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>670</width>
</del><ins>+ <width>716</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>