diff --git a/CMakeLists.txt b/CMakeLists.txt index d320d49e3..8c69eef27 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -750,33 +750,36 @@ set(QT_GUI src/qt_gui/about_dialog.cpp src/qt_gui/background_music_player.h src/qt_gui/cheats_patches.cpp src/qt_gui/cheats_patches.h - src/qt_gui/main_window_ui.h - src/qt_gui/main_window.cpp - src/qt_gui/main_window.h - src/qt_gui/gui_context_menus.h - src/qt_gui/game_list_utils.h - src/qt_gui/game_info.cpp - src/qt_gui/game_info.h - src/qt_gui/game_list_frame.cpp - src/qt_gui/game_list_frame.h - src/qt_gui/game_grid_frame.cpp - src/qt_gui/game_grid_frame.h - src/qt_gui/game_install_dialog.cpp - src/qt_gui/game_install_dialog.h - src/qt_gui/install_dir_select.cpp - src/qt_gui/install_dir_select.h - src/qt_gui/pkg_viewer.cpp - src/qt_gui/pkg_viewer.h - src/qt_gui/trophy_viewer.cpp - src/qt_gui/trophy_viewer.h src/qt_gui/elf_viewer.cpp src/qt_gui/elf_viewer.h + src/qt_gui/game_info.cpp + src/qt_gui/game_info.h + src/qt_gui/game_install_dialog.cpp + src/qt_gui/game_install_dialog.h + src/qt_gui/game_list_frame.cpp + src/qt_gui/game_list_frame.h + src/qt_gui/game_list_utils.h + src/qt_gui/game_grid_frame.cpp + src/qt_gui/game_grid_frame.h + src/qt_gui/keys_shortcuts_dialog.cpp + src/qt_gui/keys_shortcuts_dialog.h + src/qt_gui/keys_shortcuts_dialog.ui + src/qt_gui/gui_context_menus.h + src/qt_gui/install_dir_select.cpp + src/qt_gui/install_dir_select.h + src/qt_gui/main.cpp + src/qt_gui/main_window.cpp + src/qt_gui/main_window.h src/qt_gui/main_window_themes.cpp src/qt_gui/main_window_themes.h + src/qt_gui/main_window_ui.h + src/qt_gui/pkg_viewer.cpp + src/qt_gui/pkg_viewer.h src/qt_gui/settings_dialog.cpp src/qt_gui/settings_dialog.h src/qt_gui/settings_dialog.ui - src/qt_gui/main.cpp + src/qt_gui/trophy_viewer.cpp + src/qt_gui/trophy_viewer.h ${EMULATOR} ${RESOURCE_FILES} ${TRANSLATIONS} diff --git a/REUSE.toml b/REUSE.toml index 218fc0d86..b0e482ef3 100644 --- a/REUSE.toml +++ b/REUSE.toml @@ -32,6 +32,7 @@ path = [ "src/images/grid_icon.png", "src/images/iconsize_icon.png", "src/images/ko-fi.png", + "src/images/keys.png", "src/images/keys_icon.png", "src/images/list_icon.png", "src/images/list_mode_icon.png", diff --git a/src/images/keys.png b/src/images/keys.png new file mode 100644 index 000000000..dfe46e803 Binary files /dev/null and b/src/images/keys.png differ diff --git a/src/qt_gui/keys_shortcuts_dialog.cpp b/src/qt_gui/keys_shortcuts_dialog.cpp new file mode 100644 index 000000000..a9e42a466 --- /dev/null +++ b/src/qt_gui/keys_shortcuts_dialog.cpp @@ -0,0 +1,18 @@ +// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include +#include "keys_shortcuts_dialog.h" +#include "ui_keys_shortcuts_dialog.h" + +KeysShortcutsDialog::KeysShortcutsDialog(QWidget* parent) + : QDialog(parent), ui(new Ui::KeysShortcutsDialog) { + ui->setupUi(this); + ui->shad_text->setText(tr("KeysShortcutsDialog_MSG").replace("\\n", "\n")); +} + +KeysShortcutsDialog::~KeysShortcutsDialog() { + delete ui; +} \ No newline at end of file diff --git a/src/qt_gui/keys_shortcuts_dialog.h b/src/qt_gui/keys_shortcuts_dialog.h new file mode 100644 index 000000000..7e33fd0e9 --- /dev/null +++ b/src/qt_gui/keys_shortcuts_dialog.h @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +#include +#include +#include +#include +#include + +namespace Ui { +class KeysShortcutsDialog; +} + +class KeysShortcutsDialog : public QDialog { + Q_OBJECT + +public: + explicit KeysShortcutsDialog(QWidget* parent = nullptr); + ~KeysShortcutsDialog(); + +private: + Ui::KeysShortcutsDialog* ui; +}; diff --git a/src/qt_gui/keys_shortcuts_dialog.ui b/src/qt_gui/keys_shortcuts_dialog.ui new file mode 100644 index 000000000..6d4420e45 --- /dev/null +++ b/src/qt_gui/keys_shortcuts_dialog.ui @@ -0,0 +1,71 @@ + + + + KeysShortcutsDialog + + + + 0 + 0 + 780 + 600 + + + + Keys and Shortcuts + + + + :/images/shadps4.ico:/images/shadps4.ico + + + + + 20 + 220 + 740 + 350 + + + + QFrame::Shape::NoFrame + + + + + + :/images/keys.png + + + true + + + + + + 20 + 20 + 740 + 200 + + + + + 14 + + + + KeysShortcutsDialog_MSG + + + Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop + + + true + + + + + + diff --git a/src/qt_gui/main_window.cpp b/src/qt_gui/main_window.cpp index 56e7880a2..96c89d60f 100644 --- a/src/qt_gui/main_window.cpp +++ b/src/qt_gui/main_window.cpp @@ -6,6 +6,7 @@ #include #include "about_dialog.h" +#include "keys_shortcuts_dialog.h" #include "cheats_patches.h" #ifdef ENABLE_UPDATER #include "check_update.h" @@ -268,8 +269,8 @@ void MainWindow::CreateConnects() { #endif connect(ui->keys_shortcuts, &QAction::triggered, this, [this]() { - auto aboutDialog = new AboutDialog(this); - aboutDialog->exec(); + auto keysShortcutsDialog = new KeysShortcutsDialog(this); + keysShortcutsDialog->exec(); }); connect(ui->aboutAct, &QAction::triggered, this, [this]() { diff --git a/src/qt_gui/translations/en.ts b/src/qt_gui/translations/en.ts index 9bf7c7188..0fbfc31e5 100644 --- a/src/qt_gui/translations/en.ts +++ b/src/qt_gui/translations/en.ts @@ -1488,4 +1488,12 @@ Failed to create the update script file + + KeysShortcutsDialog + + + KeysShortcutsDialog_MSG + F7 : Captures mouse and enables mouse movement input.\nF8 : Reparse keyboard input.\nF9 : Pause emulator (in Debug Menu).\nF10 : FPS counter.\nLCtrl + F10 : Debug Menu.\nF11 : Fullscreen.\nF12 : Captures a frame when RenderDoc is enabled. + + \ No newline at end of file diff --git a/src/shadps4.qrc b/src/shadps4.qrc index 7798e4ed6..fb537a633 100644 --- a/src/shadps4.qrc +++ b/src/shadps4.qrc @@ -8,6 +8,7 @@ images/stop_icon.png images/file_icon.png images/folder_icon.png + images/keys.png images/keys_icon.png images/themes_icon.png images/iconsize_icon.png