ui: extended logging and about window to show 32/64 bit info

This commit is contained in:
mlangkabel
2017-08-22 10:58:55 +02:00
parent 0ef9b97349
commit 0b9bb91ae5
3 changed files with 21 additions and 6 deletions
+4 -1
View File
@@ -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);
+8 -3
View File
@@ -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)
+9 -2
View File
@@ -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);
}