t.mettler/giesCANne
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switched script source code view to a QScintilla based view.

Browse Source
This commit is contained in:
Collin Kidder
2015-12-02 21:56:06 -05:00
parent 0d7490a423
commit cc0f1733b1
3 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scriptingwindow.cpp
+5 -2
View File
@@ -3,6 +3,7 @@
#include <QFile>
#include <QFileDialog>
#include <Qsci/qscilexerjavascript.h>
#include "mainwindow.h"
@@ -23,6 +24,8 @@ ScriptingWindow::ScriptingWindow(const QVector<CANFrame> *frames, QWidget *paren
connect(ui->btnRevertScript, &QAbstractButton::pressed, this, &ScriptingWindow::revertScript);
connect(ui->btnSaveScript, &QAbstractButton::pressed, this, &ScriptingWindow::saveScript);
connect(MainWindow::getReference(), &MainWindow::framesUpdated, this, &ScriptingWindow::updatedFrames);
ui->txtScriptSource->setLexer(new QsciLexerJavaScript(ui->txtScriptSource));
}
ScriptingWindow::~ScriptingWindow()
@@ -181,7 +184,7 @@ void ScriptingWindow::saveScript()
delete outFile;
return;
}
outFile->write(ui->txtScriptSource->toPlainText().toUtf8());
outFile->write(ui->txtScriptSource->text().toUtf8());
outFile->close();
delete outFile;
}
@@ -195,6 +198,6 @@ void ScriptingWindow::revertScript()
void ScriptingWindow::recompileScript()
{
currentScript->scriptText = ui->txtScriptSource->toPlainText();
currentScript->scriptText = ui->txtScriptSource->text();
currentScript->compileScript();
}