From 5eaaf70fcd0fcea3f613b5e2180ffef4fb55095a Mon Sep 17 00:00:00 2001 From: Klaus Basan Date: Fri, 10 Oct 2014 01:42:07 +0200 Subject: [PATCH] refs #335, renamed enums in Application context component means something different in GUI, renamed to application --- src/blackcore/context_application.h | 14 +++++++------- src/swiftgui_standard/mainwindow.cpp | 6 ++++-- src/swiftgui_standard/mainwindow_init.cpp | 2 +- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/src/blackcore/context_application.h b/src/blackcore/context_application.h index 84461926a..df595c35e 100644 --- a/src/blackcore/context_application.h +++ b/src/blackcore/context_application.h @@ -43,18 +43,18 @@ namespace BlackCore IContextApplication(CRuntimeConfig::ContextMode mode, CRuntime *runtime); public: - //! Components - enum Component : uint + //! Parts of the application + enum Application : uint { - ComponentGui, - ComponentCore + ApplicationGui, + ApplicationCore }; - //! What a component does + //! State of application enum Actions : uint { - ActionStarts, - ActionStops + ApplicationStarts, + ApplicationStops }; //! Service name diff --git a/src/swiftgui_standard/mainwindow.cpp b/src/swiftgui_standard/mainwindow.cpp index 4c0ebb735..84a2115ba 100644 --- a/src/swiftgui_standard/mainwindow.cpp +++ b/src/swiftgui_standard/mainwindow.cpp @@ -65,11 +65,13 @@ MainWindow::~MainWindow() */ void MainWindow::gracefulShutdown() { - if (!this->m_init) return; + if (!this->m_init) { return; } this->m_init = false; if (this->getIContextApplication()) - this->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ComponentGui, IContextApplication::ActionStops); + { + this->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ApplicationGui, IContextApplication::ApplicationStops); + } // close info window if (this->m_compInfoWindow) diff --git a/src/swiftgui_standard/mainwindow_init.cpp b/src/swiftgui_standard/mainwindow_init.cpp index f1e6c6888..6b9394244 100644 --- a/src/swiftgui_standard/mainwindow_init.cpp +++ b/src/swiftgui_standard/mainwindow_init.cpp @@ -132,7 +132,7 @@ void MainWindow::init(const CRuntimeConfig &runtimeConfig) this->ps_setMainPage(true); // starting - this->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ComponentGui, IContextApplication::ActionStarts); + this->getIContextApplication()->notifyAboutComponentChange(IContextApplication::ApplicationGui, IContextApplication::ApplicationStarts); // We don't receive signals from the past. So ask for it simulate an initial signal ps_onSimulatorConnectionChanged(this->getIContextSimulator()->isConnected());