remove keys_shortcuts

CMakeLists.txt

@@ -805,36 +805,33 @@ 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/elf_viewer.cpp
+           src/qt_gui/main_window_ui.h
-           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/gui_context_menus.h
-           src/qt_gui/main_window_themes.h
+           src/qt_gui/game_list_utils.h
-           src/qt_gui/main_window_ui.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/main_window_themes.cpp
+           src/qt_gui/main_window_themes.h
            src/qt_gui/settings_dialog.cpp
            src/qt_gui/settings_dialog.h
            src/qt_gui/settings_dialog.ui
-           src/qt_gui/trophy_viewer.cpp
+           src/qt_gui/main.cpp
-           src/qt_gui/trophy_viewer.h
            ${EMULATOR}
            ${RESOURCE_FILES}
            ${TRANSLATIONS}
@@ -1017,4 +1014,4 @@ if (ENABLE_QT_GUI AND CMAKE_SYSTEM_NAME STREQUAL "Linux")
     install(FILES "dist/net.shadps4.shadPS4.metainfo.xml" DESTINATION "share/metainfo")
     install(FILES ".github/shadps4.png" DESTINATION "share/icons/hicolor/512x512/apps" RENAME "net.shadps4.shadPS4.png")
     install(FILES "src/images/net.shadps4.shadPS4.svg" DESTINATION "share/icons/hicolor/scalable/apps")
-endif()
+endif()

REUSE.toml

@@ -33,8 +33,6 @@ 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",
     "src/images/pause_icon.png",

src/qt_gui/keys_shortcuts_dialog.cpp

@@ -1,18 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include <QImage>
-#include <QLabel>
-#include <QPixmap>
-#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->text->setText(tr("KeysShortcutsDialog_MSG").replace("\\n", "\n"));
-}
-
-KeysShortcutsDialog::~KeysShortcutsDialog() {
-    delete ui;
-}

src/qt_gui/keys_shortcuts_dialog.h

@@ -1,25 +0,0 @@
-// SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include <QDesktopServices>
-#include <QDialog>
-#include <QLabel>
-#include <QPixmap>
-#include <QUrl>
-
-namespace Ui {
-class KeysShortcutsDialog;
-}
-
-class KeysShortcutsDialog : public QDialog {
-    Q_OBJECT
-
-public:
-    explicit KeysShortcutsDialog(QWidget* parent = nullptr);
-    ~KeysShortcutsDialog();
-
-private:
-    Ui::KeysShortcutsDialog* ui;
-};

src/qt_gui/keys_shortcuts_dialog.ui

@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
-     SPDX-License-Identifier: GPL-2.0-or-later -->
-<ui version="4.0">
- <class>KeysShortcutsDialog</class>
- <widget class="QDialog" name="KeysShortcutsDialog">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>780</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>Keys and Shortcuts</string>
-  </property>
-  <property name="windowIcon">
-   <iconset>
-    <normaloff>:/images/shadps4.ico</normaloff>:/images/shadps4.ico</iconset>
-  </property>
-  <widget class="QLabel" name="image">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>220</y>
-     <width>780</width>
-     <height>380</height>
-    </rect>
-   </property>
-   <property name="frameShape">
-    <enum>QFrame::Shape::NoFrame</enum>
-   </property>
-   <property name="pixmap">
-    <pixmap>:/images/keys.png</pixmap>
-   </property>
-   <property name="scaledContents">
-    <bool>true</bool>
-   </property>
-  </widget>
-  <widget class="QGroupBox" name="textGroupBox">
-   <property name="geometry">
-    <rect>
-     <x>20</x>
-     <y>20</y>
-     <width>740</width>
-     <height>200</height>
-    </rect>
-   </property>
-   <property name="title">
-    <string/>
-   </property>
-   <widget class="QLabel" name="text">
-    <property name="geometry">
-     <rect>
-      <x>10</x>
-      <y>10</y>
-      <width>720</width>
-      <height>181</height>
-     </rect>
-    </property>
-    <property name="font">
-     <font>
-      <pointsize>14</pointsize>
-     </font>
-    </property>
-    <property name="text">
-     <string>KeysShortcutsDialog_MSG</string>
-    </property>
-    <property name="alignment">
-     <set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
-    </property>
-    <property name="wordWrap">
-     <bool>true</bool>
-    </property>
-   </widget>
-  </widget>
- </widget>
- <resources/>
- <connections/>
-</ui>

src/qt_gui/main_window.cpp

@@ -7,7 +7,6 @@
 
 #include "about_dialog.h"
 #include "cheats_patches.h"
-#include "keys_shortcuts_dialog.h"
 #ifdef ENABLE_UPDATER
 #include "check_update.h"
 #endif
@@ -273,11 +272,6 @@ void MainWindow::CreateConnects() {
     });
 #endif
 
-    connect(ui->keys_shortcuts, &QAction::triggered, this, [this]() {
-        auto keysShortcutsDialog = new KeysShortcutsDialog(this);
-        keysShortcutsDialog->exec();
-    });
-
     connect(ui->aboutAct, &QAction::triggered, this, [this]() {
         auto aboutDialog = new AboutDialog(this);
         aboutDialog->exec();
@@ -960,7 +954,6 @@ void MainWindow::SetUiIcons(bool isWhite) {
     ui->downloadCheatsPatchesAct->setIcon(
         RecolorIcon(ui->downloadCheatsPatchesAct->icon(), isWhite));
     ui->dumpGameListAct->setIcon(RecolorIcon(ui->dumpGameListAct->icon(), isWhite));
-    ui->keys_shortcuts->setIcon(RecolorIcon(ui->keys_shortcuts->icon(), isWhite));
     ui->aboutAct->setIcon(RecolorIcon(ui->aboutAct->icon(), isWhite));
     ui->setlistModeListAct->setIcon(RecolorIcon(ui->setlistModeListAct->icon(), isWhite));
     ui->setlistModeGridAct->setIcon(RecolorIcon(ui->setlistModeGridAct->icon(), isWhite));

src/qt_gui/main_window_ui.h

@@ -30,7 +30,6 @@ public:
     QAction* updaterAct;
 #endif
     QAction* aboutAct;
-    QAction* keys_shortcuts;
     QAction* configureAct;
     QAction* setThemeDark;
     QAction* setThemeLight;
@@ -140,9 +139,6 @@ public:
         aboutAct = new QAction(MainWindow);
         aboutAct->setObjectName("aboutAct");
         aboutAct->setIcon(QIcon(":images/about_icon.png"));
-        keys_shortcuts = new QAction(MainWindow);
-        keys_shortcuts->setObjectName("keys_shortcuts");
-        keys_shortcuts->setIcon(QIcon(":images/keys_icon.png"));
         configureAct = new QAction(MainWindow);
         configureAct->setObjectName("configureAct");
         configureAct->setIcon(QIcon(":images/settings_icon.png"));
@@ -302,7 +298,6 @@ public:
 #ifdef ENABLE_UPDATER
         menuHelp->addAction(updaterAct);
 #endif
-        menuHelp->addAction(keys_shortcuts);
         menuHelp->addAction(aboutAct);
 
         retranslateUi(MainWindow);
@@ -322,8 +317,6 @@ public:
             QCoreApplication::translate("MainWindow", "Check for Updates", nullptr));
 #endif
         aboutAct->setText(QCoreApplication::translate("MainWindow", "About shadPS4", nullptr));
-        keys_shortcuts->setText(
-            QCoreApplication::translate("MainWindow", "Keys and Shortcuts", nullptr));
         configureAct->setText(QCoreApplication::translate("MainWindow", "Configure...", nullptr));
 #if QT_CONFIG(tooltip)
         bootInstallPkgAct->setToolTip(QCoreApplication::translate(

src/qt_gui/translations/en.ts

@@ -1488,12 +1488,4 @@
 			<translation>Failed to create the update script file</translation>
 		</message>
 	</context>
-	<context>
-		<name>KeysShortcutsDialog</name>
-		<message>
-			<location filename="../keys_shortcuts_dialog.cpp" line="57"/>
-			<source>KeysShortcutsDialog_MSG</source>
-			<translation>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.</translation>
-		</message>
-	</context>
 </TS>

src/shadps4.qrc

@@ -9,8 +9,6 @@
 		<file>images/utils_icon.png</file>
 		<file>images/file_icon.png</file>
 		<file>images/folder_icon.png</file>
-		<file>images/keys.png</file>
-		<file>images/keys_icon.png</file>
 		<file>images/themes_icon.png</file>
 		<file>images/iconsize_icon.png</file>
 		<file>images/list_icon.png</file>