<!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][14504] </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=14504">14504</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-13 03:23:08 -0500 (Thu, 13 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>We can now filter realtime.</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="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgeth">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetui">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelcpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp</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 (14503 => 14504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-13 07:05:53 UTC (rev 14503)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-13 08:23:08 UTC (rev 14504)
</span><span class="lines">@@ -36,10 +36,14 @@
</span><span class="cx"> QObject::connect(m_ui->checkDebug, SIGNAL(clicked(bool)),
</span><span class="cx"> this, SLOT(checkDebug(bool)));
</span><span class="cx">
</span><del>- QObject::connect(m_ui->btnFind, SIGNAL(clicked()),
- this, SLOT(find()));
- QObject::connect(m_ui->lineFind, SIGNAL(textChanged(QString)),
- this, SLOT(findStringChanged(QString)));
</del><ins>+ QObject::connect(m_ui->btnFilterClear, SIGNAL(clicked()),
+ this, SLOT(filterClear()));
+ QObject::connect(m_ui->lineFilter, SIGNAL(textChanged(QString)),
+ this, SLOT(filterStringChanged()));
+ QObject::connect(m_ui->filterCaseSensitivityCheckBox, SIGNAL(toggled(bool)),
+ this, SLOT(filterStringChanged()));
+ QObject::connect(m_ui->filterSyntaxComboBox, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(filterStringChanged()));
</ins><span class="cx">
</span><span class="cx"> QObject::connect(esl, SIGNAL(connected()),
</span><span class="cx"> this, SLOT(connected()));
</span><span class="lines">@@ -108,47 +112,23 @@
</span><span class="cx"> m_ui->consoleListView->scrollToBottom();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleTabWidget::find()
</del><ins>+void ConsoleTabWidget::filterClear()
</ins><span class="cx"> {
</span><del>- if (m_ui->lineFind->text().isEmpty())
- return;
-
- QModelIndexList index;
- if (m_ui->consoleListView->currentIndex().isValid())
- {
- index = model->match(m_ui->consoleListView->currentIndex(), Qt::DisplayRole, m_ui->lineFind->text(), -1, Qt::MatchContains|Qt::MatchWrap);
- }
- else
- {
- index = model->match(model->index(0,0), Qt::DisplayRole, m_ui->lineFind->text(), -1, Qt::MatchContains|Qt::MatchWrap);
- }
-
- if (index.isEmpty())
- {
- QMessageBox::warning(this, tr("No match"), tr("No match found!"));
- }
- else
- {
- if (findNext == true && index.count() > 1)
- {
- m_ui->consoleListView->scrollTo(index.at(1));
- m_ui->consoleListView->setCurrentIndex(index.at(1));
- }
- else
- {
- m_ui->consoleListView->scrollTo(index.at(0));
- m_ui->consoleListView->setCurrentIndex(index.at(0));
- }
- findNext = true;
- m_ui->btnFind->setText(tr("Find Next"));
- }
</del><ins>+ m_ui->lineFilter->clear();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void ConsoleTabWidget::findStringChanged(QString findString)
</del><ins>+void ConsoleTabWidget::filterStringChanged()
</ins><span class="cx"> {
</span><del>- m_ui->btnFind->setDisabled(findString.isEmpty());
- m_ui->btnFind->setText(tr("Find"));
- findNext = false;
</del><ins>+ QRegExp::PatternSyntax syntax =
+ QRegExp::PatternSyntax(m_ui->filterSyntaxComboBox->itemData(
+ m_ui->filterSyntaxComboBox->currentIndex()).toInt());
+ Qt::CaseSensitivity caseSensitivity =
+ m_ui->filterCaseSensitivityCheckBox->isChecked() ? Qt::CaseSensitive
+ : Qt::CaseInsensitive;
+
+ QRegExp regExp(m_ui->lineFilter->text(), caseSensitivity, syntax);
+ model->setFilterRegExp(regExp);
+ m_ui->btnFilterClear->setDisabled(m_ui->lineFilter->text().isEmpty());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsoleTabWidget::connected()
</span><span class="lines">@@ -200,6 +180,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> delete event;
</span><ins>+
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsoleTabWidget::addNewConsoleItem(QStandardItem *item)
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgeth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h (14503 => 14504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-13 07:05:53 UTC (rev 14503)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-13 08:23:08 UTC (rev 14504)
</span><span class="lines">@@ -31,8 +31,8 @@
</span><span class="cx">
</span><span class="cx"> private slots:
</span><span class="cx"> void conditionalScroll();
</span><del>- void find();
- void findStringChanged(QString);
</del><ins>+ void filterClear();
+ void filterStringChanged();
</ins><span class="cx"> void connected();
</span><span class="cx"> void disconnected();
</span><span class="cx"> void connectionFailed(QString);
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui (14503 => 14504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-08-13 07:05:53 UTC (rev 14503)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-08-13 08:23:08 UTC (rev 14504)
</span><span class="lines">@@ -6,18 +6,18 @@
</span><span class="cx"> <rect>
</span><span class="cx"> <x>0</x>
</span><span class="cx"> <y>0</y>
</span><del>- <width>630</width>
- <height>499</height>
</del><ins>+ <width>657</width>
+ <height>445</height>
</ins><span class="cx"> </rect>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="windowTitle">
</span><span class="cx"> <string>Form</string>
</span><span class="cx"> </property>
</span><del>- <layout class="QVBoxLayout" name="verticalLayout_2">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_3">
</ins><span class="cx"> <item>
</span><span class="cx"> <widget class="QGroupBox" name="groupBox_2">
</span><span class="cx"> <property name="title">
</span><del>- <string>Find</string>
</del><ins>+ <string>Filter</string>
</ins><span class="cx"> </property>
</span><span class="cx"> <property name="flat">
</span><span class="cx"> <bool>false</bool>
</span><span class="lines">@@ -25,23 +25,72 @@
</span><span class="cx"> <property name="checkable">
</span><span class="cx"> <bool>false</bool>
</span><span class="cx"> </property>
</span><del>- <layout class="QHBoxLayout" name="horizontalLayout_3">
</del><ins>+ <layout class="QVBoxLayout" name="verticalLayout_2">
</ins><span class="cx"> <item>
</span><del>- <widget class="QLineEdit" name="lineFind"/>
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_3">
+ <item>
+ <widget class="QLineEdit" name="lineFilter"/>
+ </item>
+ <item>
+ <widget class="QComboBox" name="filterSyntaxComboBox">
+ <property name="sizeAdjustPolicy">
+ <enum>QComboBox::AdjustToContentsOnFirstShow</enum>
+ </property>
+ <item>
+ <property name="text">
+ <string>Regular Expression</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Wildcard</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Fixed String</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="btnFilterClear">
+ <property name="enabled">
+ <bool>false</bool>
+ </property>
+ <property name="text">
+ <string>&amp;Clear</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><del>- <widget class="QPushButton" name="btnFind">
- <property name="enabled">
- <bool>false</bool>
- </property>
- <property name="text">
- <string>Find</string>
- </property>
- <property name="icon">
- <iconset resource="../../resources/resources.qrc">
- <normaloff>:/icons/find_icon.png</normaloff>:/icons/find_icon.png</iconset>
- </property>
- </widget>
</del><ins>+ <layout class="QHBoxLayout" name="horizontalLayout_4">
+ <item>
+ <widget class="QCheckBox" name="filterCaseSensitivityCheckBox">
+ <property name="text">
+ <string>Case sensitive filter</string>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>448</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</ins><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><span class="lines">@@ -221,10 +270,6 @@
</span><span class="cx"> </item>
</span><span class="cx"> </layout>
</span><span class="cx"> </widget>
</span><del>- <resources>
- <include location="../../resources/resources.qrc"/>
- <include location="../../resources/resources.qrc"/>
- <include location="../../resources/resources.qrc"/>
- </resources>
</del><ins>+ <resources/>
</ins><span class="cx"> <connections/>
</span><span class="cx"> </ui>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginsortfilterproxymodelcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp (14503 => 14504)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-08-13 07:05:53 UTC (rev 14503)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/sortfilterproxymodel.cpp 2009-08-13 08:23:08 UTC (rev 14504)
</span><span class="lines">@@ -19,5 +19,6 @@
</span><span class="cx"> {
</span><span class="cx"> QModelIndex index0 = sourceModel()->index(source_row, 0, source_parent);
</span><span class="cx">
</span><del>- return loglevels.value(sourceModel()->data(index0, Qt::UserRole).toInt()) == true;
</del><ins>+ return (loglevels.value(sourceModel()->data(index0, Qt::UserRole).toInt()) == true
+ && sourceModel()->data(index0).toString().contains(filterRegExp()));
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>