From 5147031ec2004591ceb617557551cd29c2359b66 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Wed, 30 Sep 2015 05:07:36 +0200
Subject: [PATCH] refs #475, menus to call load/save DB data

---
 src/swiftdata/swiftdata.cpp                |  2 +-
 src/swiftdata/swiftdata_menus.cpp          | 14 ++++++++++++++
 src/swiftgui_standard/introwindow.cpp      |  2 +-
 src/swiftgui_standard/swiftguistd_init.cpp |  2 +-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/swiftdata/swiftdata.cpp b/src/swiftdata/swiftdata.cpp
index 368771f37..8ff407149 100644
--- a/src/swiftdata/swiftdata.cpp
+++ b/src/swiftdata/swiftdata.cpp
@@ -77,7 +77,7 @@ void CSwiftData::ps_onStyleSheetsChanged()
 void CSwiftData::init()
 {
     this->setWindowIcon(CIcons::swiftDatabase24());
-    this->setWindowTitle(QString("swiftdata %1").arg(CProject::version()));
+    this->setWindowTitle(QString("Mapping tool %1").arg(CProject::swiftVersionStringDevInfo()));
     this->setObjectName("CSwiftData");
     this->initStyleSheet();
     this->initLogDisplay();
diff --git a/src/swiftdata/swiftdata_menus.cpp b/src/swiftdata/swiftdata_menus.cpp
index 1a6f02da5..849a29abd 100644
--- a/src/swiftdata/swiftdata_menus.cpp
+++ b/src/swiftdata/swiftdata_menus.cpp
@@ -10,10 +10,12 @@
 #include "swiftdata.h"
 #include "ui_swiftdata.h"
 #include "blackgui/components/dbmappingcomponent.h"
+#include "blackgui/components/datainfoareacomponent.h"
 #include "blackgui/components/logcomponent.h"
 #include "blackgui/stylesheetutility.h"
 #include "blackmisc/statusmessagelist.h"
 #include "blackmisc/logmessage.h"
+#include "blackmisc/project.h"
 #include <QPoint>
 #include <QMenu>
 #include <QDesktopServices>
@@ -81,4 +83,16 @@ void CSwiftData::initDynamicMenus()
     Q_ASSERT(this->ui->menu_InfoAreas);
     Q_ASSERT(this->ui->comp_MainInfoArea);
     this->ui->menu_InfoAreas->addActions(this->ui->comp_MainInfoArea->getInfoAreaSelectActions(this->ui->menu_InfoAreas));
+
+    QString resourceDir(CProject::getSwiftResourceDir());
+    if (!resourceDir.isEmpty())
+    {
+        Q_ASSERT_X(this->ui->comp_MainInfoArea, Q_FUNC_INFO, "Missing main info area");
+        Q_ASSERT_X(this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), Q_FUNC_INFO, "Missing DB info area");
+        this->ui->menu_Mapping->addAction(CIcons::load16(), "Load DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(readDbDataFromResourceDir()));
+        if (CProject::isRunningInDeveloperEnvironment() && this->ui->comp_MainInfoArea->getDataInfoAreaComponent()->canConnectSwiftDb())
+        {
+            this->ui->menu_Mapping->addAction(CIcons::save16(), "Save DB data", this->ui->comp_MainInfoArea->getDataInfoAreaComponent(), SLOT(writeDbDataToResourceDir()));
+        }
+    }
 }
diff --git a/src/swiftgui_standard/introwindow.cpp b/src/swiftgui_standard/introwindow.cpp
index c4c604c1f..212f910b2 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::swiftVersionString());
+    this->setWindowTitle(BlackMisc::CProject::swiftVersionStringDevInfo());
     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/swiftguistd_init.cpp b/src/swiftgui_standard/swiftguistd_init.cpp
index 4c4847e72..605bc32d2 100644
--- a/src/swiftgui_standard/swiftguistd_init.cpp
+++ b/src/swiftgui_standard/swiftguistd_init.cpp
@@ -38,7 +38,7 @@ void SwiftGuiStd::init(const CRuntimeConfig &runtimeConfig)
 
     // init window
     this->setWindowIcon(CIcons::swift24());
-    this->setWindowTitle(CProject::swiftVersionString());
+    this->setWindowTitle(CProject::swiftVersionStringDevInfo());
     this->setObjectName("SwiftGuiStd");
     this->initStyleSheet();
     QPoint pos = CGuiUtility::introWindowPosition();