History

Style

Thijs Wenker committed 12 years ago

Commit c1ed38f1 parent 0e28ff26 files · +147 −131Browse files

Showing the changes to interface/src/ui/ScriptEditorWidget.cpp (1 of 6 files). Show all

Unified · Split

interface/src/ui/ScriptEditorWidget.cpp+38−36
@@ -27,40 +27,39 @@ · 26 unmodified lines
2727 #include "ScriptHighlighting.h"
2828
2929 ScriptEditorWidget::ScriptEditorWidget() :
30− ui(new Ui::ScriptEditorWidget)
30+ _scriptEditorWidgetUI(new Ui::ScriptEditorWidget),
31+ _scriptEngine(NULL)
3132 {
32− ui->setupUi(this);
33+ _scriptEditorWidgetUI->setupUi(this);
3334
34− scriptEngine = NULL;
35−
36− connect(ui->scriptEdit->document(), SIGNAL(modificationChanged(bool)), this, SIGNAL(scriptModified()));
37− connect(ui->scriptEdit->document(), SIGNAL(contentsChanged()), this, SLOT(onScriptModified()));
35+ connect(_scriptEditorWidgetUI->scriptEdit->document(), SIGNAL(modificationChanged(bool)), this, SIGNAL(scriptModified()));
36+ connect(_scriptEditorWidgetUI->scriptEdit->document(), SIGNAL(contentsChanged()), this, SLOT(onScriptModified()));
3837
3938 // remove the title bar (see the Qt docs on setTitleBarWidget)
4039 setTitleBarWidget(new QWidget());
41− QFontMetrics fm(this->ui->scriptEdit->font());
42− this->ui->scriptEdit->setTabStopWidth(fm.width('0') * 4);
43− ScriptHighlighting* highlighting = new ScriptHighlighting(this->ui->scriptEdit->document());
44− QTimer::singleShot(0, this->ui->scriptEdit, SLOT(setFocus()));
40+ QFontMetrics fm(_scriptEditorWidgetUI->scriptEdit->font());
41+ _scriptEditorWidgetUI->scriptEdit->setTabStopWidth(fm.width('0') * 4);
42+ ScriptHighlighting* highlighting = new ScriptHighlighting(_scriptEditorWidgetUI->scriptEdit->document());
43+ QTimer::singleShot(0, _scriptEditorWidgetUI->scriptEdit, SLOT(setFocus()));
4544 }
4645
4746 ScriptEditorWidget::~ScriptEditorWidget() {
48− delete ui;
47+ delete _scriptEditorWidgetUI;
4948 }
5049
5150 void ScriptEditorWidget::onScriptModified() {
52− if(ui->onTheFlyCheckBox->isChecked() && isRunning()) {
51+ if(_scriptEditorWidgetUI->onTheFlyCheckBox->isChecked() && isRunning()) {
5352 setRunning(false);
5453 setRunning(true);
5554 }
5655 }
5756
5857 bool ScriptEditorWidget::isModified() {
59− return ui->scriptEdit->document()->isModified();
58+ return _scriptEditorWidgetUI->scriptEdit->document()->isModified();
6059 }
6160
6261 bool ScriptEditorWidget::isRunning() {
63− return (scriptEngine != NULL) ? scriptEngine->isRunning() : false;
62+ return (_scriptEngine != NULL) ? _scriptEngine->isRunning() : false;
6463 }
6564
6665 bool ScriptEditorWidget::setRunning(bool run) {
@@ -72,15 +71,15 @@ bool ScriptEditorWidget::setRunning(bool run) { · 5 unmodified lines
7271 disconnect(this, SLOT(onScriptPrint(const QString&)));
7372
7473 if (run) {
75− scriptEngine = Application::getInstance()->loadScript(this->currentScript, false);
76− connect(scriptEngine, SIGNAL(runningStateChanged()), this, SIGNAL(runningStateChanged()));
74+ _scriptEngine = Application::getInstance()->loadScript(_currentScript, false);
75+ connect(_scriptEngine, SIGNAL(runningStateChanged()), this, SIGNAL(runningStateChanged()));
7776
7877 // Make new connections.
79− connect(scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(onScriptError(const QString&)));
80− connect(scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(onScriptPrint(const QString&)));
78+ connect(_scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(onScriptError(const QString&)));
79+ connect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(onScriptPrint(const QString&)));
8180 } else {
82− Application::getInstance()->stopScript(this->currentScript);
83− scriptEngine = NULL;
81+ Application::getInstance()->stopScript(_currentScript);
82+ _scriptEngine = NULL;
8483 }
8584 return true;
8685 }
@@ -88,18 +87,19 @@ bool ScriptEditorWidget::setRunning(bool run) { · 1 unmodified line
8887 bool ScriptEditorWidget::saveFile(const QString &scriptPath) {
8988 QFile file(scriptPath);
9089 if (!file.open(QFile::WriteOnly | QFile::Text)) {
91− QMessageBox::warning(this, tr("Interface"), tr("Cannot write script %1:\n%2.").arg(scriptPath).arg(file.errorString()));
90+ QMessageBox::warning(this, tr("Interface"), tr("Cannot write script %1:\n%2.").arg(scriptPath)
91+ .arg(file.errorString()));
9292 return false;
9393 }
9494
9595 QTextStream out(&file);
96− out << ui->scriptEdit->toPlainText();
96+ out << _scriptEditorWidgetUI->scriptEdit->toPlainText();
9797
9898 setScriptFile(scriptPath);
9999 return true;
100100 }
101101
102−void ScriptEditorWidget::loadFile(const QString &scriptPath) {
102+void ScriptEditorWidget::loadFile(const QString& scriptPath) {
103103 QFile file(scriptPath);
104104 if (!file.open(QFile::ReadOnly | QFile::Text)) {
105105 QMessageBox::warning(this, tr("Interface"), tr("Cannot read script %1:\n%2.").arg(scriptPath).arg(file.errorString()));
@@ -107,23 +107,23 @@ void ScriptEditorWidget::loadFile(const QString &scriptPath) { · 1 unmodified line
107107 }
108108
109109 QTextStream in(&file);
110− ui->scriptEdit->setPlainText(in.readAll());
110+ _scriptEditorWidgetUI->scriptEdit->setPlainText(in.readAll());
111111
112112 setScriptFile(scriptPath);
113113
114114 disconnect(this, SLOT(onScriptError(const QString&)));
115115 disconnect(this, SLOT(onScriptPrint(const QString&)));
116116
117− scriptEngine = Application::getInstance()->getScriptEngine(scriptPath);
118− if (scriptEngine != NULL) {
119− connect(scriptEngine, SIGNAL(runningStateChanged()), this, SIGNAL(runningStateChanged()));
120− connect(scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(onScriptError(const QString&)));
121− connect(scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(onScriptPrint(const QString&)));
117+ _scriptEngine = Application::getInstance()->getScriptEngine(scriptPath);
118+ if (_scriptEngine != NULL) {
119+ connect(_scriptEngine, SIGNAL(runningStateChanged()), this, SIGNAL(runningStateChanged()));
120+ connect(_scriptEngine, SIGNAL(errorMessage(const QString&)), this, SLOT(onScriptError(const QString&)));
121+ connect(_scriptEngine, SIGNAL(printedMessage(const QString&)), this, SLOT(onScriptPrint(const QString&)));
122122 }
123123 }
124124
125125 bool ScriptEditorWidget::save() {
126− return currentScript.isEmpty() ? saveAs() : saveFile(currentScript);
126+ return _currentScript.isEmpty() ? saveAs() : saveFile(_currentScript);
127127 }
128128
129129 bool ScriptEditorWidget::saveAs() {
@@ -132,25 +132,27 @@ bool ScriptEditorWidget::saveAs() { · 2 unmodified lines
132132 }
133133
134134 void ScriptEditorWidget::setScriptFile(const QString& scriptPath) {
135− currentScript = scriptPath;
136− ui->scriptEdit->document()->setModified(false);
135+ _currentScript = scriptPath;
136+ _scriptEditorWidgetUI->scriptEdit->document()->setModified(false);
137137 setWindowModified(false);
138138
139139 emit scriptnameChanged();
140140 }
141141
142142 bool ScriptEditorWidget::questionSave() {
143− if (ui->scriptEdit->document()->isModified()) {
144− QMessageBox::StandardButton button = QMessageBox::warning(this, tr("Interface"), tr("The script has been modified.\nDo you want to save your changes?"), QMessageBox::Save | QMessageBox::Discard | QMessageBox::Cancel, QMessageBox::Save);
143+ if (_scriptEditorWidgetUI->scriptEdit->document()->isModified()) {
144+ QMessageBox::StandardButton button = QMessageBox::warning(this, tr("Interface"),
145+ tr("The script has been modified.\nDo you want to save your changes?"), QMessageBox::Save | QMessageBox::Discard |
146+ QMessageBox::Cancel, QMessageBox::Save);
145147 return button == QMessageBox::Save ? save() : (button == QMessageBox::Cancel ? false : true);
146148 }
147149 return true;
148150 }
149151
150152 void ScriptEditorWidget::onScriptError(const QString& message) {
151− ui->debugText->appendPlainText("ERROR: "+ message);
153+ _scriptEditorWidgetUI->debugText->appendPlainText("ERROR: " + message);
152154 }
153155
154156 void ScriptEditorWidget::onScriptPrint(const QString& message) {
155− ui->debugText->appendPlainText("> "+message);
157+ _scriptEditorWidgetUI->debugText->appendPlainText("> " + message);
156158 }