<!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][16481] </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=16481">16481</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2010-01-23 12:36:25 -0600 (Sat, 23 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Do you have the time?</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkfscommfshosth">freeswitch/trunk/fscomm/fshost.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkfscommfshosth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/fshost.h (16480 => 16481)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/fshost.h 2010-01-23 18:35:05 UTC (rev 16480)
+++ freeswitch/trunk/fscomm/fshost.h 2010-01-23 18:36:25 UTC (rev 16481)
</span><span class="lines">@@ -65,6 +65,7 @@
</span><span class="cx"> void delAccount(QSharedPointer<Account>);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><ins>+ /* We need to wait for the gateway deletion before reloading it */
</ins><span class="cx"> void accountReloadSlot(QSharedPointer<Account>);
</span><span class="cx">
</span><span class="cx"> private:
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.cpp (16480 => 16481)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-23 18:35:05 UTC (rev 16480)
+++ freeswitch/trunk/fscomm/mainwindow.cpp 2010-01-23 18:36:25 UTC (rev 16481)
</span><span class="lines">@@ -110,6 +110,11 @@
</span><span class="cx"> /* Set other properties */
</span><span class="cx"> ui->tableAccounts->horizontalHeader()->setStretchLastSection(true);
</span><span class="cx">
</span><ins>+ /* Set the call timer */
+ callTimer = new QTimer(this);
+ callTimer->setInterval(1000);
+ connect(callTimer, SIGNAL(timeout()), this, SLOT(updateCallTimers()));
+ callTimer->start();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MainWindow::~MainWindow()
</span><span class="lines">@@ -120,6 +125,17 @@
</span><span class="cx"> g_FSHost.wait();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MainWindow::updateCallTimers()
+{
+ for(int row=0; row<ui->tableCalls->rowCount(); row++)
+ {
+ QTableWidgetItem* item = ui->tableCalls->item(row, 2);
+ QTime time = QTime::fromString(item->text(),"hh:mm:ss");
+ time = time.addSecs(1);
+ item->setText(time.toString("hh:mm:ss"));
+ }
+}
+
</ins><span class="cx"> void MainWindow::setDefaultAccount()
</span><span class="cx"> {
</span><span class="cx"> QString accName = ui->tableAccounts->item(ui->tableAccounts->selectedRanges()[0].topRow(), 0)->text();
</span><span class="lines">@@ -199,7 +215,6 @@
</span><span class="cx"> g_FSHost.getCurrentActiveCall().data()->sendDTMF(dtmf);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-/* TODO: Update the timers and the item text! */
</del><span class="cx"> void MainWindow::callTableDoubleClick(QTableWidgetItem *item)
</span><span class="cx"> {
</span><span class="cx"> QSharedPointer<Call> lastCall = g_FSHost.getCurrentActiveCall();
</span><span class="lines">@@ -314,6 +329,10 @@
</span><span class="cx"> item1->setData(Qt::UserRole, call.data()->getUUID());
</span><span class="cx"> ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,1,item1);
</span><span class="cx">
</span><ins>+ QTableWidgetItem *item2 = new QTableWidgetItem("00:00:00");
+ item2->setData(Qt::UserRole, call.data()->getUUID());
+ ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,2,item2);
+
</ins><span class="cx"> ui->tableCalls->resizeColumnsToContents();
</span><span class="cx"> ui->tableCalls->resizeRowsToContents();
</span><span class="cx"> ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
</span><span class="lines">@@ -347,6 +366,10 @@
</span><span class="cx"> item1->setData(Qt::UserRole, call.data()->getUUID());
</span><span class="cx"> ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,1,item1);
</span><span class="cx">
</span><ins>+ QTableWidgetItem *item2 = new QTableWidgetItem("00:00:00");
+ item2->setData(Qt::UserRole, call.data()->getUUID());
+ ui->tableCalls->setItem(ui->tableCalls->rowCount()-1,2,item2);
+
</ins><span class="cx"> ui->tableCalls->resizeColumnsToContents();
</span><span class="cx"> ui->tableCalls->resizeRowsToContents();
</span><span class="cx"> ui->tableCalls->horizontalHeader()->setStretchLastSection(true);
</span></span></pre></div>
<a id="freeswitchtrunkfscommmainwindowh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/fscomm/mainwindow.h (16480 => 16481)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/fscomm/mainwindow.h 2010-01-23 18:35:05 UTC (rev 16480)
+++ freeswitch/trunk/fscomm/mainwindow.h 2010-01-23 18:36:25 UTC (rev 16481)
</span><span class="lines">@@ -79,12 +79,14 @@
</span><span class="cx"> void accountDel(QSharedPointer<Account>);
</span><span class="cx"> void accountStateChanged(QSharedPointer<Account>);
</span><span class="cx"> void sysTrayActivated(QSystemTrayIcon::ActivationReason reason);
</span><ins>+ void updateCallTimers();
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> Ui::MainWindow *ui;
</span><span class="cx"> QSignalMapper *dialpadMapper;
</span><span class="cx"> PrefDialog *preferences;
</span><span class="cx"> QSystemTrayIcon *sysTray;
</span><ins>+ QTimer *callTimer;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // MAINWINDOW_H
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>