mirror of https://github.com/vitalif/openscad
Added Q_OBJECT macro to make slots work, made wrapping look more like existing editor
parent
10f4a52985
commit
759e926b9a
|
@ -10,9 +10,10 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
|
||||||
qsci = new QsciScintilla(this);
|
qsci = new QsciScintilla(this);
|
||||||
scintillaLayout->setContentsMargins(0, 0, 0, 0);
|
scintillaLayout->setContentsMargins(0, 0, 0, 0);
|
||||||
scintillaLayout->addWidget(qsci);
|
scintillaLayout->addWidget(qsci);
|
||||||
|
|
||||||
qsci->setBraceMatching (QsciScintilla::SloppyBraceMatch);
|
qsci->setBraceMatching (QsciScintilla::SloppyBraceMatch);
|
||||||
qsci->setWrapMode(QsciScintilla::WrapWord);
|
qsci->setWrapMode(QsciScintilla::WrapCharacter);
|
||||||
qsci->setWrapVisualFlags(QsciScintilla::WrapFlagByText, QsciScintilla::WrapFlagByText, 0);
|
qsci->setWrapVisualFlags(QsciScintilla::WrapFlagByBorder, QsciScintilla::WrapFlagNone, 0);
|
||||||
qsci->setAutoIndent(true);
|
qsci->setAutoIndent(true);
|
||||||
qsci->indicatorDefine(QsciScintilla::RoundBoxIndicator, indicatorNumber);
|
qsci->indicatorDefine(QsciScintilla::RoundBoxIndicator, indicatorNumber);
|
||||||
qsci->markerDefine(QsciScintilla::Circle, markerNumber);
|
qsci->markerDefine(QsciScintilla::Circle, markerNumber);
|
||||||
|
@ -25,7 +26,7 @@ ScintillaEditor::ScintillaEditor(QWidget *parent) : EditorInterface(parent)
|
||||||
qsci->setCaretLineVisible(true);
|
qsci->setCaretLineVisible(true);
|
||||||
this->setHighlightScheme(preferenceEditorOption);
|
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)));
|
connect(qsci, SIGNAL(modificationChanged(bool)), this, SIGNAL(modificationChanged(bool)));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -11,6 +11,7 @@
|
||||||
|
|
||||||
class ScintillaEditor : public EditorInterface
|
class ScintillaEditor : public EditorInterface
|
||||||
{
|
{
|
||||||
|
Q_OBJECT;
|
||||||
public:
|
public:
|
||||||
ScintillaEditor(QWidget *parent);
|
ScintillaEditor(QWidget *parent);
|
||||||
virtual ~ScintillaEditor() {}
|
virtual ~ScintillaEditor() {}
|
||||||
|
@ -45,9 +46,11 @@ public slots:
|
||||||
void cut();
|
void cut();
|
||||||
void copy();
|
void copy();
|
||||||
void paste();
|
void paste();
|
||||||
void onTextChanged();
|
|
||||||
void initFont(const QString&, uint);
|
void initFont(const QString&, uint);
|
||||||
|
|
||||||
|
private slots:
|
||||||
|
void onTextChanged();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QVBoxLayout *scintillaLayout;
|
QVBoxLayout *scintillaLayout;
|
||||||
static const int indicatorNumber = 1;
|
static const int indicatorNumber = 1;
|
||||||
|
|
Loading…
Reference in New Issue