From a2527e69e3048c79b7eb7f63e1fe0482888ce90c Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Fri, 10 Jul 2015 01:30:32 +0200
Subject: [PATCH] refs #445, prepared for data entry GUI * unified init of GUIs
 * used CProject::swiftVersionString()

---
 src/swiftcore/swiftcore.cpp                 |  8 ++++----
 src/swiftcore/swiftcore.h                   |  6 +++---
 src/swiftgui_standard/introwindow.cpp       |  2 +-
 src/swiftgui_standard/swiftgui_standard.pro |  1 +
 src/swiftgui_standard/swiftguistd_init.cpp  |  7 +++----
 swift.pro                                   | 19 +++++++++++--------
 6 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/swiftcore/swiftcore.cpp b/src/swiftcore/swiftcore.cpp
index e8bf7a854..45b4cbb51 100644
--- a/src/swiftcore/swiftcore.cpp
+++ b/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
diff --git a/src/swiftcore/swiftcore.h b/src/swiftcore/swiftcore.h
index 8a5718e53..c8bcd0129 100644
--- a/src/swiftcore/swiftcore.h
+++ b/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;
 };
diff --git a/src/swiftgui_standard/introwindow.cpp b/src/swiftgui_standard/introwindow.cpp
index e6f866347..c4c604c1f 100644
--- a/src/swiftgui_standard/introwindow.cpp
+++ b/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());
diff --git a/src/swiftgui_standard/swiftgui_standard.pro b/src/swiftgui_standard/swiftgui_standard.pro
index 4d63dee87..2441b2dfe 100644
--- a/src/swiftgui_standard/swiftgui_standard.pro
+++ b/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
diff --git a/src/swiftgui_standard/swiftguistd_init.cpp b/src/swiftgui_standard/swiftguistd_init.cpp
index 227519ddf..180e2ca5a 100644
--- a/src/swiftgui_standard/swiftguistd_init.cpp
+++ b/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
diff --git a/swift.pro b/swift.pro
index 94c527928..f36a45aab 100644
--- a/swift.pro
+++ b/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
+        }
     }
 }