summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Bieber <robby@bieberphoto.com>2010-06-08 07:57:43 +0000
committerRobert Bieber <robby@bieberphoto.com>2010-06-08 07:57:43 +0000
commit0cc507214ab3d5c35512add1e6150c4042e0aa1c (patch)
tree6a78263259233b95cf236f3d700372d489c46ae6
parentfa99c614b90c17c79f75b54a68e311324eda4184 (diff)
downloadrockbox-0cc507214ab3d5c35512add1e6150c4042e0aa1c.tar.gz
rockbox-0cc507214ab3d5c35512add1e6150c4042e0aa1c.tar.bz2
rockbox-0cc507214ab3d5c35512add1e6150c4042e0aa1c.zip
Theme Editor: Added line numbering in the text editor, thanks to some code from Nokia. Also made newly opened documents scroll to the top of the document after loading
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26683 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--utils/themeeditor/codeeditor.cpp143
-rw-r--r--utils/themeeditor/codeeditor.h99
-rw-r--r--utils/themeeditor/skindocument.cpp3
-rw-r--r--utils/themeeditor/skindocument.h4
-rw-r--r--utils/themeeditor/themeeditor.pro6
5 files changed, 250 insertions, 5 deletions
diff --git a/utils/themeeditor/codeeditor.cpp b/utils/themeeditor/codeeditor.cpp
new file mode 100644
index 0000000000..672b210d2e
--- /dev/null
+++ b/utils/themeeditor/codeeditor.cpp
@@ -0,0 +1,143 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * This file has been copied from Nokia's Qt Examples, with minor modifications
+ * made available under the LGPL version 2.1, as the original file was licensed
+ *
+ ****************************************************************************
+ ****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#include <QtGui>
+
+#include "codeeditor.h"
+
+//![constructor]
+
+CodeEditor::CodeEditor(QWidget *parent) : QPlainTextEdit(parent)
+{
+ lineNumberArea = new LineNumberArea(this);
+
+ connect(this, SIGNAL(blockCountChanged(int)),
+ this, SLOT(updateLineNumberAreaWidth(int)));
+ connect(this, SIGNAL(updateRequest(QRect,int)),
+ this, SLOT(updateLineNumberArea(QRect,int)));
+
+ updateLineNumberAreaWidth(0);
+}
+
+//![constructor]
+
+//![extraAreaWidth]
+
+int CodeEditor::lineNumberAreaWidth()
+{
+ int digits = 1;
+ int max = qMax(1, blockCount());
+ while (max >= 10) {
+ max /= 10;
+ ++digits;
+ }
+
+ int space = 3 + fontMetrics().width(QLatin1Char('9')) * digits;
+
+ return space;
+}
+
+//![extraAreaWidth]
+
+//![slotUpdateExtraAreaWidth]
+
+void CodeEditor::updateLineNumberAreaWidth(int /* newBlockCount */)
+{
+ setViewportMargins(lineNumberAreaWidth(), 0, 0, 0);
+}
+
+//![slotUpdateExtraAreaWidth]
+
+//![slotUpdateRequest]
+
+void CodeEditor::updateLineNumberArea(const QRect &rect, int dy)
+{
+ if (dy)
+ lineNumberArea->scroll(0, dy);
+ else
+ lineNumberArea->update(0, rect.y(), lineNumberArea->width(), rect.height());
+
+ if (rect.contains(viewport()->rect()))
+ updateLineNumberAreaWidth(0);
+}
+
+//![slotUpdateRequest]
+
+//![resizeEvent]
+
+void CodeEditor::resizeEvent(QResizeEvent *e)
+{
+ QPlainTextEdit::resizeEvent(e);
+
+ QRect cr = contentsRect();
+ lineNumberArea->setGeometry(QRect(cr.left(), cr.top(),
+ lineNumberAreaWidth(), cr.height()));
+}
+
+//![resizeEvent]
+
+//![extraAreaPaintEvent_0]
+
+void CodeEditor::lineNumberAreaPaintEvent(QPaintEvent *event)
+{
+ QPainter painter(lineNumberArea);
+ painter.fillRect(event->rect(), Qt::lightGray);
+
+//![extraAreaPaintEvent_0]
+
+//![extraAreaPaintEvent_1]
+ QTextBlock block = firstVisibleBlock();
+ int blockNumber = block.blockNumber();
+ int top = (int) blockBoundingGeometry(block).translated(contentOffset()).top();
+ int bottom = top + (int) blockBoundingRect(block).height();
+//![extraAreaPaintEvent_1]
+
+//![extraAreaPaintEvent_2]
+ while (block.isValid() && top <= event->rect().bottom()) {
+ if (block.isVisible() && bottom >= event->rect().top()) {
+ QString number = QString::number(blockNumber + 1);
+ painter.setPen(Qt::black);
+ painter.drawText(0, top, lineNumberArea->width(), fontMetrics().height(),
+ Qt::AlignRight, number);
+ }
+
+ block = block.next();
+ top = bottom;
+ bottom = top + (int) blockBoundingRect(block).height();
+ ++blockNumber;
+ }
+}
+//![extraAreaPaintEvent_2]
+
diff --git a/utils/themeeditor/codeeditor.h b/utils/themeeditor/codeeditor.h
new file mode 100644
index 0000000000..edbe218ec4
--- /dev/null
+++ b/utils/themeeditor/codeeditor.h
@@ -0,0 +1,99 @@
+/***************************************************************************
+ * __________ __ ___.
+ * Open \______ \ ____ ____ | | _\_ |__ _______ ___
+ * Source | _// _ \_/ ___\| |/ /| __ \ / _ \ \/ /
+ * Jukebox | | ( <_> ) \___| < | \_\ ( <_> > < <
+ * Firmware |____|_ /\____/ \___ >__|_ \|___ /\____/__/\_ \
+ * \/ \/ \/ \/ \/
+ * $Id$
+ *
+ * This file has been copied from Nokia's Qt Examples, with minor modifications
+ * made available under the LGPL version 2.1, as the original file was licensed
+ *
+ ****************************************************************************
+ ****************************************************************************
+**
+** Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
+** All rights reserved.
+** Contact: Nokia Corporation (qt-info@nokia.com)
+**
+** This file is part of the examples of the Qt Toolkit.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 as published by the Free Software
+** Foundation and appearing in the file LICENSE.LGPL included in the
+** packaging of this file. Please review the following information to
+** ensure the GNU Lesser General Public License version 2.1 requirements
+** will be met: http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** In addition, as a special exception, Nokia gives you certain additional
+** rights. These rights are described in the Nokia Qt LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+****************************************************************************/
+
+#ifndef CODEEDITOR_H
+#define CODEEDITOR_H
+
+#include <QPlainTextEdit>
+#include <QObject>
+
+QT_BEGIN_NAMESPACE
+class QPaintEvent;
+class QResizeEvent;
+class QSize;
+class QWidget;
+QT_END_NAMESPACE
+
+class LineNumberArea;
+
+//![codeeditordefinition]
+
+class CodeEditor : public QPlainTextEdit
+{
+ Q_OBJECT
+
+public:
+ CodeEditor(QWidget *parent = 0);
+
+ void lineNumberAreaPaintEvent(QPaintEvent *event);
+ int lineNumberAreaWidth();
+
+protected:
+ void resizeEvent(QResizeEvent *event);
+
+private slots:
+ void updateLineNumberAreaWidth(int newBlockCount);
+ void updateLineNumberArea(const QRect &, int);
+
+private:
+ QWidget *lineNumberArea;
+};
+
+//![codeeditordefinition]
+//![extraarea]
+
+class LineNumberArea : public QWidget
+{
+public:
+ LineNumberArea(CodeEditor *editor) : QWidget(editor) {
+ codeEditor = editor;
+ }
+
+ QSize sizeHint() const {
+ return QSize(codeEditor->lineNumberAreaWidth(), 0);
+ }
+
+protected:
+ void paintEvent(QPaintEvent *event) {
+ codeEditor->lineNumberAreaPaintEvent(event);
+ }
+
+private:
+ CodeEditor *codeEditor;
+};
+
+//![extraarea]
+
+#endif
diff --git a/utils/themeeditor/skindocument.cpp b/utils/themeeditor/skindocument.cpp
index 3da248a30b..f7c902f30f 100644
--- a/utils/themeeditor/skindocument.cpp
+++ b/utils/themeeditor/skindocument.cpp
@@ -52,6 +52,7 @@ SkinDocument::SkinDocument(QLabel* statusLabel, QString file, QWidget *parent):
fin.open(QFile::ReadOnly);
editor->document()->setPlainText(QString(fin.readAll()));
saved = editor->document()->toPlainText();
+ editor->setTextCursor(QTextCursor(editor->document()->begin()));
fin.close();
}
@@ -113,7 +114,7 @@ void SkinDocument::setupUI()
{
/* Setting up the text edit */
layout = new QHBoxLayout;
- editor = new QPlainTextEdit(this);
+ editor = new CodeEditor(this);
editor->setLineWrapMode(QPlainTextEdit::NoWrap);
layout->addWidget(editor);
diff --git a/utils/themeeditor/skindocument.h b/utils/themeeditor/skindocument.h
index b5eb60b2f4..c8f92955f5 100644
--- a/utils/themeeditor/skindocument.h
+++ b/utils/themeeditor/skindocument.h
@@ -25,11 +25,11 @@
#include <QWidget>
#include <QLabel>
#include <QHBoxLayout>
-#include <QPlainTextEdit>
#include "skinhighlighter.h"
#include "parsetreemodel.h"
#include "preferencesdialog.h"
+#include "codeeditor.h"
class SkinDocument : public QWidget
{
@@ -81,7 +81,7 @@ private:
QTextCharFormat errorColor;
QLayout* layout;
- QPlainTextEdit* editor;
+ CodeEditor* editor;
SkinHighlighter* highlighter;
ParseTreeModel* model;
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index fe83d6bbf5..e0fcdc09d5 100644
--- a/utils/themeeditor/themeeditor.pro
+++ b/utils/themeeditor/themeeditor.pro
@@ -14,7 +14,8 @@ HEADERS += tag_table.h \
editorwindow.h \
skinhighlighter.h \
skindocument.h \
- preferencesdialog.h
+ preferencesdialog.h \
+ codeeditor.h
SOURCES += tag_table.c \
skin_parser.c \
skin_scan.c \
@@ -25,7 +26,8 @@ SOURCES += tag_table.c \
editorwindow.cpp \
skinhighlighter.cpp \
skindocument.cpp \
- preferencesdialog.cpp
+ preferencesdialog.cpp \
+ codeeditor.cpp
OTHER_FILES += README \
resources/windowicon.png \
resources/appicon.xcf \