diff options
| author | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-24 15:58:55 +0300 |
|---|---|---|
| committer | Trial97 <alexandru.tripon97@gmail.com> | 2023-06-24 15:58:55 +0300 |
| commit | 7fdd68d7682ea32404c07337b610365bcf4c7083 (patch) | |
| tree | 57355c6ba2fadb6673c34aee64c573435e91326e /launcher/ui | |
| parent | 69c709b05a90f342cc9d1f9337457bb5519a87a9 (diff) | |
| parent | df6d46de9e648284a788a327b87698d58a4fc145 (diff) | |
| download | PrismLauncher-7fdd68d7682ea32404c07337b610365bcf4c7083.tar.gz PrismLauncher-7fdd68d7682ea32404c07337b610365bcf4c7083.tar.bz2 PrismLauncher-7fdd68d7682ea32404c07337b610365bcf4c7083.zip | |
Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into develop
Diffstat (limited to 'launcher/ui')
| -rw-r--r-- | launcher/ui/dialogs/AboutDialog.cpp | 11 | ||||
| -rw-r--r-- | launcher/ui/dialogs/ExportMrPackDialog.cpp | 2 |
2 files changed, 9 insertions, 4 deletions
diff --git a/launcher/ui/dialogs/AboutDialog.cpp b/launcher/ui/dialogs/AboutDialog.cpp index 76e3d8ed..88739463 100644 --- a/launcher/ui/dialogs/AboutDialog.cpp +++ b/launcher/ui/dialogs/AboutDialog.cpp @@ -71,13 +71,18 @@ QString getCreditsHtml() //: %1 is the name of the launcher, determined at build time, e.g. "Prism Launcher Developers" stream << "<h3>" << QObject::tr("%1 Developers", "About Credits").arg(BuildConfig.LAUNCHER_DISPLAYNAME) << "</h3>\n"; stream << QString("<p>Sefa Eyeoglu (Scrumplex) %1</p>\n") .arg(getWebsite("https://scrumplex.net")); - stream << QString("<p>dada513 %1</p>\n") .arg(getGitHub("dada513")); + stream << QString("<p>d-513 %1</p>\n") .arg(getGitHub("d-513")); stream << QString("<p>txtsd %1</p>\n") .arg(getWebsite("https://ihavea.quest")); stream << QString("<p>timoreo %1</p>\n") .arg(getGitHub("timoreo22")); stream << QString("<p>Ezekiel Smith (ZekeSmith) %1</p>\n") .arg(getGitHub("ZekeSmith")); stream << QString("<p>cozyGalvinism %1</p>\n") .arg(getGitHub("cozyGalvinism")); - stream << QString("<p>DioEgizio %1</p>\n") .arg(getGitHub("DioEgizio")); - stream << QString("<p>flowln %1</p>\n") .arg(getGitHub("flowln")); + stream << QString("<p>DioEgizio %1</p>\n") .arg(getGitHub("DioEgizio")); + stream << QString("<p>flowln %1</p>\n") .arg(getGitHub("flowln")); + stream << QString("<p>ViRb3 %1</p>\n") .arg(getGitHub("ViRb3")); + stream << QString("<p>Rachel Powers (Ryex) %1</p>\n") .arg(getGitHub("Ryex")); + stream << QString("<p>TayouVR %1</p>\n") .arg(getGitHub("TayouVR")); + stream << QString("<p>TheKodeToad %1</p>\n") .arg(getGitHub("TheKodeToad")); + stream << QString("<p>getchoo %1</p>\n") .arg(getGitHub("getchoo")); stream << "<br />\n"; // TODO: possibly retrieve from git history at build time? diff --git a/launcher/ui/dialogs/ExportMrPackDialog.cpp b/launcher/ui/dialogs/ExportMrPackDialog.cpp index 561b92e4..60ecefd5 100644 --- a/launcher/ui/dialogs/ExportMrPackDialog.cpp +++ b/launcher/ui/dialogs/ExportMrPackDialog.cpp @@ -53,7 +53,7 @@ ExportMrPackDialog::ExportMrPackDialog(InstancePtr instance, QWidget* parent) const QDir root(instance->gameRoot()); proxy = new FileIgnoreProxy(instance->gameRoot(), this); proxy->setSourceModel(model); - proxy->setFilterRegularExpression("^(?!\\.DS_Store).+$"); + proxy->setFilterRegularExpression("^(?!(\\.DS_Store)|([tT]humbs\\.db)).+$"); const QDir::Filters filter(QDir::AllEntries | QDir::NoDotAndDotDot | QDir::AllDirs | QDir::Hidden); |