<!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][14494] </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=14494">14494</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-08-11 23:48:37 -0500 (Tue, 11 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix ListView scroll to non-blocking. Unfortunately we have to do delayed scrolling now...</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsoleplugincentralWidgetui">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh">freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h</a></li>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsoleplugincentralWidgetui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui (14493 => 14494)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui 2009-08-12 04:11:33 UTC (rev 14493)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/centralWidget.ui 2009-08-12 04:48:37 UTC (rev 14494)
</span><span class="lines">@@ -72,9 +72,16 @@
</span><span class="cx"> <addaction name="action_Clear"/>
</span><span class="cx"> <addaction name="separator"/>
</span><span class="cx"> </widget>
</span><ins>+ <widget class="QMenu" name="menu_Console">
+ <property name="title">
+ <string>&amp;Console</string>
+ </property>
+ <addaction name="actionAutomatic_Scroll"/>
+ </widget>
</ins><span class="cx"> <addaction name="menu_File"/>
</span><span class="cx"> <addaction name="menu_Edit"/>
</span><span class="cx"> <addaction name="menu_Server"/>
</span><ins>+ <addaction name="menu_Console"/>
</ins><span class="cx"> </widget>
</span><span class="cx"> <widget class="QStatusBar" name="statusbar"/>
</span><span class="cx"> <action name="action_Connect">
</span><span class="lines">@@ -111,6 +118,17 @@
</span><span class="cx"> <string>&amp;Clear</string>
</span><span class="cx"> </property>
</span><span class="cx"> </action>
</span><ins>+ <action name="actionAutomatic_Scroll">
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>true</bool>
+ </property>
+ <property name="text">
+ <string>&amp;Automatic Scroll</string>
+ </property>
+ </action>
</ins><span class="cx"> </widget>
</span><span class="cx"> <resources>
</span><span class="cx"> <include location="../../resources/resources.qrc"/>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoleplugincpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp (14493 => 14494)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-12 04:11:33 UTC (rev 14493)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.cpp 2009-08-12 04:48:37 UTC (rev 14494)
</span><span class="lines">@@ -27,6 +27,8 @@
</span><span class="cx"> this, SLOT(disconnect()));
</span><span class="cx"> QObject::connect(consoleWindow->action_Clear, SIGNAL(triggered()),
</span><span class="cx"> this, SLOT(clearLogContents()));
</span><ins>+ QObject::connect(consoleWindow->actionAutomatic_Scroll, SIGNAL(toggled(bool)),
+ this, SLOT(setAutoScroll(bool)));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ConsolePlugin::~ConsolePlugin(){}
</span><span class="lines">@@ -396,29 +398,44 @@
</span><span class="cx"> void ConsolePlugin::tabChanged(int index)
</span><span class="cx"> {
</span><span class="cx"> ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(index), NULL);
</span><ins>+ ConsoleTabWidget *tab = qobject_cast<ConsoleTabWidget *>(consoleWindow->tabConsole->currentWidget());
</ins><span class="cx"> if (esl)
</span><span class="cx"> {
</span><span class="cx"> consoleWindow->action_Connect->setDisabled(esl->isConnected());
</span><span class="cx"> consoleWindow->action_Disconnect->setEnabled(esl->isConnected());
</span><ins>+ consoleWindow->actionAutomatic_Scroll->setChecked(tab->getAutomaticScroll());
+ consoleWindow->actionAutomatic_Scroll->setEnabled(esl->isConnected());
+ tab->flipScrollTimer();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsolePlugin::connect()
</span><span class="cx"> {
</span><span class="cx"> ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()), NULL);
</span><ins>+ ConsoleTabWidget *tab = qobject_cast<ConsoleTabWidget *>(consoleWindow->tabConsole->currentWidget());
</ins><span class="cx"> if (esl)
</span><span class="cx"> {
</span><span class="cx"> esl->connect();
</span><ins>+ tab->flipScrollTimer();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsolePlugin::disconnect()
</span><span class="cx"> {
</span><span class="cx"> ESLconnection *esl = hashESL.value(consoleWindow->tabConsole->tabText(consoleWindow->tabConsole->currentIndex()), NULL);
</span><ins>+ ConsoleTabWidget *tab = qobject_cast<ConsoleTabWidget *>(consoleWindow->tabConsole->currentWidget());
</ins><span class="cx"> if (esl)
</span><span class="cx"> {
</span><span class="cx"> esl->disconnect();
</span><ins>+ tab->flipScrollTimer();
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ConsolePlugin::setAutoScroll(bool checked)
+{
+ ConsoleTabWidget *tab = qobject_cast<ConsoleTabWidget *>(consoleWindow->tabConsole->currentWidget());
+ tab->setAutomaticScroll(checked);
+ tab->flipScrollTimer();
+}
+
</ins><span class="cx"> Q_EXPORT_PLUGIN2(consoleplugin, ConsolePlugin)
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsolepluginh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h (14493 => 14494)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-12 04:11:33 UTC (rev 14493)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoleplugin.h 2009-08-12 04:48:37 UTC (rev 14494)
</span><span class="lines">@@ -51,6 +51,7 @@
</span><span class="cx"> void changeDebugForegroundColor();
</span><span class="cx"> void tabClose(int index);
</span><span class="cx"> void tabChanged(int index);
</span><ins>+ void setAutoScroll(bool checked);
</ins><span class="cx"> void readSettings();
</span><span class="cx"> void writeSettings();
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp (14493 => 14494)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-12 04:11:33 UTC (rev 14493)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.cpp 2009-08-12 04:48:37 UTC (rev 14494)
</span><span class="lines">@@ -6,7 +6,9 @@
</span><span class="cx"> QWidget(parent),
</span><span class="cx"> m_ui(new Ui::ConsoleTabWidget),
</span><span class="cx"> esl(eslconnection),
</span><del>- findNext(false)
</del><ins>+ scrollTimer(new QTimer),
+ findNext(false),
+ autoScroll(true)
</ins><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><span class="cx"> sourceModel = new QStandardItemModel(this);
</span><span class="lines">@@ -48,6 +50,9 @@
</span><span class="cx"> QObject::connect(esl, SIGNAL(gotEvent(ESLevent*)),
</span><span class="cx"> this, SLOT(gotEvent(ESLevent*)));
</span><span class="cx">
</span><ins>+ QObject::connect(scrollTimer, SIGNAL(timeout()),
+ this, SLOT(conditionalScroll()));
+
</ins><span class="cx"> esl->connect();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -73,6 +78,38 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void ConsoleTabWidget::flipScrollTimer()
+{
+ if (!esl->isConnected())
+ {
+ scrollTimer->stop();
+ return;
+ }
+
+ if (scrollTimer->isActive())
+ scrollTimer->stop();
+ else if (autoScroll)
+ scrollTimer->start(500);
+}
+
+void ConsoleTabWidget::setAutomaticScroll(bool enabled)
+{
+ qDebug() << "setAutomaticScroll to:" << enabled;
+ autoScroll = enabled;
+}
+
+bool ConsoleTabWidget::getAutomaticScroll()
+{
+ return autoScroll;
+}
+
+void ConsoleTabWidget::conditionalScroll()
+{
+ //if (m_ui->consoleListView->verticalScrollBar()->value() == m_ui->consoleListView->verticalScrollBar()->maximum())
+ qDebug() << "Asked to scroll!";
+ m_ui->consoleListView->scrollToBottom();
+}
+
</ins><span class="cx"> void ConsoleTabWidget::find()
</span><span class="cx"> {
</span><span class="cx"> if (m_ui->lineFind->text().isEmpty())
</span><span class="lines">@@ -155,12 +192,8 @@
</span><span class="cx"> for (int line = 0; line<textList.size(); line++)
</span><span class="cx"> {
</span><span class="cx"> final_str += textList[line];
</span><del>- if (line == textList.size()-1)
- {
- final_str.chop(1);
- }
</del><span class="cx"> }
</span><del>- QStringList lines = final_str.split('\n', QString::SkipEmptyParts);
</del><ins>+ QStringList lines = final_str.split(QRegExp("(\n+)"), QString::SkipEmptyParts);
</ins><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><span class="lines">@@ -178,15 +211,7 @@
</span><span class="cx"> QPalette palette = settings.value(QString("log-level-%1-palette").arg(item->data(Qt::UserRole).toInt())).value<QPalette>();
</span><span class="cx"> item->setBackground(palette.base());
</span><span class="cx"> item->setForeground(palette.text());
</span><del>- if (m_ui->consoleListView->verticalScrollBar()->value() == m_ui->consoleListView->verticalScrollBar()->maximum())
- {
- sourceModel->appendRow(item);
- m_ui->consoleListView->scrollToBottom();
- }
- else
- {
- sourceModel->appendRow(item);
- }
</del><ins>+ sourceModel->appendRow(item);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ConsoleTabWidget::cmdSendClicked()
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgeth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h (14493 => 14494)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-12 04:11:33 UTC (rev 14493)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.h 2009-08-12 04:48:37 UTC (rev 14494)
</span><span class="lines">@@ -10,6 +10,7 @@
</span><span class="cx">
</span><span class="cx"> class QStandardItem;
</span><span class="cx"> class QStandardItemModel;
</span><ins>+class QTimer;
</ins><span class="cx"> class ESLconnection;
</span><span class="cx"> class ESLevent;
</span><span class="cx">
</span><span class="lines">@@ -21,11 +22,15 @@
</span><span class="cx">
</span><span class="cx"> public slots:
</span><span class="cx"> void clearConsoleContents();
</span><ins>+ void flipScrollTimer();
+ void setAutomaticScroll(bool enabled);
+ bool getAutomaticScroll();
</ins><span class="cx">
</span><span class="cx"> protected:
</span><span class="cx"> void changeEvent(QEvent *e);
</span><span class="cx">
</span><span class="cx"> private slots:
</span><ins>+ void conditionalScroll();
</ins><span class="cx"> void find();
</span><span class="cx"> void findStringChanged(QString);
</span><span class="cx"> void connected();
</span><span class="lines">@@ -49,7 +54,10 @@
</span><span class="cx"> QModelIndexList foundItems;
</span><span class="cx"> SortFilterProxyModel *model;
</span><span class="cx"> ESLconnection *esl;
</span><ins>+ QTimer *scrollTimer;
</ins><span class="cx"> bool findNext;
</span><ins>+ bool autoScroll;
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // CONSOLETABWIDGET_H
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcpluginsconsolepluginconsoletabwidgetui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui (14493 => 14494)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-08-12 04:11:33 UTC (rev 14493)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/plugins/consoleplugin/consoletabwidget.ui 2009-08-12 04:48:37 UTC (rev 14494)
</span><span class="lines">@@ -19,6 +19,12 @@
</span><span class="cx"> <property name="title">
</span><span class="cx"> <string>Find</string>
</span><span class="cx"> </property>
</span><ins>+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
</ins><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_3">
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QLineEdit" name="lineFind"/>
</span><span class="lines">@@ -43,7 +49,17 @@
</span><span class="cx"> <item>
</span><span class="cx"> <layout class="QHBoxLayout" name="horizontalLayout_2">
</span><span class="cx"> <item>
</span><del>- <widget class="QListView" name="consoleListView"/>
</del><ins>+ <widget class="QListView" name="consoleListView">
+ <property name="editTriggers">
+ <set>QAbstractItemView::NoEditTriggers</set>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="layoutMode">
+ <enum>QListView::SinglePass</enum>
+ </property>
+ </widget>
</ins><span class="cx"> </item>
</span><span class="cx"> <item>
</span><span class="cx"> <widget class="QGroupBox" name="groupBox">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>