From ba41fa537a432210147586b1442ab67b6d400d18 Mon Sep 17 00:00:00 2001 From: Robert Bieber Date: Fri, 30 Jul 2010 08:38:38 +0000 Subject: Theme Editor: Made auto-complete functional and enabled it by default. Added a small subset of the available tags to the tagdb file, filling it out is todo git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27625 a1c6a512-1295-4272-9138-f99709370657 --- utils/themeeditor/gui/syntaxcompleter.cpp | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) (limited to 'utils/themeeditor/gui/syntaxcompleter.cpp') diff --git a/utils/themeeditor/gui/syntaxcompleter.cpp b/utils/themeeditor/gui/syntaxcompleter.cpp index 0b4f05f..8baace4 100644 --- a/utils/themeeditor/gui/syntaxcompleter.cpp +++ b/utils/themeeditor/gui/syntaxcompleter.cpp @@ -23,15 +23,20 @@ #include #include "syntaxcompleter.h" +#include "codeeditor.h" -SyntaxCompleter::SyntaxCompleter(QWidget *parent) : +SyntaxCompleter::SyntaxCompleter(CodeEditor *parent) : QTreeWidget(parent) { setHeaderHidden(true); + setHorizontalScrollBarPolicy(Qt::ScrollBarAsNeeded); setWordWrap(true); setColumnCount(2); + QObject::connect(this, SIGNAL(activated(QModelIndex)), + parent, SLOT(insertTag())); + QFile fin(":/resources/tagdb"); fin.open(QFile::ReadOnly | QFile::Text); @@ -45,14 +50,11 @@ SyntaxCompleter::SyntaxCompleter(QWidget *parent) : QStringList tag; tag.append(split[0].trimmed()); tag.append(split[1].trimmed()); - tags.insert(split[0].trimmed().toLower(), tag); + tags.insertMulti(split[0].trimmed().toLower(), tag); } filter(""); - resizeColumnToContents(0); - setColumnWidth(0, columnWidth(0) + 10); // Auto-resize is too small - } void SyntaxCompleter::filter(QString text) @@ -64,13 +66,13 @@ void SyntaxCompleter::filter(QString text) { if(text.length() == 1) { - if(text[0].toLower() != i.key()[0]) + if(text[0].toLower() != i.key()[0].toLower()) continue; } else if(text.length() == 2) { - if(text[0].toLower() != i.key()[0] || i.key().length() < 2 - || text[1].toLower() != i.key()[1]) + if(text[0].toLower() != i.key()[0].toLower() || i.key().length() < 2 + || text[1].toLower() != i.key()[1].toLower()) continue; } else if(text.length() > 2) @@ -80,4 +82,11 @@ void SyntaxCompleter::filter(QString text) addTopLevelItem(new QTreeWidgetItem(i.value())); } + + if(topLevelItemCount() > 0) + setCurrentIndex(indexFromItem(topLevelItem(0))); + + resizeColumnToContents(0); + setColumnWidth(0, columnWidth(0) + 10); // Auto-resize is too small + resizeColumnToContents(1); } -- cgit v1.1