Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix Welcome Dialog regression #14096

Merged
merged 4 commits into from Jun 26, 2023
Merged

Fix Welcome Dialog regression #14096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8363b87
welcome_dialog: remove weird window close event
Megamouse Jun 25, 2023
b6c34d9
Qt: use shortcut instead of hardcoded keypress event
Megamouse Jun 25, 2023
0ce1bf0
Qt: remove obsolete shortcut
Megamouse Jun 25, 2023
77ce235
Merge branch 'master' into welcome
Megamouse Jun 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
28 changes: 6 additions & 22 deletions rpcs3/rpcs3qt/main_window.cpp
View file
Open in desktop
Expand Up @@ -148,7 +148,6 @@ bool main_window::Init([[maybe_unused]] bool with_cli_boot)
if (enable_play_last)
{
ui->sysPauseAct->setText(tr("&Play last played game"));
ui->sysPauseAct->setShortcut(QKeySequence("Ctrl+R"));
ui->sysPauseAct->setIcon(m_icon_play);
ui->toolbar_start->setToolTip(start_tooltip);
}
Expand Down Expand Up @@ -319,6 +318,12 @@ void main_window::handle_shortcut(gui::shortcuts::shortcut shortcut_key, const Q

switch (shortcut_key)
{
case gui::shortcuts::shortcut::mw_welcome_dialog:
{
welcome_dialog* welcome = new welcome_dialog(m_gui_settings, true, this);
welcome->open();
break;
}
case gui::shortcuts::shortcut::mw_toggle_fullscreen:
{
ui->toolbar_fullscreen->trigger();
Expand Down Expand Up @@ -3397,24 +3402,3 @@ void main_window::dragLeaveEvent(QDragLeaveEvent* event)
{
event->accept();
}

void main_window::keyPressEvent(QKeyEvent* event)
{
QMainWindow::keyPressEvent(event);

if (event->isAutoRepeat() || event->modifiers())
{
return;
}

switch (event->key())
{
case Qt::Key_F1:
{
welcome_dialog* welcome = new welcome_dialog(m_gui_settings, true, this);
welcome->open();
break;
}
default: break;
}
}
1 change: 0 additions & 1 deletion rpcs3/rpcs3qt/main_window.h
View file
Open in desktop
Expand Up @@ -135,7 +135,6 @@ private Q_SLOTS:
void dragEnterEvent(QDragEnterEvent* event) override;
void dragMoveEvent(QDragMoveEvent* event) override;
void dragLeaveEvent(QDragLeaveEvent* event) override;
void keyPressEvent(QKeyEvent* event) override;

private:
void ConfigureGuiFromSettings();
Expand Down
2 changes: 2 additions & 0 deletions rpcs3/rpcs3qt/shortcut_settings.cpp
View file
Open in desktop
Expand Up @@ -16,6 +16,7 @@ void fmt_class_string<gui::shortcuts::shortcut>::format(std::string& out, u64 ar
case shortcut::mw_toggle_fullscreen: return "mw_toggle_fullscreen";
case shortcut::mw_exit_fullscreen: return "mw_exit_fullscreen";
case shortcut::mw_refresh: return "mw_refresh";
case shortcut::mw_welcome_dialog: return "mw_welcome_dialog";
case shortcut::gw_toggle_fullscreen: return "gw_toggle_fullscreen";
case shortcut::gw_exit_fullscreen: return "gw_exit_fullscreen";
case shortcut::gw_log_mark: return "gw_log_mark";
Expand Down Expand Up @@ -43,6 +44,7 @@ shortcut_settings::shortcut_settings()
{ shortcut::mw_toggle_fullscreen, shortcut_info{ "main_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::main_window } },
{ shortcut::mw_exit_fullscreen, shortcut_info{ "main_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::main_window } },
{ shortcut::mw_refresh, shortcut_info{ "main_window_refresh", tr("Refresh"), "Ctrl+F5", shortcut_handler_id::main_window } },
{ shortcut::mw_welcome_dialog, shortcut_info{ "main_window_welcome_dialog", tr("Show Welcome Dialog"), "F1", shortcut_handler_id::main_window } },
{ shortcut::gw_toggle_fullscreen, shortcut_info{ "game_window_toggle_fullscreen", tr("Toggle Fullscreen"), "Alt+Return", shortcut_handler_id::game_window } },
{ shortcut::gw_exit_fullscreen, shortcut_info{ "game_window_exit_fullscreen", tr("Exit Fullscreen"), "Esc", shortcut_handler_id::game_window } },
{ shortcut::gw_log_mark, shortcut_info{ "game_window_log_mark", tr("Add Log Mark"), "Alt+L", shortcut_handler_id::game_window } },
Expand Down
1 change: 1 addition & 0 deletions rpcs3/rpcs3qt/shortcut_settings.h
View file
Open in desktop
Expand Up @@ -23,6 +23,7 @@ namespace gui
mw_toggle_fullscreen,
mw_exit_fullscreen,
mw_refresh,
mw_welcome_dialog,

gw_toggle_fullscreen,
gw_exit_fullscreen,
Expand Down
23 changes: 10 additions & 13 deletions rpcs3/rpcs3qt/welcome_dialog.cpp
View file
Open in desktop
Expand Up @@ -19,8 +19,8 @@ welcome_dialog::welcome_dialog(std::shared_ptr<gui_settings> gui_settings, bool
ui->setupUi(this);

setAttribute(Qt::WA_DeleteOnClose);

setWindowFlag(Qt::WindowCloseButtonHint, is_manual_show);

ui->okay->setEnabled(is_manual_show);
ui->i_have_read->setChecked(is_manual_show);
ui->i_have_read->setEnabled(!is_manual_show);
Expand Down Expand Up @@ -49,21 +49,18 @@ welcome_dialog::welcome_dialog(std::shared_ptr<gui_settings> gui_settings, bool
)"
).arg(gui::utils::get_link_style()));

connect(ui->i_have_read, &QCheckBox::clicked, [this, is_manual_show](bool checked)
if (!is_manual_show)
{
if (is_manual_show)
connect(ui->i_have_read, &QCheckBox::clicked, this, [this](bool checked)
{
return;
}

ui->okay->setEnabled(checked);
setWindowFlag(Qt::WindowCloseButtonHint, checked);
});
ui->okay->setEnabled(checked);
});

connect(ui->do_not_show, &QCheckBox::clicked, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_show_welcome, QVariant(!checked));
});
connect(ui->do_not_show, &QCheckBox::clicked, this, [this](bool checked)
{
m_gui_settings->SetValue(gui::ib_show_welcome, QVariant(!checked));
});
}

connect(ui->okay, &QPushButton::clicked, this, &QDialog::accept);

Expand Down