diff --git a/CMakeLists.txt b/CMakeLists.txt index b1b49946d..7de79a43d 100755 --- a/CMakeLists.txt +++ b/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/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_ui.h 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/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/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/trophy_viewer.h + src/qt_gui/main.cpp ${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() \ No newline at end of file diff --git a/REUSE.toml b/REUSE.toml index 47e8ee4d7..747679c8b 100644 --- a/REUSE.toml +++ b/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", diff --git a/src/images/keys.png b/src/images/keys.png deleted file mode 100644 index 28b15728d..000000000 Binary files a/src/images/keys.png and /dev/null differ diff --git a/src/images/keys_icon.png b/src/images/keys_icon.png deleted file mode 100644 index b03721eb3..000000000 Binary files a/src/images/keys_icon.png and /dev/null differ diff --git a/src/qt_gui/keys_shortcuts_dialog.cpp b/src/qt_gui/keys_shortcuts_dialog.cpp deleted file mode 100644 index dce696c3c..000000000 --- a/src/qt_gui/keys_shortcuts_dialog.cpp +++ /dev/null @@ -1,18 +0,0 @@ -// 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->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 deleted file mode 100644 index 7e33fd0e9..000000000 --- a/src/qt_gui/keys_shortcuts_dialog.h +++ /dev/null @@ -1,25 +0,0 @@ -// 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 deleted file mode 100644 index fa8280982..000000000 --- a/src/qt_gui/keys_shortcuts_dialog.ui +++ /dev/null @@ -1,81 +0,0 @@ - - - - KeysShortcutsDialog - - - - 0 - 0 - 780 - 600 - - - - Keys and Shortcuts - - - - :/images/shadps4.ico:/images/shadps4.ico - - - - - 0 - 220 - 780 - 380 - - - - QFrame::Shape::NoFrame - - - :/images/keys.png - - - true - - - - - - 20 - 20 - 740 - 200 - - - - - - - - - 10 - 10 - 720 - 181 - - - - - 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 7b4e7ece6..4c40084d3 100644 --- a/src/qt_gui/main_window.cpp +++ b/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)); diff --git a/src/qt_gui/main_window_ui.h b/src/qt_gui/main_window_ui.h index 2518601c9..5ff572f86 100644 --- a/src/qt_gui/main_window_ui.h +++ b/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( diff --git a/src/qt_gui/translations/en.ts b/src/qt_gui/translations/en.ts index 36d530a50..cd5a5fe8a 100644 --- a/src/qt_gui/translations/en.ts +++ b/src/qt_gui/translations/en.ts @@ -1488,12 +1488,4 @@ 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 f5b6e176d..30f234ed8 100644 --- a/src/shadps4.qrc +++ b/src/shadps4.qrc @@ -9,8 +9,6 @@ images/utils_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 images/list_icon.png