<!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][14284] </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=14284">14284</a></dd>
<dt>Author</dt> <dd>jmesquita</dd>
<dt>Date</dt> <dd>2009-07-17 15:54:08 -0500 (Fri, 17 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>NEW FEATURE: An initial command history autocomplete.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguifsguipro">freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcespreferencesdialogui">freeswitch/trunk/contrib/jmesquita/fsgui/resources/preferencesdialog.ui</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>
<h3>Added Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesresourcesqrc">freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrccompleterscpp">freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp</a></li>
<li><a href="#freeswitchtrunkcontribjmesquitafsguisrcincludecompletersh">freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#freeswitchtrunkcontribjmesquitafsguiresourcesimagesqrc">freeswitch/trunk/contrib/jmesquita/fsgui/resources/images.qrc</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunkcontribjmesquitafsguifsguipro"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro (14283 => 14284)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-17 20:42:24 UTC (rev 14283)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/fsgui.pro 2009-07-17 20:54:08 UTC (rev 14284)
</span><span class="lines">@@ -10,7 +10,8 @@
</span><span class="cx"> src/server_manager.cpp \
</span><span class="cx"> src/esl_connection.cpp \
</span><span class="cx"> src/consolepage.cpp \
</span><del>- src/preferencesdialog.cpp
</del><ins>+ src/preferencesdialog.cpp \
+ src/completers.cpp
</ins><span class="cx"> INCLUDEPATH += ../../../libs/esl/src/include \
</span><span class="cx"> src/include
</span><span class="cx"> HEADERS += src/include/fs_gui.h \
</span><span class="lines">@@ -18,11 +19,12 @@
</span><span class="cx"> src/include/esl_connection.h \
</span><span class="cx"> src/include/consolepage.h \
</span><span class="cx"> src/include/global_defines.h \
</span><del>- src/include/preferencesdialog.h
</del><ins>+ src/include/preferencesdialog.h \
+ src/include/completers.h
</ins><span class="cx"> FORMS += resources/fs_gui.ui \
</span><span class="cx"> resources/server_manager.ui \
</span><span class="cx"> resources/consolepage.ui \
</span><span class="cx"> resources/preferencesdialog.ui
</span><span class="cx"> LIBS += -L../../../libs/esl \
</span><span class="cx"> -lesl
</span><del>-RESOURCES += resources/images.qrc
</del><ins>+RESOURCES += resources/resources.qrc
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcesimagesqrc"></a>
<div class="delfile"><h4>Deleted: freeswitch/trunk/contrib/jmesquita/fsgui/resources/images.qrc</h4></div>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcespreferencesdialogui"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/resources/preferencesdialog.ui (14283 => 14284)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/preferencesdialog.ui 2009-07-17 20:42:24 UTC (rev 14283)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/preferencesdialog.ui 2009-07-17 20:54:08 UTC (rev 14284)
</span><span class="lines">@@ -47,7 +47,7 @@
</span><span class="cx"> <string>Console</string>
</span><span class="cx"> </property>
</span><span class="cx"> <property name="icon">
</span><del>- <iconset resource="images.qrc">
</del><ins>+ <iconset resource="resources.qrc">
</ins><span class="cx"> <normaloff>:/preferences/images/utilities-terminal.svg</normaloff>:/preferences/images/utilities-terminal.svg</iconset>
</span><span class="cx"> </property>
</span><span class="cx"> </item>
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguiresourcesresourcesqrc"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc (0 => 14284)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/resources/resources.qrc 2009-07-17 20:54:08 UTC (rev 14284)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+<RCC>
+ <qresource prefix="/preferences" >
+ <file>images/utilities-terminal.svg</file>
+ </qresource>
+ <qresource prefix="/history" >
+ <file>history.txt</file>
+ </qresource>
+</RCC>
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrccompleterscpp"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp (0 => 14284)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/completers.cpp 2009-07-17 20:54:08 UTC (rev 14284)
</span><span class="lines">@@ -0,0 +1,51 @@
</span><ins>+#include <QtGui>
+#include "completers.h"
+
+cmdHistory::cmdHistory()
+{
+ this->setModel(modelFromFile(":/resources/history.txt"));
+}
+cmdHistory::~cmdHistory()
+{
+ writeHistoryFile(":/resources/history.txt");
+}
+void cmdHistory::addStringToModel(QString cmd)
+{
+ QStringList list = listModel->stringList();
+ if (!list.contains(cmd, Qt::CaseInsensitive))
+ list << cmd;
+
+ listModel->setStringList(list);
+ qDebug() << list;
+}
+QAbstractItemModel *cmdHistory::modelFromFile(const QString& fileName)
+ {
+ QFile file(fileName);
+ if (!file.open(QFile::ReadOnly))
+ {
+ listModel = new QStringListModel(this);
+ return listModel;
+ }
+
+ QStringList words;
+
+ while (!file.atEnd()) {
+ QByteArray line = file.readLine();
+ if (!line.isEmpty())
+ words << line.trimmed();
+ }
+ listModel = new QStringListModel(words, this);
+ return listModel;
+ }
+void cmdHistory::writeHistoryFile(const QString& fileName)
+{
+ /*QFile file(fileName);
+ file.remove(fileName);
+ file.open(QFile::WriteOnly);
+ QStringList list = listModel->stringList();
+ for (int i = 0; i < list.size(); i++)
+ {
+ file.write(list[i].toAscii());
+ qDebug() << list[i];
+ }*/
+}
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcconsolepagecpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp (14283 => 14284)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-17 20:42:24 UTC (rev 14283)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/consolepage.cpp 2009-07-17 20:54:08 UTC (rev 14284)
</span><span class="lines">@@ -37,6 +37,7 @@
</span><span class="cx"> */
</span><span class="cx"> #include <QtGui>
</span><span class="cx"> #include "consolepage.h"
</span><ins>+#include "completers.h"
</ins><span class="cx"> #include "ui_consolepage.h"
</span><span class="cx"> #include "esl_connection.h"
</span><span class="cx"> #include "esl.h"
</span><span class="lines">@@ -44,12 +45,14 @@
</span><span class="cx">
</span><span class="cx"> consolePage::consolePage(QWidget *parent) :
</span><span class="cx"> QWidget(parent),
</span><del>- m_ui(new Ui::consolePage)
</del><ins>+ m_ui(new Ui::consolePage),
+ histCompleter(new cmdHistory)
</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><ins>+ m_ui->lineCmd->setCompleter(histCompleter);
</ins><span class="cx"> }
</span><span class="cx"> consolePage::~consolePage()
</span><span class="cx"> {
</span><span class="lines">@@ -60,6 +63,7 @@
</span><span class="cx"> eslConnection->wait();
</span><span class="cx"> }
</span><span class="cx"> delete eslConnection;
</span><ins>+ delete histCompleter;
</ins><span class="cx"> delete m_ui;
</span><span class="cx"> }
</span><span class="cx"> void consolePage::setConsoleBackground()
</span><span class="lines">@@ -137,6 +141,7 @@
</span><span class="cx"> }
</span><span class="cx"> ESLevent *e = new ESLevent(eslConnection->bgapi(cmdList[0].toAscii(), args.toAscii()));
</span><span class="cx"> gotEventSlot(e);
</span><ins>+ histCompleter->addStringToModel(m_ui->lineCmd->text());
</ins><span class="cx"> m_ui->lineCmd->clear();
</span><span class="cx"> }
</span><span class="cx"> void consolePage::gotConnectedSlot()
</span></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludecompletersh"></a>
<div class="addfile"><h4>Added: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h (0 => 14284)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h (rev 0)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/completers.h 2009-07-17 20:54:08 UTC (rev 14284)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+#ifndef COMPLETERS_H
+#define COMPLETERS_H
+
+#include <QCompleter>
+
+class QStringListModel;
+
+class cmdHistory : public QCompleter
+{
+ Q_OBJECT
+
+public:
+ cmdHistory();
+ ~cmdHistory();
+ void addStringToModel(QString);
+private:
+ QStringListModel *listModel;
+ QAbstractItemModel *modelFromFile(const QString& fileName);
+ void writeHistoryFile(const QString& fileName);
+};
+
+#endif // COMPLETERS_H
</ins></span></pre></div>
<a id="freeswitchtrunkcontribjmesquitafsguisrcincludeconsolepageh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h (14283 => 14284)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-17 20:42:24 UTC (rev 14283)
+++ freeswitch/trunk/contrib/jmesquita/fsgui/src/include/consolepage.h 2009-07-17 20:54:08 UTC (rev 14284)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> #ifndef CONSOLEPAGE_H
</span><span class="cx"> #define CONSOLEPAGE_H
</span><span class="cx">
</span><del>-#include <QtGui/QWidget>
</del><ins>+#include <QtGui>
</ins><span class="cx">
</span><span class="cx"> namespace Ui {
</span><span class="cx"> class consolePage;
</span><span class="lines">@@ -11,6 +11,7 @@
</span><span class="cx"> class ESLevent;
</span><span class="cx"> class ESLeventLog;
</span><span class="cx"> class ESLconnection;
</span><ins>+class cmdHistory;
</ins><span class="cx">
</span><span class="cx"> class consolePage : public QWidget {
</span><span class="cx"> Q_OBJECT
</span><span class="lines">@@ -38,9 +39,12 @@
</span><span class="cx"> private:
</span><span class="cx"> void writeSettings();
</span><span class="cx"> void readSettings();
</span><ins>+ QAbstractItemModel *modelFromFile(const QString& fileName);
</ins><span class="cx"> Ui::consolePage *m_ui;
</span><span class="cx"> ESLconnection *eslConnection;
</span><span class="cx"> QString host;
</span><ins>+ cmdHistory *histCompleter;
+
</ins><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>