refs #445, prepared for data entry GUI

* unified init of GUIs
* used CProject::swiftVersionString()

src/swiftcore/swiftcore.cpp

@@ -38,8 +38,8 @@ CSwiftCore::CSwiftCore(const SetupInfo &info, QWidget *parent) :
     setWindowTitle(name);
     setWindowIcon(CIcons::swiftNova24());
     setWindowIconText(name);
-    setupLogDisplay();
-    connectSlots();
+    initLogDisplay();
+    initSlots();
     initStyleSheet();
     startCore(info);
 }
@@ -94,7 +94,7 @@ void CSwiftCore::ps_onStyleSheetsChanged()
     this->initStyleSheet();
 }
 
-void CSwiftCore::connectSlots()
+void CSwiftCore::initSlots()
 {
     connect(ui->pb_StartCore, &QPushButton::clicked, this, &CSwiftCore::ps_startCorePressed);
     connect(ui->pb_StopCore, &QPushButton::clicked, this, &CSwiftCore::ps_stopCorePressed);
@@ -102,7 +102,7 @@ void CSwiftCore::connectSlots()
     connect(&CStyleSheetUtility::instance(), &CStyleSheetUtility::styleSheetsChanged, this, &CSwiftCore::ps_onStyleSheetsChanged);
 }
 
-void CSwiftCore::setupLogDisplay()
+void CSwiftCore::initLogDisplay()
 {
     CLogHandler::instance()->install(true);
     CLogHandler::instance()->enableConsoleOutput(false); // default disable

src/swiftcore/swiftcore.h

@@ -58,12 +58,12 @@ private slots:
     virtual void ps_onStyleSheetsChanged();
 
 private:
-    void connectSlots();
-    void setupLogDisplay();
+    void initSlots();
+    void initLogDisplay();
+    void initStyleSheet();
     void startCore(const SetupInfo &setup);
     void stopCore();
     QString getDBusAddress() const;
-    void initStyleSheet();
 
     QScopedPointer<Ui::CSwiftCore> ui;
 };

src/swiftgui_standard/introwindow.cpp

@@ -28,7 +28,7 @@ CIntroWindow::CIntroWindow(QWidget *parent) :
     ui(new Ui::CIntroWindow)
 {
     ui->setupUi(this);
-    this->setWindowTitle(BlackMisc::CProject::systemNameAndVersion());
+    this->setWindowTitle(BlackMisc::CProject::swiftVersionString());
     this->layout()->setSizeConstraint(QLayout::SetFixedSize);
     this->ui->cb_DBusServer->addItem(BlackCore::CDBusServer::sessionDBusServer());
     this->ui->cb_DBusServer->addItem(BlackCore::CDBusServer::systemDBusServer());

src/swiftgui_standard/swiftgui_standard.pro

@@ -23,6 +23,7 @@ macx {
 DEPENDPATH += . $$SourceRoot/src/blackmisc \
                 $$SourceRoot/src/blacksound \
                 $$SourceRoot/src/blackcore \
+                $$SourceRoot/src/blackgui \
                 $$SourceRoot/src/blackinput
 
 INCLUDEPATH += . $$SourceRoot/src

src/swiftgui_standard/swiftguistd_init.cpp

@@ -38,9 +38,9 @@ void SwiftGuiStd::init(const CRuntimeConfig &runtimeConfig)
     if (this->m_init) { return; }
     this->setVisible(false); // hide all, so no flashing windows during init
 
-    // icon, initial position where intro was before
+    // init window
     this->setWindowIcon(CIcons::swift24());
-    this->setWindowTitle(CProject::systemNameAndVersion());
+    this->setWindowTitle(CProject::swiftVersionString());
     this->setObjectName("SwiftGuiStd");
     this->initStyleSheet();
     QPoint pos = CGuiUtility::introWindowPosition();
@@ -121,9 +121,8 @@ void SwiftGuiStd::init(const CRuntimeConfig &runtimeConfig)
     this->initDynamicMenus();
     this->initMenuIcons();
 
-
     // info
-    this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::systemNameAndVersion());
+    this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::swiftVersionString());
     this->ui->comp_MainInfoArea->getLogComponent()->appendPlainTextToConsole(CProject::compiledInfo());
 
     // hotkeys

swift.pro

@@ -16,14 +16,17 @@ contains(BLACK_CONFIG, BlackInput) {
 
 contains(BLACK_CONFIG, BlackCore) {
     SUBDIRS += src/blackcore
-}
-
-contains(BLACK_CONFIG, BlackGui) {
-    SUBDIRS += src/blackgui
-    SUBDIRS += src/swiftgui_standard/swiftgui_standard.pro
-
-    contains(BLACK_CONFIG, BlackCore) {
-        SUBDIRS += src/swiftcore/swiftcore.pro
+    contains(BLACK_CONFIG, BlackGui) {
+        SUBDIRS += src/blackgui
+        contains(BLACK_CONFIG, SwiftGui) {
+            SUBDIRS += src/swiftgui_standard/swiftgui_standard.pro
+        }
+        contains(BLACK_CONFIG, SwiftCore) {
+            SUBDIRS += src/swiftcore/swiftcore.pro
+        }
+        contains(BLACK_CONFIG, SwiftData) {
+            SUBDIRS += src/swiftdata/swiftdata.pro
+        }
     }
 }