aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSefa Eyeoglu <contact@scrumplex.net>2022-05-13 18:17:40 +0200
committerGitHub <noreply@github.com>2022-05-13 18:17:40 +0200
commit8dd68580a6b34ca9e0e5ef399ea592899014e7d1 (patch)
tree0290f137ba7749ed67ebada1e20369bffb94a283
parentc83e16aba4651e4d8cd8eaab2fc6e6d0f51f465a (diff)
parent2fbb7be23bb31d0c5007a0500ad2a5d3a51f644e (diff)
downloadPrismLauncher-8dd68580a6b34ca9e0e5ef399ea592899014e7d1.tar.gz
PrismLauncher-8dd68580a6b34ca9e0e5ef399ea592899014e7d1.tar.bz2
PrismLauncher-8dd68580a6b34ca9e0e5ef399ea592899014e7d1.zip
Merge pull request #528 from flowln/guo_ext
-rw-r--r--launcher/ui/dialogs/SkinUploadDialog.cpp3
-rw-r--r--launcher/ui/pages/modplatform/ImportPage.cpp3
2 files changed, 4 insertions, 2 deletions
diff --git a/launcher/ui/dialogs/SkinUploadDialog.cpp b/launcher/ui/dialogs/SkinUploadDialog.cpp
index 6a5a324f..8d137afc 100644
--- a/launcher/ui/dialogs/SkinUploadDialog.cpp
+++ b/launcher/ui/dialogs/SkinUploadDialog.cpp
@@ -100,7 +100,8 @@ void SkinUploadDialog::on_buttonBox_accepted()
void SkinUploadDialog::on_skinBrowseBtn_clicked()
{
- QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), "*.png");
+ auto filter = QMimeDatabase().mimeTypeForName("image/png").filterString();
+ QString raw_path = QFileDialog::getOpenFileName(this, tr("Select Skin Texture"), QString(), filter);
if (raw_path.isEmpty() || !QFileInfo::exists(raw_path))
{
return;
diff --git a/launcher/ui/pages/modplatform/ImportPage.cpp b/launcher/ui/pages/modplatform/ImportPage.cpp
index 487bf77b..1b53dd40 100644
--- a/launcher/ui/pages/modplatform/ImportPage.cpp
+++ b/launcher/ui/pages/modplatform/ImportPage.cpp
@@ -143,7 +143,8 @@ void ImportPage::setUrl(const QString& url)
void ImportPage::on_modpackBtn_clicked()
{
- const QUrl url = QFileDialog::getOpenFileUrl(this, tr("Choose modpack"), modpackUrl(), tr("Zip (*.zip)"));
+ auto filter = QMimeDatabase().mimeTypeForName("application/zip").filterString();
+ const QUrl url = QFileDialog::getOpenFileUrl(this, tr("Choose modpack"), modpackUrl(), filter);
if (url.isValid())
{
if (url.isLocalFile())