git-svn-id: svn://db.shs.com.ru/libs@32 a8b55f48-bf90-11e4-a774-851b48703e85

This commit is contained in:
2015-09-19 19:44:55 +00:00
parent fc937a3cd2
commit f597f3b5ad
3 changed files with 242 additions and 73 deletions

View File

@@ -4,7 +4,7 @@ find_package(Qt4 REQUIRED)
include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES}) include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${QT_INCLUDES})
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O2 -Wall")
#set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -g3")
set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}") set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS}")
set(MOCS "qpiconsole.h" "spinslider.h" set(MOCS "qpiconsole.h" "spinslider.h"

View File

@@ -17,26 +17,34 @@ QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) {
textCode = textLines = 0; textCode = textLines = 0;
timer = 0; timer = 0;
_ignore_focus_out = false; _ignore_focus_out = _destructor = false;
_first = true; _first = true;
es_line.format.setBackground(QColor(240, 245, 240)); es_line.format.setBackground(QColor(240, 245, 240));
es_line.format.setProperty(QTextFormat::FullWidthSelection, true); es_line.format.setProperty(QTextFormat::FullWidthSelection, true);
completer.setWindowFlags(Qt::Tool | Qt::FramelessWindowHint); es_cursor.format.setBackground(QColor(220, 255, 200));
completer.setFocusPolicy(Qt::NoFocus); lbl_help = new IconedLabel();
completer.setColumnCount(2); lbl_help->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
completer.setRootIsDecorated(false); lbl_help->setFocusPolicy(Qt::NoFocus);
completer.setHeaderHidden(true); lbl_help->setFrameShadow(QFrame::Sunken);
completer.header()->setDefaultAlignment(Qt::AlignCenter); lbl_help->setFrameShape(QFrame::StyledPanel);
completer.header()-> lbl_help->setDirection(IconedLabel::RightToLeft);
completer = new QTreeWidget();
completer->setWindowFlags(Qt::Tool | Qt::FramelessWindowHint);
completer->setFocusPolicy(Qt::NoFocus);
completer->setColumnCount(2);
completer->setRootIsDecorated(false);
completer->setHeaderHidden(true);
completer->header()->setDefaultAlignment(Qt::AlignCenter);
completer->header()->
#if (QT_VERSION >= 0x050000) #if (QT_VERSION >= 0x050000)
setSectionResizeMode setSectionResizeMode
#else #else
setResizeMode setResizeMode
#endif #endif
(QHeaderView::ResizeToContents); (QHeaderView::ResizeToContents);
completer.header()->setStretchLastSection(true); completer->header()->setStretchLastSection(true);
//completer.setColumnWidth(0, 180); //completer->setColumnWidth(0, 180);
completer.resize(500, 200); completer->resize(500, 200);
textCode = new QPlainTextEdit(); textCode = new QPlainTextEdit();
textLines = new QPlainTextEdit(); textLines = new QPlainTextEdit();
textCode->setFrameShadow(QFrame::Plain); textCode->setFrameShadow(QFrame::Plain);
@@ -82,7 +90,7 @@ QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) {
textLines->document()->setDefaultTextOption(to); textLines->document()->setDefaultTextOption(to);
setShowSpaces(true); setShowSpaces(true);
connect(&completer, SIGNAL(itemDoubleClicked(QTreeWidgetItem * ,int)), this, SLOT(commitCompletition())); connect(completer, SIGNAL(itemDoubleClicked(QTreeWidgetItem * ,int)), this, SLOT(commitCompletition()));
connect(textCode->verticalScrollBar(), SIGNAL(valueChanged(int)), textLines->verticalScrollBar(), SLOT(setValue(int))); connect(textCode->verticalScrollBar(), SIGNAL(valueChanged(int)), textLines->verticalScrollBar(), SLOT(setValue(int)));
connect(textCode, SIGNAL(textChanged()), this, SLOT(updateLines())); connect(textCode, SIGNAL(textChanged()), this, SLOT(updateLines()));
connect(textCode, SIGNAL(textChanged()), this, SIGNAL(textChanged())); connect(textCode, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
@@ -95,8 +103,11 @@ QCodeEdit::QCodeEdit(QWidget * parent): QWidget(parent) {
QCodeEdit::~QCodeEdit() { QCodeEdit::~QCodeEdit() {
_destructor = true;
delete textCode; delete textCode;
delete textLines; delete textLines;
delete completer;
delete lbl_help;
} }
@@ -165,8 +176,9 @@ QChar QCodeEdit::pairChar(QChar c) {
bool QCodeEdit::eventFilter(QObject * o, QEvent * e) { bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
if (_destructor) return QWidget::eventFilter(o, e);
if (e->type() == QEvent::Destroy) { if (e->type() == QEvent::Destroy) {
completer.removeEventFilter(this); completer->removeEventFilter(this);
textCode->removeEventFilter(this); textCode->removeEventFilter(this);
textCode->viewport()->removeEventFilter(this); textCode->viewport()->removeEventFilter(this);
textLines->viewport()->removeEventFilter(this); textLines->viewport()->removeEventFilter(this);
@@ -188,7 +200,7 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
} }
} }
} }
if (o == &completer) { if (o == completer) {
//qDebug() << o << e; //qDebug() << o << e;
if (e->type() == QEvent::WindowActivate) if (e->type() == QEvent::WindowActivate)
_ignore_focus_out = true; _ignore_focus_out = true;
@@ -197,12 +209,20 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
} }
if (textCode) { if (textCode) {
if (o == textCode->viewport()) { if (o == textCode->viewport()) {
if (e->type() == QEvent::MouseButtonPress) if (e->type() == QEvent::MouseButtonPress) {
completer.hide(); completer->hide();
hideHelp();
}
if (e->type() == QEvent::ToolTip) {
QTextCursor tc = textCode->cursorForPosition(((QHelpEvent*)e)->pos());
tc.select(QTextCursor::WordUnderCursor);
raiseHelp(tc);
}
return QWidget::eventFilter(o, e); return QWidget::eventFilter(o, e);
} }
if (o == textCode) { if (o == textCode) {
//qDebug() << o << e; //qDebug() << o << e;
QMetaObject::invokeMethod(this, "syncScrolls", Qt::QueuedConnection);
QKeyEvent * ke; QKeyEvent * ke;
QChar kc(0); QChar kc(0);
switch (e->type()) { switch (e->type()) {
@@ -216,14 +236,16 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
} }
break; break;
case Qt::Key_Escape: case Qt::Key_Escape:
completer.hide(); completer->hide();
hideHelp();
break; break;
case Qt::Key_Up: case Qt::Key_Up:
if (completer.isVisible()) { if (completer->isVisible()) {
previousCompletition(); previousCompletition();
return true; return true;
} }
completer.hide(); completer->hide();
hideHelp();
if (ke->modifiers().testFlag(Qt::AltModifier)) { if (ke->modifiers().testFlag(Qt::AltModifier)) {
copyLineUp(); copyLineUp();
return true; return true;
@@ -234,11 +256,12 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
} }
break; break;
case Qt::Key_Down: case Qt::Key_Down:
if (completer.isVisible()) { if (completer->isVisible()) {
nextCompletition(); nextCompletition();
return true; return true;
} }
completer.hide(); completer->hide();
hideHelp();
if (ke->modifiers().testFlag(Qt::AltModifier)) { if (ke->modifiers().testFlag(Qt::AltModifier)) {
copyLineDown(); copyLineDown();
return true; return true;
@@ -252,8 +275,8 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
case Qt::Key_End: case Qt::Key_End:
case Qt::Key_PageUp: case Qt::Key_PageUp:
case Qt::Key_PageDown: case Qt::Key_PageDown:
if (completer.isVisible()) { if (completer->isVisible()) {
qApp->sendEvent(&completer, new QKeyEvent(e->type(), ke->key(), ke->modifiers())); qApp->sendEvent(completer, new QKeyEvent(e->type(), ke->key(), ke->modifiers()));
return true; return true;
} }
break; break;
@@ -261,13 +284,13 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
case Qt::Key_Right: case Qt::Key_Right:
case Qt::Key_Backspace: case Qt::Key_Backspace:
case Qt::Key_Delete: case Qt::Key_Delete:
if (completer.isVisible()) if (completer->isVisible())
QMetaObject::invokeMethod(this, "invokeAutoCompletition", Qt::QueuedConnection, Q_ARG(bool, false)); QMetaObject::invokeMethod(this, "invokeAutoCompletition", Qt::QueuedConnection, Q_ARG(bool, false));
break; break;
case Qt::Key_Return: case Qt::Key_Return:
if (completer.isVisible()) { if (completer->isVisible()) {
commitCompletition(); commitCompletition();
completer.hide(); completer->hide();
return true; return true;
} }
if (textCode->textCursor().selectedText().isEmpty()) if (textCode->textCursor().selectedText().isEmpty())
@@ -284,7 +307,7 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
break; break;
case Qt::Key_D: case Qt::Key_D:
if (ke->modifiers().testFlag(Qt::ControlModifier)) { if (ke->modifiers().testFlag(Qt::ControlModifier)) {
completer.hide(); completer->hide();
return true; return true;
} }
break; break;
@@ -293,10 +316,10 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
if (!ke->text().isEmpty()) if (!ke->text().isEmpty())
kc = ke->text()[0]; kc = ke->text()[0];
if (kc == '.') { if (kc == '.') {
completer.hide(); completer->hide();
QMetaObject::invokeMethod(this, "invokeAutoCompletition", Qt::QueuedConnection, Q_ARG(bool, false)); QMetaObject::invokeMethod(this, "invokeAutoCompletition", Qt::QueuedConnection, Q_ARG(bool, false));
} else { } else {
if ((kc.isLetterOrNumber() || kc.toLatin1() == '_') && completer.isVisible()) if ((kc.isLetterOrNumber() || kc.toLatin1() == '_') && completer->isVisible())
QMetaObject::invokeMethod(this, "invokeAutoCompletition", Qt::QueuedConnection, Q_ARG(bool, false)); QMetaObject::invokeMethod(this, "invokeAutoCompletition", Qt::QueuedConnection, Q_ARG(bool, false));
} }
break; break;
@@ -309,7 +332,8 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
case QEvent::HideToParent: case QEvent::HideToParent:
case QEvent::MouseButtonPress: case QEvent::MouseButtonPress:
//qDebug() << e; //qDebug() << e;
completer.hide(); completer->hide();
hideHelp();
default: break; default: break;
} }
} }
@@ -321,7 +345,7 @@ bool QCodeEdit::eventFilter(QObject * o, QEvent * e) {
void QCodeEdit::showEvent(QShowEvent * ) { void QCodeEdit::showEvent(QShowEvent * ) {
if (!_first) return; if (!_first) return;
_first = false; _first = false;
completer.installEventFilter(this); completer->installEventFilter(this);
textCode->installEventFilter(this); textCode->installEventFilter(this);
textCode->viewport()->installEventFilter(this); textCode->viewport()->installEventFilter(this);
textLines->viewport()->installEventFilter(this); textLines->viewport()->installEventFilter(this);
@@ -337,34 +361,39 @@ void QCodeEdit::timerEvent(QTimerEvent * ) {
void QCodeEdit::applyExtraSelection() { void QCodeEdit::applyExtraSelection() {
textCode->setExtraSelections(QList<QTextEdit::ExtraSelection>() << es_line << es_selected << es_custom); textCode->setExtraSelections(QList<QTextEdit::ExtraSelection>() << es_line << es_selected << es_custom << es_cursor);
} }
void QCodeEdit::nextCompletition() { void QCodeEdit::nextCompletition() {
int ci = completer.currentIndex().row(); int ci = completer->currentIndex().row();
if (ci >= completer.topLevelItemCount() - 1) return; if (ci >= completer->topLevelItemCount() - 1) return;
if (completer.topLevelItem(ci + 1)->flags().testFlag(Qt::ItemIsSelectable)) if (completer->topLevelItem(ci + 1)->flags().testFlag(Qt::ItemIsSelectable))
completer.setCurrentItem(completer.topLevelItem(ci + 1)); completer->setCurrentItem(completer->topLevelItem(ci + 1));
else { else {
if (ci >= completer.topLevelItemCount() - 2) return; if (ci >= completer->topLevelItemCount() - 2) return;
completer.setCurrentItem(completer.topLevelItem(ci + 2)); completer->setCurrentItem(completer->topLevelItem(ci + 2));
} }
} }
void QCodeEdit::previousCompletition() { void QCodeEdit::previousCompletition() {
int ci = completer.currentIndex().row(); int ci = completer->currentIndex().row();
if (ci <= 0) return; if (ci <= 0) return;
if (completer.topLevelItem(ci - 1)->flags().testFlag(Qt::ItemIsSelectable)) if (completer->topLevelItem(ci - 1)->flags().testFlag(Qt::ItemIsSelectable))
completer.setCurrentItem(completer.topLevelItem(ci - 1)); completer->setCurrentItem(completer->topLevelItem(ci - 1));
else { else {
if (ci <= 1) return; if (ci <= 1) return;
completer.setCurrentItem(completer.topLevelItem(ci - 2)); completer->setCurrentItem(completer->topLevelItem(ci - 2));
} }
} }
void QCodeEdit::syncScrolls() {
textLines->verticalScrollBar()->setValue(textCode->verticalScrollBar()->value());
}
void QCodeEdit::deleteLine() { void QCodeEdit::deleteLine() {
QTextCursor tc = textCode->textCursor(); QTextCursor tc = textCode->textCursor();
tc.movePosition(QTextCursor::EndOfLine); tc.movePosition(QTextCursor::EndOfLine);
@@ -606,6 +635,14 @@ void QCodeEdit::autoIndent() {
} }
void QCodeEdit::scrollToTop() {
prev_lc = -1;
updateLines();
textCode->verticalScrollBar()->setValue(0);
textLines->verticalScrollBar()->setValue(0);
}
void QCodeEdit::updateLines() { void QCodeEdit::updateLines() {
if (timer > 0) killTimer(timer); if (timer > 0) killTimer(timer);
timer = startTimer(500); timer = startTimer(500);
@@ -621,6 +658,106 @@ void QCodeEdit::updateLines() {
} }
QString QCodeEdit::selectArg(QString s, int arg) {
if (!s.contains('(') || arg < 0) return s;
QString ss = s.left(s.indexOf('('));
s.remove(0, ss.size());
if (s.startsWith('(')) s.remove(0, 1);
if (s.endsWith(')')) s.chop(1);
QStringList al = s.split(",");
QString ret = ss + "(";
for (int i = 0; i < al.size(); ++i) {
if (i > 0) ret += ", ";
if (i == arg) ret += "<span style=\"font-weight:600;\">";
ret += al[i].trimmed();
if (i == arg) ret += "</span>";
}
ret += ")";
return ret;
}
void QCodeEdit::raiseHelp(QTextCursor tc, int arg) {
bool ok;
QPair<QStringList, QString> scope = getScope(tc, &ok);
//qDebug() << "help" << scope;
QString st = tc.selectedText();
if (arg >= 0) st = scope.second;
if (!ok || st.isEmpty()) {
hideHelp();
return;
}
ok = false;
ACList acl(autoCompletitionList(scope.first, scope.second));
foreach (const ACPair & i, acl) {
foreach (const StringsPair & s, i.second) {
QString ts = s.second;
//qDebug() << ts << st;
if (ts != st) {
if (ts.startsWith(st)) {
ts.remove(0, st.size());
ts = ts.trimmed();
if (!ts.isEmpty()) {
if (ts[0] != '(')
continue;
}
} else
continue;
}
//qDebug() << s.second << st;
ACClass acc = ac_classes.value(i.first);
lbl_help->setIcon(acc.icon);
lbl_help->setText(QString("<html><body>[%1] %2 %3</html></body>").arg(acc.name, s.first, selectArg(s.second, arg)));
ok = true;
break;
}
if (ok) break;
}
if (!ok) {
hideHelp();
return;
}
es_cursor.cursor = tc;
applyExtraSelection();
tc.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, st.size());
lbl_help->setFont(font());
lbl_help->resize(lbl_help->sizeHint());
lbl_help->move(textCode->mapToGlobal(textCode->cursorRect(tc).topLeft() - QPoint(0, lbl_help->height() + 8)));
lbl_help->show();
//qDebug() << "tooltip" << st;
}
void QCodeEdit::hideHelp() {
lbl_help->hide();
es_cursor.cursor = QTextCursor();
applyExtraSelection();
}
QTextCursor QCodeEdit::functionStart(QTextCursor tc, int * arg) {
QString doc = textCode->toPlainText();
int bcnt = 0, a = 0, i = -1;
for (i = tc.position() - 1; i >= 0; --i) {
if (doc[i] == ')') bcnt++;
if (doc[i] == '(') {
if (bcnt == 0)
break;
else
bcnt--;
}
//if (doc[i] == '(') bcnt--;
if (doc[i] == ',' && bcnt == 0) a++;
}
if (i < 0) return QTextCursor();
if (arg) *arg = a;
QTextCursor ret(textCode->document());
ret.setPosition(i);
//qDebug() << "found" << i << a;
return ret;
}
QCodeEdit::ACList QCodeEdit::wordsCompletitionList(const QString & written) const { QCodeEdit::ACList QCodeEdit::wordsCompletitionList(const QString & written) const {
QCodeEdit::ACList ret; QCodeEdit::ACList ret;
if (!written.isEmpty()) { if (!written.isEmpty()) {
@@ -647,23 +784,26 @@ QCodeEdit::ACList QCodeEdit::wordsCompletitionList(const QString & written) cons
} }
void QCodeEdit::invokeAutoCompletition(bool force) { QPair<QStringList, QString> QCodeEdit::getScope(QTextCursor tc, bool * ok) {
QTextCursor tc = textCode->textCursor(), stc = tc; QPair<QStringList, QString> ret;
QTextCursor stc = tc;
if (tc.isNull()) { if (tc.isNull()) {
completer.hide(); completer->hide();
return; if (ok) *ok = false;
return ret;
} }
int line = tc.block().firstLineNumber(); int line = tc.block().firstLineNumber();
if (completer.isVisible()) { if (completer->isVisible()) {
if (auto_comp_pl != line) { if (auto_comp_pl != line) {
completer.hide(); completer->hide();
auto_comp_pl = line; auto_comp_pl = line;
return; if (ok) *ok = false;
return ret;
} }
} }
QString doc = textCode->toPlainText(); QString doc = textCode->toPlainText();
auto_comp_pl = line; auto_comp_pl = line;
completer.clear(); completer->clear();
int spos = tc.position(), cpos = spos; int spos = tc.position(), cpos = spos;
tc.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor); tc.movePosition(QTextCursor::Left, QTextCursor::KeepAnchor);
QStringList scope; QStringList scope;
@@ -692,13 +832,31 @@ void QCodeEdit::invokeAutoCompletition(bool force) {
scope.push_front(doc.mid(npos, ppos - npos)); scope.push_front(doc.mid(npos, ppos - npos));
cpos = npos; cpos = npos;
} }
ACList acl(autoCompletitionList(scope, written)); ret.first = scope;
ret.second = written;
if (ok) *ok = true;
return ret;
}
void QCodeEdit::invokeAutoCompletition(bool force) {
int arg = -1;
QTextCursor htc = functionStart(textCode->textCursor(), &arg);
if (!htc.isNull()) {
//qDebug() << "raise";
raiseHelp(htc, arg);
}
bool ok;
QPair<QStringList, QString> scope = getScope(textCode->textCursor(), &ok);
if (!ok) return;
ACList acl(autoCompletitionList(scope.first, scope.second));
//qDebug() << written << scope << acl.size(); //qDebug() << written << scope << acl.size();
if (scope.isEmpty() && written.isEmpty() && !force) { if (scope.first.isEmpty() && scope.second.isEmpty() && !force) {
completer.hide(); completer->hide();
hideHelp();
return; return;
} }
acl << wordsCompletitionList(written); acl << wordsCompletitionList(scope.second);
QFont bf(font()); QFont bf(font());
bf.setBold(true); bf.setBold(true);
foreach (const ACPair & ac, acl) { foreach (const ACPair & ac, acl) {
@@ -711,28 +869,28 @@ void QCodeEdit::invokeAutoCompletition(bool force) {
gi->setFont(0, bf); gi->setFont(0, bf);
gi->setBackgroundColor(0, Qt::lightGray); gi->setBackgroundColor(0, Qt::lightGray);
gi->setFlags(Qt::ItemIsEnabled); gi->setFlags(Qt::ItemIsEnabled);
completer.addTopLevelItem(gi); completer->addTopLevelItem(gi);
gi->setFirstColumnSpanned(true); gi->setFirstColumnSpanned(true);
foreach (const StringsPair & s, ac.second) { foreach (const StringsPair & s, ac.second) {
QTreeWidgetItem * ni = new QTreeWidgetItem(); QTreeWidgetItem * ni = new QTreeWidgetItem();
ni->setIcon(0, acc.icon); ni->setIcon(0, acc.icon);
ni->setText(0, s.first); ni->setText(0, s.first);
ni->setText(1, s.second); ni->setText(1, s.second);
completer.addTopLevelItem(ni); completer->addTopLevelItem(ni);
} }
} }
if (completer.topLevelItemCount() > 1) if (completer->topLevelItemCount() > 1)
completer.setCurrentItem(completer.topLevelItem(1)); completer->setCurrentItem(completer->topLevelItem(1));
if (completer.isHidden()) if (completer->isHidden())
completer.move(textCode->mapToGlobal(textCode->cursorRect().bottomRight())); completer->move(textCode->mapToGlobal(textCode->cursorRect().bottomRight()));
completer.setVisible(completer.topLevelItemCount() > 0); completer->setVisible(completer->topLevelItemCount() > 0);
} }
void QCodeEdit::commitCompletition() { void QCodeEdit::commitCompletition() {
if (completer.currentItem() == 0) return; if (completer->currentItem() == 0) return;
if (!completer.currentItem()->flags().testFlag(Qt::ItemIsSelectable)) return; if (!completer->currentItem()->flags().testFlag(Qt::ItemIsSelectable)) return;
QString ins = completer.currentItem()->text(1), ret = completer.currentItem()->text(0); QString ins = completer->currentItem()->text(1), ret = completer->currentItem()->text(0);
QTextCursor tc = textCode->textCursor(), stc = tc; QTextCursor tc = textCode->textCursor(), stc = tc;
tc.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor); tc.movePosition(QTextCursor::Right, QTextCursor::KeepAnchor);
bool ins_br = true, shifted = false; bool ins_br = true, shifted = false;
@@ -771,21 +929,21 @@ void QCodeEdit::commitCompletition() {
tc.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, 2); tc.movePosition(QTextCursor::Left, QTextCursor::MoveAnchor, 2);
} }
} }
if (ins.endsWith(")") && !completer.currentItem()->text(1).endsWith("()")) { if (ins.endsWith(")") && !completer->currentItem()->text(1).endsWith("()")) {
tc.movePosition(QTextCursor::Left); tc.movePosition(QTextCursor::Left);
textCode->setTextCursor(tc); textCode->setTextCursor(tc);
} }
} else { } else {
if (completer.currentItem()->text(1).endsWith(")")) { if (completer->currentItem()->text(1).endsWith(")")) {
tc.movePosition(QTextCursor::Right); tc.movePosition(QTextCursor::Right);
textCode->setTextCursor(tc); textCode->setTextCursor(tc);
} }
if (completer.currentItem()->text(1).endsWith("()")) { if (completer->currentItem()->text(1).endsWith("()")) {
tc.movePosition(QTextCursor::Right); tc.movePosition(QTextCursor::Right);
textCode->setTextCursor(tc); textCode->setTextCursor(tc);
} }
} }
completer.hide(); completer->hide();
} }

View File

@@ -4,6 +4,8 @@
#include <QDebug> #include <QDebug>
#include <QPlainTextEdit> #include <QPlainTextEdit>
#include <QTreeWidget> #include <QTreeWidget>
#include <QScrollBar>
#include "iconedlabel.h"
QT_BEGIN_HEADER QT_BEGIN_HEADER
@@ -36,6 +38,7 @@ public:
QRect cursorRect() const {return textCode->cursorRect();} QRect cursorRect() const {return textCode->cursorRect();}
QRect cursorRect(const QTextCursor & cursor) const {return textCode->cursorRect(cursor);} QRect cursorRect(const QTextCursor & cursor) const {return textCode->cursorRect(cursor);}
QString text() const {return textCode->toPlainText();} QString text() const {return textCode->toPlainText();}
QString helpWord() const {return es_cursor.cursor.selectedText();}
bool showSpaces() const {return spaces_;} bool showSpaces() const {return spaces_;}
bool showLineNumbers() const {return textLines->isVisible();} bool showLineNumbers() const {return textLines->isVisible();}
@@ -50,7 +53,12 @@ protected:
virtual ACList autoCompletitionList(const QStringList & scope, const QString & written) const {return ACList();} virtual ACList autoCompletitionList(const QStringList & scope, const QString & written) const {return ACList();}
virtual void parse() {} virtual void parse() {}
QString selectArg(QString s, int arg);
void raiseHelp(QTextCursor tc, int arg = -1);
void hideHelp();
QTextCursor functionStart(QTextCursor tc, int * arg);
ACList wordsCompletitionList(const QString & written) const; ACList wordsCompletitionList(const QString & written) const;
QPair<QStringList, QString> getScope(QTextCursor tc, bool * ok = 0);
static int skipRange(const QString & s, int pos, QChar oc, QChar cc, QChar sc = QChar()); static int skipRange(const QString & s, int pos, QChar oc, QChar cc, QChar sc = QChar());
static int skipCWord(const QString & s, int pos); static int skipCWord(const QString & s, int pos);
static bool matchWritten(QString s, QString w); static bool matchWritten(QString s, QString w);
@@ -66,12 +74,13 @@ private:
}; };
QPlainTextEdit * textCode, * textLines; QPlainTextEdit * textCode, * textLines;
QTreeWidget completer; QTreeWidget * completer;
QTextEdit::ExtraSelection es_line; IconedLabel * lbl_help;
QTextEdit::ExtraSelection es_line, es_cursor;
QList<QTextEdit::ExtraSelection> es_selected, es_custom; QList<QTextEdit::ExtraSelection> es_selected, es_custom;
QMap<int, ACClass> ac_classes; QMap<int, ACClass> ac_classes;
int prev_lc, auto_comp_pl, timer; int prev_lc, auto_comp_pl, timer;
bool spaces_, _ignore_focus_out, _first; bool spaces_, _ignore_focus_out, _first, _destructor;
bool eventFilter(QObject * o, QEvent * e); bool eventFilter(QObject * o, QEvent * e);
void showEvent(QShowEvent * ); void showEvent(QShowEvent * );
@@ -81,6 +90,7 @@ private:
void previousCompletition(); void previousCompletition();
private slots: private slots:
void syncScrolls();
void deleteLine(); void deleteLine();
void copyLineUp(); void copyLineUp();
void copyLineDown(); void copyLineDown();
@@ -89,7 +99,6 @@ private slots:
void indent(); void indent();
void deindent(); void deindent();
void autoIndent(); void autoIndent();
void updateLines();
void invokeAutoCompletition(bool force = false); void invokeAutoCompletition(bool force = false);
void commitCompletition(); void commitCompletition();
void textEdit_cursorPositionChanged(); void textEdit_cursorPositionChanged();
@@ -97,6 +106,8 @@ private slots:
void textEdit_selectionChanged(); void textEdit_selectionChanged();
public slots: public slots:
void updateLines();
void scrollToTop();
void setFocus() {textCode->setFocus();} void setFocus() {textCode->setFocus();}
void setText(const QString & t) {textCode->setPlainText(t);} void setText(const QString & t) {textCode->setPlainText(t);}
void setShowSpaces(bool yes); void setShowSpaces(bool yes);