From 5fbf7b1acc9844e17ba72d926d5ba33ffae77d4e Mon Sep 17 00:00:00 2001 From: mlangkabel Date: Mon, 27 Nov 2017 11:18:49 +0100 Subject: [PATCH] ui: note architecture of Java version in ApplicationSettings dialog --- .../QtProjectWizzardContentPreferences.cpp | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp index 2a2f89d8..0dc6679d 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp @@ -201,21 +201,16 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row) break; } - addLabelAndWidget("Java Path", m_javaPath, layout, row); + const std::string javaArchitectureString = utility::getApplicationArchitectureType() == APPLICATION_ARCHITECTURE_X86_32 ? "32 Bit" : "64 Bit"; - std::string javaVersionString = ""; - switch (utility::getApplicationArchitectureType()) - { - case APPLICATION_ARCHITECTURE_X86_32: - javaVersionString = "32 Bit "; - break; - case APPLICATION_ARCHITECTURE_X86_64: - javaVersionString = "64 Bit "; - break; - default: - break; - } - javaVersionString += "Java 8"; + addLabelAndWidget( + ("Java Path (" + javaArchitectureString + ")").c_str(), + m_javaPath, + layout, + row + ); + + const std::string javaVersionString = javaArchitectureString + " Java 8"; addHelpButton( "Java Path", (