CactiChameleon9/PrismLauncher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/feature_profiling' into feature_profiling

Browse Source
This commit is contained in:
Jan Dalheimer 2014-02-16 12:06:14 +01:00
commit f5273ae2b1
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gui/dialogs/SettingsDialog.cpp
View File

@ -527,6 +527,10 @@ void SettingsDialog::on_jprofilerPathBtn_clicked()
{ {
ui->jprofilerPathEdit->setText(cooked_dir); ui->jprofilerPathEdit->setText(cooked_dir);
} }
else
{
// FIXME: see below...
}
} }
void SettingsDialog::on_jprofilerCheckBtn_clicked() void SettingsDialog::on_jprofilerCheckBtn_clicked()
{ {
@ -546,12 +550,18 @@ void SettingsDialog::on_jvisualvmPathBtn_clicked()
{ {
QString raw_dir = QFileDialog::getOpenFileName(this, tr("JVisualVM Executable"), QString raw_dir = QFileDialog::getOpenFileName(this, tr("JVisualVM Executable"),
ui->jvisualvmPathEdit->text()); ui->jvisualvmPathEdit->text());
QString cooked_dir = NormalizePath(raw_dir); QString cooked_path = NormalizePath(raw_dir);
QFileInfo finfo(cooked_path);
// do not allow current dir - it's dirty. Do not allow dirs that don't exist // do not allow current dir - it's dirty. Do not allow dirs that don't exist
if (!cooked_dir.isEmpty() && QDir(cooked_dir).exists()) if (!cooked_path.isEmpty() && finfo.isExecutable() && finfo.isFile())
{ {
ui->jvisualvmPathEdit->setText(cooked_dir); ui->jvisualvmPathEdit->setText(cooked_path);
}
else
{
// FIXME: report error here, or run the checker instead of that condition above.
// ideally unify all the sanity checks and put them into the relevant classes
} }
} }
void SettingsDialog::on_jvisualvmCheckBtn_clicked() void SettingsDialog::on_jvisualvmCheckBtn_clicked()
@ -570,8 +580,8 @@ void SettingsDialog::on_jvisualvmCheckBtn_clicked()
void SettingsDialog::on_mceditPathBtn_clicked() void SettingsDialog::on_mceditPathBtn_clicked()
{ {
QString raw_dir = QFileDialog::getOpenFileName(this, tr("MCEdit Path"), QString raw_dir = QFileDialog::getExistingDirectory(this, tr("MCEdit Path"),
ui->jvisualvmPathEdit->text()); ui->mceditPathEdit->text());
QString cooked_dir = NormalizePath(raw_dir); QString cooked_dir = NormalizePath(raw_dir);
// do not allow current dir - it's dirty. Do not allow dirs that don't exist // do not allow current dir - it's dirty. Do not allow dirs that don't exist
@ -579,6 +589,9 @@ void SettingsDialog::on_mceditPathBtn_clicked()
{ {
ui->mceditPathEdit->setText(cooked_dir); ui->mceditPathEdit->setText(cooked_dir);
} }
{
// FIXME: as above.
}
} }
void SettingsDialog::on_mceditCheckBtn_clicked() void SettingsDialog::on_mceditCheckBtn_clicked()
{ {