vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Added Q_OBJECT macro to make slots work, made wrapping look more like existing editor

master
Marius Kintel 2014-08-22 18:54:09 -04:00
parent 10f4a52985
commit 759e926b9a
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/scintillaeditor.cpp
View File

@ -10,9 +10,10 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
qsci = new QsciScintilla(this);
scintillaLayout->setContentsMargins(0, 0, 0, 0);
scintillaLayout->addWidget(qsci);
qsci->setBraceMatching (QsciScintilla::SloppyBraceMatch);
qsci->setWrapMode(QsciScintilla::WrapWord);
qsci->setWrapVisualFlags(QsciScintilla::WrapFlagByText, QsciScintilla::WrapFlagByText, 0);
qsci->setWrapMode(QsciScintilla::WrapCharacter);
qsci->setWrapVisualFlags(QsciScintilla::WrapFlagByBorder, QsciScintilla::WrapFlagNone, 0);
qsci->setAutoIndent(true);
qsci->indicatorDefine(QsciScintilla::RoundBoxIndicator, indicatorNumber);
qsci->markerDefine(QsciScintilla::Circle, markerNumber);
@ -25,7 +26,7 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
qsci->setCaretLineVisible(true);
this->setHighlightScheme(preferenceEditorOption);
connect(qsci, SIGNAL(textChanged()), this, SIGNAL(textChanged()));
connect(qsci, SIGNAL(textChanged()), this, SIGNAL(contentsChanged()));
connect(qsci, SIGNAL(modificationChanged(bool)), this, SIGNAL(modificationChanged(bool)));
}

5
src/scintillaeditor.h
View File

@ -11,6 +11,7 @@
class ScintillaEditor : public EditorInterface
{
Q_OBJECT;
public:
ScintillaEditor(QWidget *parent);
virtual ~ScintillaEditor() {}
@ -45,9 +46,11 @@ public slots:
void cut();
void copy();
void paste();
void onTextChanged();
void initFont(const QString&, uint);
private slots:
void onTextChanged();
private:
QVBoxLayout *scintillaLayout;
static const int indicatorNumber = 1;