From 0b9bb91ae55f436757c25fba0a8384b4409adcf0 Mon Sep 17 00:00:00 2001
From: mlangkabel <malte.langkabel@gmail.com>
Date: Tue, 22 Aug 2017 10:58:55 +0200
Subject: [PATCH] ui: extended logging and about window to show 32/64 bit info

---
 src/app/main.cpp                       |  5 ++++-
 src/lib/utility/logging/LogManager.cpp | 11 ++++++++---
 src/lib_gui/qt/window/QtAbout.cpp      | 11 +++++++++--
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/app/main.cpp b/src/app/main.cpp
index 50d69bf5..cf542bf8 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -204,7 +204,10 @@ int main(int argc, char *argv[])
 	);
 	QApplication::setApplicationVersion(version.toDisplayString().c_str());
 
-	MessageStatus("Starting Sourcetrail " + version.toDisplayString()).dispatch();
+	MessageStatus(
+		std::string("Starting Sourcetrail ") +
+		(utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_32 ? "32" : "64") + " bit, " + 
+		"version " + version.toDisplayString()).dispatch();
 
 	commandline::CommandLineParser commandLineParser(version.toString());
 	commandLineParser.preparse(argc, argv);
diff --git a/src/lib/utility/logging/LogManager.cpp b/src/lib/utility/logging/LogManager.cpp
index d224b74b..f566aa34 100644
--- a/src/lib/utility/logging/LogManager.cpp
+++ b/src/lib/utility/logging/LogManager.cpp
@@ -4,6 +4,7 @@
 
 #include "utility/logging/logging.h"
 #include "utility/messaging/type/MessageStatus.h"
+#include "utility/utility.h"
 #include "utility/Version.h"
 
 std::shared_ptr<LogManager> LogManager::getInstance()
@@ -28,9 +29,15 @@ void LogManager::setLoggingEnabled(bool enabled)
 {
 	if (m_loggingEnabled != enabled)
 	{
+		m_loggingEnabled = enabled;
+
 		if (enabled)
 		{
-			LOG_INFO("Enabled logging for Sourcetrail " + Version::getApplicationVersion().toDisplayString());
+			LOG_INFO(
+				std::string("Enabled logging for Sourcetrail ") + 
+				(utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_32 ? "32" : "64") + " bit, " +
+				"version " + Version::getApplicationVersion().toDisplayString()
+			);
 			MessageStatus("Enabled console and file logging.").dispatch();
 		}
 		else
@@ -39,8 +46,6 @@ void LogManager::setLoggingEnabled(bool enabled)
 			MessageStatus("Disabled console and file logging.").dispatch();
 		}
 	}
-
-	m_loggingEnabled = enabled;
 }
 
 void LogManager::addLogger(std::shared_ptr<Logger> logger)
diff --git a/src/lib_gui/qt/window/QtAbout.cpp b/src/lib_gui/qt/window/QtAbout.cpp
index 76cc2428..b0dd3f38 100644
--- a/src/lib_gui/qt/window/QtAbout.cpp
+++ b/src/lib_gui/qt/window/QtAbout.cpp
@@ -7,8 +7,9 @@
 
 #include "qt/utility/QtDeviceScaledPixmap.h"
 #include "qt/utility/utilityQt.h"
-#include "utility/Version.h"
 #include "utility/ResourcePaths.h"
+#include "utility/utility.h"
+#include "utility/Version.h"
 
 QtAbout::QtAbout(QWidget *parent)
 	: QtWindow(false, parent)
@@ -71,7 +72,13 @@ void QtAbout::setupAbout()
 	{
 		QHBoxLayout* row = new QHBoxLayout();
 		windowLayout->addLayout(row);
-		QLabel* versionLabel = new QLabel(("Version " + Version::getApplicationVersion().toDisplayString()).c_str(), this);
+		QLabel* versionLabel = new QLabel(
+			(
+				"Version " + Version::getApplicationVersion().toDisplayString() + " - " +
+				std::string(utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_32 ? "32" : "64") + " bit"
+			).c_str(), 
+			this
+		);
 		row->addWidget(versionLabel);
 	}