<!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][14599] </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=14599">14599</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-22 15:48:39 -0500 (Sat, 22 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>UUID searching now available</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14598 => 14599)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-22 19:26:58 UTC (rev 14598)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-22 20:48:39 UTC (rev 14599)
</span><span class="lines">@@ -62,6 +62,16 @@
</span><span class="cx"> QObject::connect(esl, SIGNAL(receivedLogMessage(ESLevent)),
</span><span class="cx"> this, SLOT(gotEvent(ESLevent)));
</span><span class="cx">
</span><ins>+ /* Test SVN version to enable or disable UUID searching */
+ bool ok;
+ int version = QString(FSGUI_SVN_VERSION).toInt(&ok);
+ if (ok) {
+ if (version >= 14598)
+ m_ui->filterSyntaxComboBox->addItem("UUID");
+ /* User is running modified version and must be responsible */
+ } else {
+ m_ui->filterSyntaxComboBox->addItem("UUID");
+ }
</ins><span class="cx">
</span><span class="cx"> esl->connect();
</span><span class="cx">
</span><span class="lines">@@ -111,15 +121,39 @@
</span><span class="cx">
</span><span class="cx"> void ConsoleTabWidget::filterStringChanged()
</span><span class="cx"> {
</span><del>- QRegExp::PatternSyntax syntax =
- QRegExp::PatternSyntax(m_ui->filterSyntaxComboBox->itemData(
- m_ui->filterSyntaxComboBox->currentIndex()).toInt());
</del><span class="cx"> Qt::CaseSensitivity caseSensitivity =
</span><span class="cx"> m_ui->filterCaseSensitivityCheckBox->isChecked() ? Qt::CaseSensitive
</span><span class="cx"> : Qt::CaseInsensitive;
</span><del>-
- QRegExp regExp(m_ui->lineFilter->text(), caseSensitivity, syntax);
- model->setFilterRegExp(regExp);
</del><ins>+ switch (m_ui->filterSyntaxComboBox->currentIndex())
+ {
+ case 0:
+ {
+ QRegExp regExp(m_ui->lineFilter->text(), caseSensitivity, QRegExp::RegExp2);
+ model->setUUIDFilterLog(QString());
+ model->setFilterRegExp(regExp);
+ break;
+ }
+ case 1:
+ {
+ QRegExp regExp(m_ui->lineFilter->text(), caseSensitivity, QRegExp::Wildcard);
+ model->setUUIDFilterLog(QString());
+ model->setFilterRegExp(regExp);
+ break;
+ }
+ case 2:
+ {
+ QRegExp regExp(m_ui->lineFilter->text(), caseSensitivity, QRegExp::FixedString);
+ model->setUUIDFilterLog(QString());
+ model->setFilterRegExp(regExp);
+ break;
+ }
+ default:
+ {
+ model->setFilterRegExp(QString());
+ model->setUUIDFilterLog(m_ui->lineFilter->text());
+ break;
+ }
+ }
</ins><span class="cx"> m_ui->btnFilterClear->setDisabled(m_ui->lineFilter->text().isEmpty());
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -171,7 +205,8 @@
</span><span class="cx"> for (int line = 0; line < lines.size(); ++line)
</span><span class="cx"> {
</span><span class="cx"> QStandardItem *item = new QStandardItem(lines[line]);
</span><del>- item->setData(event._headers.value("Log-Level").toInt(), Qt::UserRole);
</del><ins>+ item->setData(event._headers.value("Log-Level").toInt(), ConsoleModel::LogLevelRole);
+ item->setData(event._headers.value("User-Data"), ConsoleModel::UUIDRole);
</ins><span class="cx"> addNewConsoleItem(item);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp (14598 => 14599)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-08-22 19:26:58 UTC (rev 14598)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-08-22 20:48:39 UTC (rev 14599)
</span><span class="lines">@@ -75,10 +75,21 @@
</span><span class="cx"> invalidateFilter();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void SortFilterProxyModel::setUUIDFilterLog(QString uuid)
+{
+ _uuid = uuid;
+ invalidateFilter();
+}
+
</ins><span class="cx"> bool SortFilterProxyModel::filterAcceptsRow(int source_row, const QModelIndex &source_parent) const
</span><span class="cx"> {
</span><span class="cx"> QModelIndex index0 = sourceModel()->index(source_row, 0, source_parent);
</span><ins>+ bool uuidMatch = true;
</ins><span class="cx">
</span><ins>+ if (!_uuid.isEmpty())
+ uuidMatch = (sourceModel()->data(index0, ConsoleModel::UUIDRole).toString() == _uuid);
+
</ins><span class="cx"> return (loglevels.value(sourceModel()->data(index0, Qt::UserRole).toInt()) == true
</span><del>- && sourceModel()->data(index0).toString().contains(filterRegExp()));
</del><ins>+ && sourceModel()->data(index0).toString().contains(filterRegExp())
+ && uuidMatch);
</ins><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h (14598 => 14599)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h 2009-08-22 19:26:58 UTC (rev 14598)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.h 2009-08-22 20:48:39 UTC (rev 14599)
</span><span class="lines">@@ -19,6 +19,11 @@
</span><span class="cx"> QVariant data ( const QModelIndex & index, int role = Qt::DisplayRole ) const;
</span><span class="cx"> void appendRow ( QStandardItem* item );
</span><span class="cx"> void clear();
</span><ins>+
+ enum {
+ LogLevelRole = Qt::UserRole,
+ UUIDRole
+ };
</ins><span class="cx"> protected:
</span><span class="cx"> void timerEvent(QTimerEvent *);
</span><span class="cx"> private:
</span><span class="lines">@@ -35,12 +40,14 @@
</span><span class="cx"> public:
</span><span class="cx"> SortFilterProxyModel(QObject *parent = 0);
</span><span class="cx"> void setLogLevelFilter(int level, bool state);
</span><ins>+ void setUUIDFilterLog(QString uuid);
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const;
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> QVector<bool> loglevels;
</span><ins>+ QString _uuid;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // SORTFILTERPROXYMODEL_H
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>