History

Check script file for external changes when editor regains focus

Prompt user whether to reload.

David Rowe committed 12 years ago

Commit c454c791 parent 3df43dc4 files · +56 −4Browse files

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

Unified · Split

interface/src/ui/ScriptEditorWindow.cpp+11−0
@@ -36,6 +36,8 @@ ScriptEditorWindow::ScriptEditorWindow() : · 35 unmodified lines
36 _loadMenu(new QMenu),36 _loadMenu(new QMenu),
37 _saveMenu(new QMenu)37 _saveMenu(new QMenu)
38{38{
39 setAttribute(Qt::WA_DeleteOnClose);
40
39 _ScriptEditorWindowUI->setupUi(this);41 _ScriptEditorWindowUI->setupUi(this);
40 this->setWindowFlags(Qt::Tool);42 this->setWindowFlags(Qt::Tool);
41 show();43 show();
@@ -140,6 +142,7 @@ ScriptEditorWidget* ScriptEditorWindow::addScriptEditorWidget(QString title) { · 98 unmodified lines
140 connect(newScriptEditorWidget, &ScriptEditorWidget::scriptnameChanged, this, &ScriptEditorWindow::updateScriptNameOrStatus);142 connect(newScriptEditorWidget, &ScriptEditorWidget::scriptnameChanged, this, &ScriptEditorWindow::updateScriptNameOrStatus);
141 connect(newScriptEditorWidget, &ScriptEditorWidget::scriptModified, this, &ScriptEditorWindow::updateScriptNameOrStatus);143 connect(newScriptEditorWidget, &ScriptEditorWidget::scriptModified, this, &ScriptEditorWindow::updateScriptNameOrStatus);
142 connect(newScriptEditorWidget, &ScriptEditorWidget::runningStateChanged, this, &ScriptEditorWindow::updateButtons);144 connect(newScriptEditorWidget, &ScriptEditorWidget::runningStateChanged, this, &ScriptEditorWindow::updateButtons);
145 connect(this, &ScriptEditorWindow::windowActivated, newScriptEditorWidget, &ScriptEditorWidget::onWindowActivated);
143 _ScriptEditorWindowUI->tabWidget->addTab(newScriptEditorWidget, title);146 _ScriptEditorWindowUI->tabWidget->addTab(newScriptEditorWidget, title);
144 _ScriptEditorWindowUI->tabWidget->setCurrentWidget(newScriptEditorWidget);147 _ScriptEditorWindowUI->tabWidget->setCurrentWidget(newScriptEditorWidget);
145 newScriptEditorWidget->setUpdatesEnabled(true);148 newScriptEditorWidget->setUpdatesEnabled(true);
@@ -216,3 +219,11 @@ void ScriptEditorWindow::terminateCurrentTab() { · 70 unmodified lines
216 this->raise();219 this->raise();
217 }220 }
218}221}
222
223bool ScriptEditorWindow::event(QEvent* event) {
224 if (event->type() == QEvent::WindowActivate) {
225 emit windowActivated();
226 }
227 return QWidget::event(event);
228}
229