Skip to content

Commit d701f9c

Browse files
committed
Edit first boot prompt to include direct shortcut to set default iso
1 parent d4c307c commit d701f9c

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

Source/Core/DolphinQt/Main.cpp

Lines changed: 15 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
#include "DolphinQt/QtUtils/SetWindowDecorations.h"
3838
#include "DolphinQt/Resources.h"
3939
#include "DolphinQt/Settings.h"
40+
#include "DolphinQt/Settings/PathPane.h"
4041
#include "DolphinQt/Translation.h"
4142
#include "DolphinQt/Updater.h"
4243

@@ -263,26 +264,29 @@ int main(int argc, char* argv[])
263264
#if defined(USE_ANALYTICS) && USE_ANALYTICS
264265
if (!Config::Get(Config::MAIN_ANALYTICS_PERMISSION_ASKED))
265266
{
266-
ModalMessageBox firstboot_prompt(&win);
267-
267+
QMessageBox firstboot_prompt(&win);
268268
firstboot_prompt.setIcon(QMessageBox::Information);
269-
firstboot_prompt.setStandardButtons(QMessageBox::Ok);
270269
firstboot_prompt.setWindowTitle(QObject::tr("First Boot Prompt"));
271270
firstboot_prompt.setText(
272271
QObject::tr("New installation detected; read below for setup tips!"));
273272
firstboot_prompt.setInformativeText(QObject::tr(
274-
"Make sure to set your Brawl ISO as default before playing "
275-
"in order for the game to load. \n"
276-
"If you are on macOS or Linux, also ensure your launcher and sd.raw "
277-
"paths are set as well, as they may not be properly set by default. \n\n"
278273
"If you are on modern hardware, we recommend setting Ubershaders "
279274
"to either Hybrid or Exclusive mode in Graphics > General for a "
280275
"stutter-free experience while playing. \n\n"
281-
"Thank you for playing! "
282-
"The next text box will ask you to opt in to Dolphin's analytics collection."));
276+
"Select your Brawl ISO using the button below to allow the mod to load properly. \n"
277+
"You can also set this path later in Config > Paths.\n\n"
278+
"Thank you for playing!"));
279+
QAbstractButton* pButtonYes = firstboot_prompt.addButton(QObject::tr("Select ISO"), QMessageBox::YesRole);
280+
firstboot_prompt.addButton(QObject::tr("Skip"), QMessageBox::NoRole);
281+
282+
firstboot_prompt.exec();
283+
284+
if (firstboot_prompt.clickedButton() == pButtonYes)
285+
{
286+
PathPane path_pane;
287+
path_pane.BrowseDefaultGame();
288+
}
283289

284-
SetQWidgetWindowDecorations(&firstboot_prompt);
285-
const int answer = firstboot_prompt.exec();
286290
}
287291
#endif
288292
#if defined(USE_ANALYTICS) && USE_ANALYTICS

Source/Core/DolphinQt/Settings/PathPane.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ class PathPane final : public QWidget
1616
Q_OBJECT
1717
public:
1818
explicit PathPane(QWidget* parent = nullptr);
19+
void BrowseDefaultGame();
1920

2021
private:
2122
void Browse();
22-
void BrowseDefaultGame();
2323
void BrowseWiiNAND();
2424
void BrowseDump();
2525
void BrowseLoad();

0 commit comments

Comments
 (0)