<!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][14285] </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=14285">14285</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-17 17:17:58 -0500 (Fri, 17 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>NEW FEATURE: Command history activated upon ARROW_DOWN key.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrccompleterscpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludeconsolepageh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguisrccompleterscpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp (14284 => 14285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp 2009-07-17 20:54:08 UTC (rev 14284)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp 2009-07-17 22:17:58 UTC (rev 14285)
</span><span class="lines">@@ -13,10 +13,9 @@
</span><span class="cx"> {
</span><span class="cx"> QStringList list = listModel->stringList();
</span><span class="cx"> if (!list.contains(cmd, Qt::CaseInsensitive))
</span><del>- list << cmd;
</del><ins>+ list.prepend(cmd);
</ins><span class="cx">
</span><span class="cx"> listModel->setStringList(list);
</span><del>- qDebug() << list;
</del><span class="cx"> }
</span><span class="cx"> QAbstractItemModel *cmdHistory::modelFromFile(const QString& fileName)
</span><span class="cx"> {
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14284 => 14285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-17 20:54:08 UTC (rev 14284)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-17 22:17:58 UTC (rev 14285)
</span><span class="lines">@@ -46,13 +46,14 @@
</span><span class="cx"> consolePage::consolePage(QWidget *parent) :
</span><span class="cx"> QWidget(parent),
</span><span class="cx"> m_ui(new Ui::consolePage),
</span><del>- histCompleter(new cmdHistory)
</del><ins>+ histCompleter(new cmdHistory),
+ lineCmdEventFilter(new keyPressEventFilter(histCompleter))
</ins><span class="cx"> {
</span><span class="cx"> m_ui->setupUi(this);
</span><span class="cx"> setConsoleBackground();
</span><span class="cx"> connect(m_ui->comboLogLevel, SIGNAL(currentIndexChanged(int)),
</span><span class="cx"> this, SLOT(loglevelChanged(int)));
</span><del>- m_ui->lineCmd->setCompleter(histCompleter);
</del><ins>+ m_ui->lineCmd->installEventFilter(lineCmdEventFilter);
</ins><span class="cx"> }
</span><span class="cx"> consolePage::~consolePage()
</span><span class="cx"> {
</span><span class="lines">@@ -224,3 +225,26 @@
</span><span class="cx"> QSettings settings(SETTINGS_ORGANIZATION, SETTINGS_APPLICATION);
</span><span class="cx"> settings.setValue(QString("servers/%1/loglevel").arg(host), m_ui->comboLogLevel->currentIndex());
</span><span class="cx"> }
</span><ins>+/************************************************************************/
+/* keyPressEventFilter */
+/************************************************************************/
+keyPressEventFilter::keyPressEventFilter(cmdHistory* histCompleter) :
+ histCompleter(histCompleter){}
+keyPressEventFilter::~keyPressEventFilter(){}
+bool keyPressEventFilter::eventFilter(QObject *obj, QEvent *e)
+{
+ if (e->type() == QEvent::KeyPress)
+ {
+ // TODO: Might be good to check settings
+ QKeyEvent *keyEvent = static_cast<QKeyEvent *>(e);
+ if (keyEvent->key() == Qt::Key_Up)
+ {
+ QLineEdit * lineCmd = static_cast<QLineEdit *>(obj);
+ lineCmd->setCompleter(histCompleter);
+ histCompleter->setCompletionPrefix(lineCmd->text());
+ histCompleter->complete();
+ return true;
+ }
+ }
+ return QObject::eventFilter(obj, e);
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeconsolepageh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h (14284 => 14285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-17 20:54:08 UTC (rev 14284)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-17 22:17:58 UTC (rev 14285)
</span><span class="lines">@@ -12,6 +12,7 @@
</span><span class="cx"> class ESLeventLog;
</span><span class="cx"> class ESLconnection;
</span><span class="cx"> class cmdHistory;
</span><ins>+class keyPressEventFilter;
</ins><span class="cx">
</span><span class="cx"> class consolePage : public QWidget {
</span><span class="cx"> Q_OBJECT
</span><span class="lines">@@ -42,9 +43,20 @@
</span><span class="cx"> QAbstractItemModel *modelFromFile(const QString& fileName);
</span><span class="cx"> Ui::consolePage *m_ui;
</span><span class="cx"> ESLconnection *eslConnection;
</span><ins>+ cmdHistory *histCompleter;
+ keyPressEventFilter *lineCmdEventFilter;
</ins><span class="cx"> QString host;
</span><ins>+};
+
+class keyPressEventFilter : public QObject {
+ Q_OBJECT
+public:
+ keyPressEventFilter(cmdHistory * histCompleter);
+ virtual ~keyPressEventFilter();
+protected:
+ bool eventFilter(QObject *obj, QEvent *e);
+private:
</ins><span class="cx"> cmdHistory *histCompleter;
</span><del>-
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> #endif // CONSOLEPAGE_H
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>