changeset 14270:29a5e5b94a04 gui

Removed TerminalHighlighter-class, since it is not needed anymore. * octave-gui.pro: Removed class files from SOURCES and HEADERS. * TerminalHighlighter.* : Removed.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Sat, 28 Jan 2012 00:16:28 +0100
parents 4a6867289e24
children 556f8f40112e
files gui/octave-gui.pro gui/src/TerminalHighlighter.cpp gui/src/TerminalHighlighter.h
diffstat 3 files changed, 2 insertions(+), 148 deletions(-) [+]
line wrap: on
line diff
--- a/gui/octave-gui.pro	Sat Jan 28 00:11:34 2012 +0100
+++ b/gui/octave-gui.pro	Sat Jan 28 00:16:28 2012 +0100
@@ -92,8 +92,7 @@
     src/WelcomeWizard.cpp
 
 unix {
-SOURCES +=\
-    src/TerminalHighlighter.cpp
+SOURCES +=
 }
 
 win32 {
@@ -122,8 +121,7 @@
     src/WelcomeWizard.h
 
 unix {
-HEADERS += \
-    src/TerminalHighlighter.h
+HEADERS +=
 }
 
 win32 {
--- a/gui/src/TerminalHighlighter.cpp	Sat Jan 28 00:11:34 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,88 +0,0 @@
-/* OctaveGUI - A graphical user interface for Octave
- * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include "ResourceManager.h"
-#include "TerminalHighlighter.h"
-
-TerminalHighlighter::TerminalHighlighter(QTextDocument *parent)
-  : QSyntaxHighlighter(parent)
-{
-  HighlightingRule rule;
-
-  keywordFormat.setForeground(Qt::darkBlue);
-  QStringList keywordPatterns
-      = QString(ResourceManager::instance ()->octaveKeywords ()).split(" ", QString::SkipEmptyParts);
-   keywordPatterns << "GNU" << "Octave" << "OctaveGUI";
-
-  for (int i = 0; i < keywordPatterns.size (); i++)
-    keywordPatterns.replace(i, QString("\\b%1\\b").arg(keywordPatterns.at (i)));
-
-  foreach (const QString &pattern, keywordPatterns)
-    {
-      rule.pattern = QRegExp(pattern);
-      rule.format = keywordFormat;
-      highlightingRules.append(rule);
-    }
-
-  numberFormat.setForeground(Qt::darkRed);
-  rule.pattern = QRegExp("\\b[0-9\\.\\+\\-\\^]+\\b");
-  rule.format = numberFormat;
-  highlightingRules.append(rule);
-
-  doubleQouteFormat.setForeground(Qt::darkGreen);
-  rule.pattern = QRegExp("\"[^\"]*\"");
-  rule.format = doubleQouteFormat;
-  highlightingRules.append(rule);
-
-  functionFormat.setFontItalic(true);
-  functionFormat.setForeground(Qt::blue);
-  rule.pattern = QRegExp("\\b[A-Za-z0-9_]+\\s*(?=\\()");
-  rule.format = functionFormat;
-  highlightingRules.append(rule);
-
-  urlFormat.setForeground(Qt::darkYellow);
-  rule.pattern = QRegExp("((?:https?|ftp)://\\S+)");
-  rule.format = urlFormat;
-  highlightingRules.append(rule);
-
-  subCaptionFormat.setForeground (Qt::black);
-  subCaptionFormat.setFontItalic (true);
-  rule.pattern = QRegExp("^\\s+\\*.+$");
-  rule.format = subCaptionFormat;
-  highlightingRules.append(rule);
-
-  captionFormat.setForeground(Qt::black);
-  captionFormat.setFontWeight(QFont::Bold);
-  rule.pattern = QRegExp("^\\s+\\*\\*.+$");
-  rule.format = captionFormat;
-  highlightingRules.append(rule);
-}
-
-void TerminalHighlighter::highlightBlock(const QString &text)
-{
-  foreach (const HighlightingRule &rule, highlightingRules)
-    {
-      QRegExp expression(rule.pattern);
-      int index = expression.indexIn(text);
-      while (index >= 0)
-        {
-          int length = expression.matchedLength();
-          setFormat(index, length, rule.format);
-          index = expression.indexIn(text, index + length);
-        }
-    }
-}
--- a/gui/src/TerminalHighlighter.h	Sat Jan 28 00:11:34 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/* OctaveGUI - A graphical user interface for Octave
- * Copyright (C) 2011 Jacob Dawid (jacob.dawid@googlemail.com)
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef TERMINALHIGHLIGHTER_H
-#define TERMINALHIGHLIGHTER_H
-
-#include <QSyntaxHighlighter>
-
-#include <QHash>
-#include <QTextCharFormat>
-
-class QTextDocument;
-
-class TerminalHighlighter : public QSyntaxHighlighter
-{
-    Q_OBJECT
-
-public:
-    TerminalHighlighter(QTextDocument *parent = 0);
-
-protected:
-    void highlightBlock(const QString &text);
-
-private:
-    struct HighlightingRule
-    {
-        QRegExp pattern;
-        QTextCharFormat format;
-    };
-
-    QVector<HighlightingRule> highlightingRules;
-    QTextCharFormat keywordFormat;
-    QTextCharFormat doubleQouteFormat;
-    QTextCharFormat functionFormat;
-    QTextCharFormat urlFormat;
-    QTextCharFormat captionFormat;
-    QTextCharFormat subCaptionFormat;
-    QTextCharFormat numberFormat;
-};
-
-
-#endif // TERMINALHIGHLIGHTER_H