diff --git a/src/citra_qt/CMakeLists.txt b/src/citra_qt/CMakeLists.txt index 36b7cfa26..6ac1eb2db 100644 --- a/src/citra_qt/CMakeLists.txt +++ b/src/citra_qt/CMakeLists.txt @@ -1,5 +1,6 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTORCC ON) +set(CMAKE_AUTOUIC ON) set(CMAKE_INCLUDE_CURRENT_DIR ON) set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/CMakeModules) if (POLICY CMP0071) @@ -10,6 +11,7 @@ add_executable(citra-qt Info.plist aboutdialog.cpp aboutdialog.h + aboutdialog.ui applets/mii_selector.cpp applets/mii_selector.h applets/swkbd.cpp @@ -28,33 +30,49 @@ add_executable(citra-qt camera/qt_multimedia_camera.h cheats.cpp cheats.h + cheats.ui citra-qt.rc + compatdb.cpp + compatdb.h + compatdb.ui configuration/config.cpp configuration/config.h + configuration/configure.ui configuration/configure_audio.cpp configuration/configure_audio.h + configuration/configure_audio.ui configuration/configure_camera.cpp configuration/configure_camera.h + configuration/configure_camera.ui configuration/configure_debug.cpp configuration/configure_debug.h + configuration/configure_debug.ui configuration/configure_dialog.cpp configuration/configure_dialog.h configuration/configure_general.cpp configuration/configure_general.h + configuration/configure_general.ui configuration/configure_graphics.cpp configuration/configure_graphics.h + configuration/configure_graphics.ui configuration/configure_hotkeys.cpp configuration/configure_hotkeys.h + configuration/configure_hotkeys.ui configuration/configure_input.cpp configuration/configure_input.h + configuration/configure_input.ui configuration/configure_motion_touch.cpp configuration/configure_motion_touch.h + configuration/configure_motion_touch.ui configuration/configure_system.cpp configuration/configure_system.h + configuration/configure_system.ui configuration/configure_ui.cpp configuration/configure_ui.h + configuration/configure_ui.ui configuration/configure_web.cpp configuration/configure_web.h + configuration/configure_web.ui debugger/console.h debugger/console.cpp debugger/graphics/graphics.cpp @@ -78,6 +96,7 @@ add_executable(citra-qt debugger/profiler.h debugger/registers.cpp debugger/registers.h + debugger/registers.ui debugger/wait_tree.cpp debugger/wait_tree.h discord.h @@ -90,26 +109,33 @@ add_executable(citra-qt hotkeys.h main.cpp main.h - multiplayer/chat_room.h + main.ui multiplayer/chat_room.cpp + multiplayer/chat_room.h + multiplayer/chat_room.ui multiplayer/client_room.h multiplayer/client_room.cpp - multiplayer/direct_connect.h + multiplayer/client_room.ui multiplayer/direct_connect.cpp - multiplayer/host_room.h + multiplayer/direct_connect.h + multiplayer/direct_connect.ui multiplayer/host_room.cpp - multiplayer/lobby.h - multiplayer/lobby_p.h + multiplayer/host_room.h + multiplayer/host_room.ui multiplayer/lobby.cpp - multiplayer/message.h + multiplayer/lobby.h + multiplayer/lobby.ui + multiplayer/lobby_p.h multiplayer/message.cpp + multiplayer/message.h multiplayer/moderation_dialog.cpp multiplayer/moderation_dialog.h + multiplayer/moderation_dialog.ui multiplayer/state.cpp multiplayer/state.h multiplayer/validation.h - ui_settings.cpp - ui_settings.h + uisettings.cpp + uisettings.h updater/updater.cpp updater/updater.h updater/updater_p.h @@ -121,34 +147,6 @@ add_executable(citra-qt util/spinbox.h util/util.cpp util/util.h - compatdb.cpp - compatdb.h -) - -set(UIS - configuration/configure.ui - configuration/configure_audio.ui - configuration/configure_camera.ui - configuration/configure_debug.ui - configuration/configure_general.ui - configuration/configure_graphics.ui - configuration/configure_hotkeys.ui - configuration/configure_input.ui - configuration/configure_motion_touch.ui - configuration/configure_system.ui - configuration/configure_ui.ui - configuration/configure_web.ui - debugger/registers.ui - multiplayer/direct_connect.ui - multiplayer/lobby.ui - multiplayer/chat_room.ui - multiplayer/client_room.ui - multiplayer/host_room.ui - multiplayer/moderation_dialog.ui - aboutdialog.ui - cheats.ui - main.ui - compatdb.ui ) file(GLOB COMPAT_LIST @@ -157,8 +155,6 @@ file(GLOB COMPAT_LIST file(GLOB_RECURSE ICONS ${PROJECT_SOURCE_DIR}/dist/icons/*) file(GLOB_RECURSE THEMES ${PROJECT_SOURCE_DIR}/dist/qt_themes/*) -qt5_wrap_ui(UI_HDRS ${UIS}) - if (ENABLE_QT_TRANSLATION) set(CITRA_QT_LANGUAGES "${PROJECT_SOURCE_DIR}/dist/languages" CACHE PATH "Path to the translation bundle for the Qt frontend") option(GENERATE_QT_TRANSLATION "Generate en.ts as the translation source file" OFF) @@ -197,8 +193,6 @@ target_sources(citra-qt ${COMPAT_LIST} ${ICONS} ${THEMES} - ${UI_HDRS} - ${UIS} ${LANGUAGES} ) diff --git a/src/citra_qt/configuration/config.cpp b/src/citra_qt/configuration/config.cpp index 0201b3d3c..13ebb6fe4 100644 --- a/src/citra_qt/configuration/config.cpp +++ b/src/citra_qt/configuration/config.cpp @@ -8,7 +8,7 @@ #include #include #include "citra_qt/configuration/config.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/file_util.h" #include "core/hle/service/service.h" #include "input_common/main.h" diff --git a/src/citra_qt/configuration/configure_camera.cpp b/src/citra_qt/configuration/configure_camera.cpp index aff71598d..03bc2c4b6 100644 --- a/src/citra_qt/configuration/configure_camera.cpp +++ b/src/citra_qt/configuration/configure_camera.cpp @@ -10,7 +10,7 @@ #include #include #include "citra_qt/configuration/configure_camera.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "core/core.h" #include "core/settings.h" #include "ui_configure_camera.h" diff --git a/src/citra_qt/configuration/configure_debug.cpp b/src/citra_qt/configuration/configure_debug.cpp index 56b078521..5dfbe6fd0 100644 --- a/src/citra_qt/configuration/configure_debug.cpp +++ b/src/citra_qt/configuration/configure_debug.cpp @@ -6,7 +6,7 @@ #include #include "citra_qt/configuration/configure_debug.h" #include "citra_qt/debugger/console.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/file_util.h" #include "common/logging/backend.h" #include "common/logging/filter.h" diff --git a/src/citra_qt/configuration/configure_general.cpp b/src/citra_qt/configuration/configure_general.cpp index 9362ad243..7332d959a 100644 --- a/src/citra_qt/configuration/configure_general.cpp +++ b/src/citra_qt/configuration/configure_general.cpp @@ -4,7 +4,7 @@ #include #include "citra_qt/configuration/configure_general.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "core/core.h" #include "core/settings.h" #include "ui_configure_general.h" diff --git a/src/citra_qt/configuration/configure_system.cpp b/src/citra_qt/configuration/configure_system.cpp index 4a15d5c24..775bc1eeb 100644 --- a/src/citra_qt/configuration/configure_system.cpp +++ b/src/citra_qt/configuration/configure_system.cpp @@ -5,7 +5,7 @@ #include #include #include "citra_qt/configuration/configure_system.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "core/core.h" #include "core/hle/service/cfg/cfg.h" #include "core/hle/service/ptm/ptm.h" diff --git a/src/citra_qt/configuration/configure_ui.cpp b/src/citra_qt/configuration/configure_ui.cpp index 10eaf3889..006b93e8c 100644 --- a/src/citra_qt/configuration/configure_ui.cpp +++ b/src/citra_qt/configuration/configure_ui.cpp @@ -4,7 +4,7 @@ #include #include "citra_qt/configuration/configure_ui.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "ui_configure_ui.h" ConfigureUi::ConfigureUi(QWidget* parent) : QWidget(parent), ui(new Ui::ConfigureUi) { diff --git a/src/citra_qt/configuration/configure_web.cpp b/src/citra_qt/configuration/configure_web.cpp index 5285edfc6..2ad70ce8b 100644 --- a/src/citra_qt/configuration/configure_web.cpp +++ b/src/citra_qt/configuration/configure_web.cpp @@ -6,7 +6,7 @@ #include #include #include "citra_qt/configuration/configure_web.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "core/settings.h" #include "core/telemetry_session.h" #include "ui_configure_web.h" diff --git a/src/citra_qt/debugger/console.cpp b/src/citra_qt/debugger/console.cpp index 3d6b9ca41..95ce9b0c7 100644 --- a/src/citra_qt/debugger/console.cpp +++ b/src/citra_qt/debugger/console.cpp @@ -9,7 +9,7 @@ #endif #include "citra_qt/debugger/console.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/logging/backend.h" namespace Debugger { diff --git a/src/citra_qt/discord_impl.cpp b/src/citra_qt/discord_impl.cpp index 138ffaa09..e49e51106 100644 --- a/src/citra_qt/discord_impl.cpp +++ b/src/citra_qt/discord_impl.cpp @@ -6,7 +6,7 @@ #include #include #include "citra_qt/discord_impl.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/common_types.h" #include "core/core.h" diff --git a/src/citra_qt/game_list.cpp b/src/citra_qt/game_list.cpp index dad0a3cdb..6ca267dec 100644 --- a/src/citra_qt/game_list.cpp +++ b/src/citra_qt/game_list.cpp @@ -26,7 +26,7 @@ #include "citra_qt/game_list_p.h" #include "citra_qt/game_list_worker.h" #include "citra_qt/main.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/common_paths.h" #include "common/logging/log.h" #include "core/file_sys/archive_extsavedata.h" diff --git a/src/citra_qt/game_list.h b/src/citra_qt/game_list.h index ccf695fa5..2797dd09d 100644 --- a/src/citra_qt/game_list.h +++ b/src/citra_qt/game_list.h @@ -9,7 +9,7 @@ #include #include "citra_qt/compatibility_list.h" #include "common/common_types.h" -#include "ui_settings.h" +#include "uisettings.h" class GameListWorker; class GameListDir; diff --git a/src/citra_qt/game_list_p.h b/src/citra_qt/game_list_p.h index 96aaffa33..5891a4487 100644 --- a/src/citra_qt/game_list_p.h +++ b/src/citra_qt/game_list_p.h @@ -15,7 +15,7 @@ #include #include #include -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "citra_qt/util/util.h" #include "common/file_util.h" #include "common/logging/log.h" diff --git a/src/citra_qt/game_list_worker.cpp b/src/citra_qt/game_list_worker.cpp index 952257bfa..1ae2e2f38 100644 --- a/src/citra_qt/game_list_worker.cpp +++ b/src/citra_qt/game_list_worker.cpp @@ -12,7 +12,7 @@ #include "citra_qt/game_list.h" #include "citra_qt/game_list_p.h" #include "citra_qt/game_list_worker.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/common_paths.h" #include "common/file_util.h" #include "core/hle/service/am/am.h" diff --git a/src/citra_qt/hotkeys.cpp b/src/citra_qt/hotkeys.cpp index 5542f6dd4..591ac8163 100644 --- a/src/citra_qt/hotkeys.cpp +++ b/src/citra_qt/hotkeys.cpp @@ -6,7 +6,7 @@ #include #include #include "citra_qt/hotkeys.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" HotkeyRegistry::HotkeyRegistry() = default; HotkeyRegistry::~HotkeyRegistry() = default; diff --git a/src/citra_qt/main.cpp b/src/citra_qt/main.cpp index 73dab10a6..d1a31fa5c 100644 --- a/src/citra_qt/main.cpp +++ b/src/citra_qt/main.cpp @@ -45,7 +45,7 @@ #include "citra_qt/hotkeys.h" #include "citra_qt/main.h" #include "citra_qt/multiplayer/state.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "citra_qt/updater/updater.h" #include "citra_qt/util/clickable_label.h" #include "common/common_paths.h" diff --git a/src/citra_qt/multiplayer/direct_connect.cpp b/src/citra_qt/multiplayer/direct_connect.cpp index 9cdce1dc6..aef2378b3 100644 --- a/src/citra_qt/multiplayer/direct_connect.cpp +++ b/src/citra_qt/multiplayer/direct_connect.cpp @@ -14,7 +14,7 @@ #include "citra_qt/multiplayer/message.h" #include "citra_qt/multiplayer/state.h" #include "citra_qt/multiplayer/validation.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "core/hle/service/cfg/cfg.h" #include "core/settings.h" #include "network/network.h" diff --git a/src/citra_qt/multiplayer/host_room.cpp b/src/citra_qt/multiplayer/host_room.cpp index 6b3f59d53..09398cc47 100644 --- a/src/citra_qt/multiplayer/host_room.cpp +++ b/src/citra_qt/multiplayer/host_room.cpp @@ -17,7 +17,7 @@ #include "citra_qt/multiplayer/message.h" #include "citra_qt/multiplayer/state.h" #include "citra_qt/multiplayer/validation.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/logging/log.h" #include "core/announce_multiplayer_session.h" #include "core/hle/service/cfg/cfg.h" diff --git a/src/citra_qt/multiplayer/lobby.cpp b/src/citra_qt/multiplayer/lobby.cpp index 124dc76c8..06ba2e6f6 100644 --- a/src/citra_qt/multiplayer/lobby.cpp +++ b/src/citra_qt/multiplayer/lobby.cpp @@ -13,7 +13,7 @@ #include "citra_qt/multiplayer/message.h" #include "citra_qt/multiplayer/state.h" #include "citra_qt/multiplayer/validation.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "common/logging/log.h" #include "core/hle/service/cfg/cfg.h" #include "core/settings.h" diff --git a/src/citra_qt/multiplayer/state.cpp b/src/citra_qt/multiplayer/state.cpp index 4daafd3a0..caef77efc 100644 --- a/src/citra_qt/multiplayer/state.cpp +++ b/src/citra_qt/multiplayer/state.cpp @@ -14,7 +14,7 @@ #include "citra_qt/multiplayer/lobby.h" #include "citra_qt/multiplayer/message.h" #include "citra_qt/multiplayer/state.h" -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "citra_qt/util/clickable_label.h" #include "common/announce_multiplayer_room.h" #include "common/logging/log.h" diff --git a/src/citra_qt/ui_settings.cpp b/src/citra_qt/uisettings.cpp similarity index 93% rename from src/citra_qt/ui_settings.cpp rename to src/citra_qt/uisettings.cpp index 39156fb73..35c56dd1f 100644 --- a/src/citra_qt/ui_settings.cpp +++ b/src/citra_qt/uisettings.cpp @@ -2,7 +2,7 @@ // Licensed under GPLv2 or any later version // Refer to the license.txt file included. -#include "ui_settings.h" +#include "uisettings.h" namespace UISettings { diff --git a/src/citra_qt/ui_settings.h b/src/citra_qt/uisettings.h similarity index 100% rename from src/citra_qt/ui_settings.h rename to src/citra_qt/uisettings.h diff --git a/src/citra_qt/updater/updater.cpp b/src/citra_qt/updater/updater.cpp index 73579b9d5..8701eee7b 100644 --- a/src/citra_qt/updater/updater.cpp +++ b/src/citra_qt/updater/updater.cpp @@ -11,7 +11,7 @@ #include #include #include -#include "citra_qt/ui_settings.h" +#include "citra_qt/uisettings.h" #include "citra_qt/updater/updater.h" #include "citra_qt/updater/updater_p.h" #include "common/logging/log.h"