ynkmr/Sourcetrail
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ui: maximum allocated jvm memory configurable in preferences

Browse Source 
* added setting for maximum memory allocated by JVM to Preferences window.
* a value of -1 ignores this setting
* changed default value for this setting to -1
* increased JNI version to Java 1.8

* disabled some file system tests for windows
This commit is contained in:
malte_langkabel
2016-09-29 10:05:03 +02:00
parent 52fb2ae6f6
commit e5cd905670
5 changed files with 39 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.cpp
+22 -1
View File
@@ -144,6 +144,7 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
, layout, row
);
layout->setRowMinimumHeight(row, 30);
row++;
layout->setRowMinimumHeight(row++, 20);
@@ -231,8 +232,23 @@ void QtProjectWizzardContentPreferences::populate(QGridLayout* layout, int& row)
}
addJavaPathDetection(layout, row);
layout->setRowMinimumHeight(row++, 20);
layout->setRowMinimumHeight(row, 20);
row++;
// jvm max memory
m_jvmMaximumMemory = new QLineEdit();
m_jvmMaximumMemory->setObjectName("name");
m_jvmMaximumMemory->setAttribute(Qt::WA_MacShowFocusRect, 0);
layout->addWidget(createFormLabel("JVM Maximum Memory"), row, QtProjectWizzardWindow::FRONT_COL, Qt::AlignRight);
layout->addWidget(m_jvmMaximumMemory, row, QtProjectWizzardWindow::BACK_COL);
addHelpButton(
"Specify the maximum amount of memory that should be allocated by the indexer's JVM. A value of -1 ignores this setting."
, layout, row
);
layout->setRowMinimumHeight(row, 30);
row++;
// C/C++
layout->addWidget(createFormTitle("C/C++"), row, QtProjectWizzardWindow::FRONT_COL, Qt::AlignLeft);
@@ -272,6 +288,8 @@ void QtProjectWizzardContentPreferences::load()
{
m_javaPath->setText(QString::fromStdString(appSettings->getJavaPath()));
}
m_jvmMaximumMemory->setText(QString::number(appSettings->getJavaMaximumMemory()));
}
void QtProjectWizzardContentPreferences::save()
@@ -304,6 +322,9 @@ void QtProjectWizzardContentPreferences::save()
{
appSettings->setJavaPath(m_javaPath->getText().toStdString());
}
int jvmMaximumMemory = m_jvmMaximumMemory->text().toInt();
if (jvmMaximumMemory) appSettings->setJavaMaximumMemory(jvmMaximumMemory);
}
bool QtProjectWizzardContentPreferences::check()
src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPreferences.h
+1
View File
@@ -53,6 +53,7 @@ private:
std::shared_ptr<CombinedPathDetector> m_javaPathDetector;
QComboBox* m_javaPathDetectorBox;
QtLocationPicker* m_javaPath;
QLineEdit* m_jvmMaximumMemory;
};
#endif // QT_PROJECT_WIZZARD_CONTENT_PREFERENCES_H