diff --git a/launcher/ui/pages/global/LauncherPage.cpp b/launcher/ui/pages/global/LauncherPage.cpp index 266aac25..a7fc2055 100644 --- a/launcher/ui/pages/global/LauncherPage.cpp +++ b/launcher/ui/pages/global/LauncherPage.cpp @@ -31,6 +31,7 @@ #include #include +#include // FIXME: possibly move elsewhere enum InstSortMode @@ -116,6 +117,11 @@ void LauncherPage::on_instDirBrowseBtn_clicked() } } } +void LauncherPage::on_instDirOpenBtn_clicked() +{ + DesktopServices::openDirectory(ui->instDirTextBox->text()); +} + void LauncherPage::on_iconsDirBrowseBtn_clicked() { @@ -128,6 +134,11 @@ void LauncherPage::on_iconsDirBrowseBtn_clicked() ui->iconsDirTextBox->setText(cooked_dir); } } +void LauncherPage::on_iconsDirOpenBtn_clicked() +{ + DesktopServices::openDirectory(ui->iconsDirTextBox->text()); +} + void LauncherPage::on_modsDirBrowseBtn_clicked() { QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Mods Folder"), ui->modsDirTextBox->text()); @@ -139,6 +150,11 @@ void LauncherPage::on_modsDirBrowseBtn_clicked() ui->modsDirTextBox->setText(cooked_dir); } } +void LauncherPage::on_modsDirOpenBtn_clicked() +{ + DesktopServices::openDirectory(ui->modsDirTextBox->text()); +} + void LauncherPage::on_skinsDirBrowseBtn_clicked() { QString raw_dir = QFileDialog::getExistingDirectory(this, tr("Skins Folder"), ui->skinsDirTextBox->text()); @@ -150,6 +166,11 @@ void LauncherPage::on_skinsDirBrowseBtn_clicked() ui->skinsDirTextBox->setText(cooked_dir); } } +void LauncherPage::on_skinsDirOpenBtn_clicked() +{ + DesktopServices::openDirectory(ui->skinsDirTextBox->text()); +} + void LauncherPage::on_migrateDataFolderMacBtn_clicked() { QFile file(QDir::current().absolutePath() + "/dontmovemacdata"); diff --git a/launcher/ui/pages/global/LauncherPage.h b/launcher/ui/pages/global/LauncherPage.h index 127b0ad7..cd28709b 100644 --- a/launcher/ui/pages/global/LauncherPage.h +++ b/launcher/ui/pages/global/LauncherPage.h @@ -65,9 +65,17 @@ private: private slots: void on_instDirBrowseBtn_clicked(); + void on_instDirOpenBtn_clicked(); + void on_modsDirBrowseBtn_clicked(); + void on_modsDirOpenBtn_clicked(); + void on_iconsDirBrowseBtn_clicked(); + void on_iconsDirOpenBtn_clicked(); + void on_skinsDirBrowseBtn_clicked(); + void on_skinsDirOpenBtn_clicked(); + void on_migrateDataFolderMacBtn_clicked(); /*! diff --git a/launcher/ui/pages/global/LauncherPage.ui b/launcher/ui/pages/global/LauncherPage.ui index 37e6a209..0f75ea5d 100644 --- a/launcher/ui/pages/global/LauncherPage.ui +++ b/launcher/ui/pages/global/LauncherPage.ui @@ -67,31 +67,8 @@ Folders - - - - &Mods: - - - modsDirTextBox - - - - - - - I&nstances: - - - instDirTextBox - - - - - - - - + + ... @@ -107,8 +84,8 @@ - - + + ... @@ -117,13 +94,10 @@ - - + + - &Icons: - - - iconsDirTextBox + ... @@ -137,13 +111,67 @@ + + + + &Mods: + + + modsDirTextBox + + + - - + + - ... + I&nstances: + + + instDirTextBox + + + + + + + + + + &Icons: + + + iconsDirTextBox + + + + + + + Open + + + + + + + Open + + + + + + + Open + + + + + + + Open @@ -483,16 +511,19 @@ - tabWidget autoUpdateCheckBox instDirTextBox instDirBrowseBtn + instDirOpenBtn modsDirTextBox modsDirBrowseBtn + modsDirOpenBtn iconsDirTextBox iconsDirBrowseBtn + iconsDirOpenBtn skinsDirTextBox skinsDirBrowseBtn + skinsDirOpenBtn migrateDataFolderMacBtn resetNotificationsBtn sortLastLaunchedBtn @@ -507,6 +538,7 @@ consoleFont fontSizeBox fontPreview + tabWidget