GCE
/
xinx
1
0
Fork 0
Code Issues Pull Requests Releases 3 Wiki Activity
Browse Source

We use a forked qcodeedit

v0.8.0
Ulrich Van Den Hekke 14 years ago
parent
dd091d94a7
commit
7b57ecbf25
5 changed files with 14 additions and 381 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      WARNING
  2. 31
      ext/qcodeedit.patch/001_QLanguageFactory.patch
  3. 321
      ext/qcodeedit.patch/002_InputBinding.patch
  4. 26
      ext/qcodeedit.patch/003_Xml_Description.patch
  5. 4
      plugins/webplugin/qcodeedit/xml.qnfa

13
WARNING
Unescape View File

@ -3,9 +3,20 @@ @@ -3,9 +3,20 @@
- I have a crash in use (QVector index out of bound)
- Bookmark bar doesn't work
- If i have an error and i press <ENTER> before the error is correct, the line is red
- Attention la marque suit la ligne pas le numéro de ligne.
- Crash quand essai d'utilisation de Ctrl+Shift+Bas
- Quand ca marche, le curseur ne suit pas la ligne
- Quand j'ai une sélection plantage.
- Attention la marque suit la ligne pas le numéro de ligne.
- Le surligner automatique/non automatique ne fonctionne pas.
- Le surligner ne marche pas quand recherche espace.
- Problème lors d'ouverture de fichier qui n'existe plus ?
- Ctrl+D pour dupliquer ne fonctionne pas : plantage
- Si ajout de // sur une ligne de l'éditeur ....
- Verifier
- Que les paramétre sur la spécificité d'un type de fichier fonctionne toujours
- Lenteur :
- Problème lors de enter suivis directe d'un tab
- Si Ok dans boite de dialogue propriété projet.
- après sauvegarde ? ==> Remettre les plugins au carré

31
ext/qcodeedit.patch/001_QLanguageFactory.patch
Unescape View File

@ -1,31 +0,0 @@ @@ -1,31 +0,0 @@
Index: lib/language/qlanguagefactory.h
===================================================================
--- lib/language/qlanguagefactory.h (révision 758)
+++ lib/language/qlanguagefactory.h (copie de travail)
@@ -54,6 +54,9 @@
virtual QLanguageDefinition* definition(const QString& file);
virtual QCodeCompletionEngine* completionEngine(const QString& file);
+
+ const QList<QCodeCompletionEngine*> & engines() const;
+ const QList<QLanguageDefinition*> & languageDefinitions() const;
inline QFormatFactory* formatFactory() const { return pFormatFactory; }
Index: lib/language/qlanguagefactory.cpp
===================================================================
--- lib/language/qlanguagefactory.cpp (révision 758)
+++ lib/language/qlanguagefactory.cpp (copie de travail)
@@ -332,4 +332,12 @@
}
}
+const QList<QCodeCompletionEngine*> & QLanguageFactory::engines() const {
+ return m_engines;
+}
+
+const QList<QLanguageDefinition*> & QLanguageFactory::languageDefinitions() const {
+ return definitions;
+}
+
/*! @} */

321
ext/qcodeedit.patch/002_InputBinding.patch
Unescape View File

@ -1,321 +0,0 @@ @@ -1,321 +0,0 @@
Index: lib/qeditor.cpp
===================================================================
--- lib/qeditor.cpp (révision 758)
+++ lib/qeditor.cpp (copie de travail)
@@ -1634,6 +1634,12 @@
addCursorMirror(QDocumentCursor(m_doc, ln, m_cursor.anchorColumn()));
repaintCursor();
emitCursorPositionChanged();
+
+ if ( m_binding )
+ {
+ m_binding->keyPressEventOut(e, this);
+ }
+
return;
}
}
@@ -1673,6 +1679,11 @@
emitCursorPositionChanged();
+ if ( m_binding )
+ {
+ m_binding->keyPressEventOut(e, this);
+ }
+
return;
}
@@ -1709,6 +1720,11 @@
if ( !bOk )
{
QAbstractScrollArea::keyPressEvent(e);
+
+ if ( m_binding )
+ {
+ m_binding->keyPressEventOut(e, this);
+ }
return;
}
@@ -1718,8 +1734,14 @@
ensureCursorVisible();
repaintCursor();
selectionChange();
+
+ if ( m_binding )
+ {
+ m_binding->keyPressEventOut(e, this);
}
+}
+
void QEditor::inputMethodEvent(QInputMethodEvent* e)
{
if ( m_binding )
@@ -1745,7 +1767,12 @@
m_cursor.insertText(e->commitString());
m_cursor.endEditBlock();
+
+ if ( m_binding )
+ {
+ m_binding->inputMethodEventOut(e, this);
}
+}
void QEditor::mouseMoveEvent(QMouseEvent *e)
{
@@ -1755,11 +1782,21 @@
return;
}
- if ( !(e->buttons() & Qt::LeftButton) )
+ if ( !(e->buttons() & Qt::LeftButton) ) {
+ if ( m_binding )
+ {
+ m_binding->mouseMoveEventOut(e, this);
+ }
return;
+ }
- if ( !( flag(MousePressed) || m_doubleClick.hasSelection() ) )
+ if ( !( flag(MousePressed) || m_doubleClick.hasSelection() ) ) {
+ if ( m_binding )
+ {
+ m_binding->mouseMoveEventOut(e, this);
+ }
return;
+ }
if ( flag(MaybeDrag) )
{
@@ -1771,6 +1808,12 @@
startDrag();
//emit clearAutoCloseStack();
+
+ if ( m_binding )
+ {
+ m_binding->mouseMoveEventOut(e, this);
+ }
+
return;
}
@@ -1790,8 +1833,13 @@
QDocumentCursor newCursor = cursorForPosition(mousePos);
- if ( newCursor.isNull() )
+ if ( newCursor.isNull() ) {
+ if ( m_binding )
+ {
+ m_binding->mouseMoveEventOut(e, this);
+ }
return;
+ }
if ( flag(Persistent) )
{
@@ -1840,7 +1888,12 @@
emitCursorPositionChanged();
repaintCursor();
+
+ if ( m_binding )
+ {
+ m_binding->mouseMoveEventOut(e, this);
}
+}
void QEditor::mousePressEvent(QMouseEvent *e)
{
@@ -1850,8 +1903,13 @@
return;
}
- if ( !(e->buttons() & Qt::LeftButton) )
+ if ( !(e->buttons() & Qt::LeftButton) ) {
+ if ( m_binding )
+ {
+ m_binding->mousePressEventOut(e, this);
+ }
return;
+ }
QPoint p = mapToContents(e->pos());
@@ -1877,8 +1935,13 @@
} else {
QDocumentCursor cursor = cursorForPosition(p);
- if ( cursor.isNull() )
+ if ( cursor.isNull() ) {
+ if ( m_binding )
+ {
+ m_binding->mousePressEventOut(e, this);
+ }
return;
+ }
if ( e->modifiers() == Qt::ShiftModifier )
{
@@ -1945,6 +2008,11 @@
m_dragPoint = e->globalPos();
m_drag.start(QApplication::startDragTime(), this);
+ if ( m_binding )
+ {
+ m_binding->mousePressEventOut(e, this);
+ }
+
return;
}
}
@@ -1953,6 +2021,12 @@
// clearCursorMirrors();
m_doubleClick = QDocumentCursor();
setCursor(cursor);
+
+ if ( m_binding )
+ {
+ m_binding->mousePressEventOut(e, this);
+ }
+
return;
}
}
@@ -1962,7 +2036,12 @@
emitCursorPositionChanged();
repaintCursor();
selectionChange();
+
+ if ( m_binding )
+ {
+ m_binding->mousePressEventOut(e, this);
}
+}
void QEditor::mouseReleaseEvent(QMouseEvent *e)
{
@@ -2014,7 +2093,12 @@
m_drag.stop();
selectionChange();
+
+ if ( m_binding )
+ {
+ m_binding->mouseReleaseEventOut(e, this);
}
+}
void QEditor::mouseDoubleClickEvent(QMouseEvent *e)
{
@@ -2026,6 +2110,11 @@
if ( e->button() != Qt::LeftButton )
{
+ if ( m_binding )
+ {
+ m_binding->mouseDoubleClickEventOut(e, this);
+ }
+
e->ignore();
return;
}
@@ -2062,7 +2151,12 @@
m_clickPoint = e->globalPos();
m_click.start(qApp->doubleClickInterval(), this);
+
+ if ( m_binding )
+ {
+ m_binding->mouseDoubleClickEventOut(e, this);
}
+}
void QEditor::dragEnterEvent(QDragEnterEvent *e)
{
Index: lib/qeditor.h
===================================================================
--- lib/qeditor.h (révision 758)
+++ lib/qeditor.h (copie de travail)
@@ -101,6 +101,12 @@
return false;
}
+ virtual void keyPressEventOut(QKeyEvent *event, QEditor *editor)
+ {
+ Q_UNUSED(event);
+ Q_UNUSED(editor);
+ }
+
virtual bool inputMethodEvent(QInputMethodEvent* event, QEditor *editor)
{
Q_UNUSED(event)
@@ -108,6 +114,12 @@
return false;
}
+ virtual void inputMethodEventOut(QInputMethodEvent* event, QEditor* editor)
+ {
+ Q_UNUSED(event);
+ Q_UNUSED(editor);
+ }
+
virtual bool mouseMoveEvent(QMouseEvent *event, QEditor *editor)
{
Q_UNUSED(event)
@@ -115,6 +127,12 @@
return false;
}
+ virtual void mouseMoveEventOut(QMouseEvent *event, QEditor *editor)
+ {
+ Q_UNUSED(event);
+ Q_UNUSED(editor);
+ }
+
virtual bool mousePressEvent(QMouseEvent *event, QEditor *editor)
{
Q_UNUSED(event)
@@ -122,6 +140,12 @@
return false;
}
+ virtual void mousePressEventOut(QMouseEvent *event, QEditor *editor)
+ {
+ Q_UNUSED(event)
+ Q_UNUSED(editor)
+ }
+
virtual bool mouseReleaseEvent(QMouseEvent *event, QEditor *editor)
{
Q_UNUSED(event)
@@ -129,12 +153,24 @@
return false;
}
+ virtual void mouseReleaseEventOut(QMouseEvent *event, QEditor *editor)
+ {
+ Q_UNUSED(event)
+ Q_UNUSED(editor)
+ }
+
virtual bool mouseDoubleClickEvent(QMouseEvent *event, QEditor *editor)
{
Q_UNUSED(event)
Q_UNUSED(editor)
return false;
}
+
+ virtual void mouseDoubleClickEventOut(QMouseEvent *event, QEditor *editor)
+ {
+ Q_UNUSED(event)
+ Q_UNUSED(editor)
+ }
};
//typedef QFlags<EditFlag> State;

26
ext/qcodeedit.patch/003_Xml_Description.patch
Unescape View File

@ -1,26 +0,0 @@ @@ -1,26 +0,0 @@
Index: qxs/xml.qnfa
===================================================================
--- qxs/xml.qnfa (révision 758)
+++ qxs/xml.qnfa (copie de travail)
@@ -22,10 +22,10 @@
<sequence id="entity" format="numbers">&amp;$w+;</sequence>
- <context id="tag" >
- <start format="keyword" parenthesis="xmltag:open@nomatch" indent="1" fold="1" >&lt;[$w:]+</start>
- <start format="keyword" parenthesis="xmltag:close@nomatch" indent="1" fold="1" >&lt;/[$w:]+</start>
- <stop format="keyword" >&gt;</stop>
+ <context id="tag/start" >
+ <start format="keyword">&lt;[$w:]+</start>
+ <stop format="keyword" parenthesis="xmltag:open@nomatch" indent="1" fold="1" >&gt;</stop>
+ <stop format="keyword">/&gt;</stop>
<word format="preprocessor">[$w:]+=</word>
@@ -42,5 +42,5 @@
</context>
</context>
- <!-- <sequence id="tag/stop" parenthesis="xmltag:close@nomatch" indent="1" fold="1" format="keyword" >&lt;/[a-zA-Z0-9_:]+&gt;</sequence> -->
+ <sequence id="tag/stop" parenthesis="xmltag:close@nomatch" indent="1" fold="1" format="keyword" >&lt;/[$w:]+&gt;</sequence>
</QNFA>

4
plugins/webplugin/qcodeedit/xml.qnfa
Unescape View File

@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
<context id="tag/start" >
<start format="xml_elementname" >&lt;[$w:\-]+</start>
<stop format="xml_elementname" parenthesis="xmltag:open@nomatch" indent="1" fold="1" >&gt;</stop>
<stop format="xml_elementname" parenthesis="xmltag:open@nomatch" indent="0" fold="1" >&gt;</stop>
<stop format="xml_elementname" >/&gt;</stop>
<word format="xml_attributename">[$w:]+=</word>
@ -58,5 +58,5 @@ @@ -58,5 +58,5 @@
</context>
</context>
<sequence id="tag/stop" parenthesis="xmltag:close@nomatch" indent="1" fold="1" format="xml_elementname" >&lt;/[$w:\-]+&gt;</sequence>
<sequence id="tag/stop" parenthesis="xmltag:close@nomatch" indent="0" fold="1" format="xml_elementname" >&lt;/[$w:\-]+&gt;</sequence>
</QNFA>

Write Preview
Loading…
Cancel
Save