ui: Coati states if it requires 32 or 64 bit Java

* also updated documentation
This commit is contained in:
malte_langkabel
2017-01-11 11:58:33 +01:00
parent 0b3defbd1d
commit a8ca0660fa
6 changed files with 52 additions and 5 deletions
+2 -1
View File
@@ -362,7 +362,8 @@ add_files(
utility/text/TextAccess.cpp
utility/text/TextAccess.h
utility/ApplicationArchitectureType.h
utility/AppPath.cpp
utility/AppPath.h
utility/Cache.h
@@ -0,0 +1,11 @@
#ifndef APPLICATION_ARCHITECTURE_TYPE
#define APPLICATION_ARCHITECTURE_TYPE
enum ApplicationArchitectureType
{
APPLICATION_ARCHITECTURE_UNKNOWN,
APPLICATION_ARCHITECTURE_X86_32,
APPLICATION_ARCHITECTURE_X86_64
};
#endif // APPLICATION_ARCHITECTURE_TYPE
@@ -5,6 +5,7 @@
#include "utility/messaging/type/MessageSwitchColorScheme.h"
#include "utility/ResourcePaths.h"
#include "utility/utilityPathDetection.h"
#include "utility/utilityApp.h"
QtProjectWizzardContentPreferences::QtProjectWizzardContentPreferences(
std::shared_ptr<ProjectSettings> settings, QtProjectWizzardWindow* window
@@ -135,10 +136,26 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
}
addLabelAndWidget("Java Path", m_javaPath, layout, row);
addHelpButton(
"Location of your Java 8 runtime dynamic library (for information on how to set these take a look at "
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";
addHelpButton((
"Provide the location of the jvm library inside the installation of your " + javaVersionString +
" runtime environment (for information on how to set these take a look at "
"<a href=\"https://coati.io/documentation/#FindingJavaRuntimeLibraryLocation\">"
"Finding Java Runtime Library Location</a> or use the auto detection below)"
"Finding Java Runtime Library Location</a> or use the auto detection below)").c_str()
, layout, row
);
row++;
+14
View File
@@ -1,6 +1,8 @@
#include "utility/utilityApp.h"
#include <QProcess>
#include <qprocessordetection.h>
#include "utility/utilityString.h"
std::string utility::executeProcess(const char *cmd)
@@ -15,3 +17,15 @@ std::string utility::executeProcess(const char *cmd)
return processoutput;
}
ApplicationArchitectureType utility::getApplicationArchitectureType()
{
#ifdef Q_PROCESSOR_X86_64
return APPLICATION_ARCHITECTURE_X86_64;
#endif
#ifdef Q_PROCESSOR_X86_32
return APPLICATION_ARCHITECTURE_X86_32;
#endif
return APPLICATION_ARCHITECTURE_UNKNOWN;
}
+4
View File
@@ -3,9 +3,13 @@
#include <QProcess>
#include "utility/ApplicationArchitectureType.h"
namespace utility
{
std::string executeProcess(const char* cmd);
ApplicationArchitectureType getApplicationArchitectureType();
}