diff --git a/scripts/generate_fullscreen_ui_translation_strings.py b/scripts/generate_fullscreen_ui_translation_strings.py index 2abb4fe07..4e4998c69 100644 --- a/scripts/generate_fullscreen_ui_translation_strings.py +++ b/scripts/generate_fullscreen_ui_translation_strings.py @@ -6,8 +6,8 @@ import re START_IDENT = "// TRANSLATION-STRING-AREA-BEGIN" END_IDENT = "// TRANSLATION-STRING-AREA-END" -SRC_FILES = ["src/core/fullscreen_ui.cpp", "src/util/imgui_fullscreen.cpp", "src/util/imgui_fullscreen.h"] -DST_FILE = "src/core/fullscreen_ui.cpp" +SRC_FILES = ["src/core/fullscreenui.cpp", "src/core/fullscreenui_widgets.cpp", "src/core/fullscreenui_widgets.h"] +DST_FILE = "src/core/fullscreenui.cpp" full_source = "" for src_file in SRC_FILES: diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index a19dc9f72..b4eed2bc3 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -38,8 +38,8 @@ add_library(core digital_controller.h dma.cpp dma.h - fullscreen_ui.cpp - fullscreen_ui.h + fullscreenui.cpp + fullscreenui.h fullscreenui_widgets.cpp fullscreenui_widgets.h game_database.cpp diff --git a/src/core/achievements.cpp b/src/core/achievements.cpp index 1e9f384b6..54b4a254f 100644 --- a/src/core/achievements.cpp +++ b/src/core/achievements.cpp @@ -9,7 +9,7 @@ #include "bus.h" #include "cheats.h" #include "cpu_core.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "fullscreenui_widgets.h" #include "game_list.h" #include "gpu_thread.h" diff --git a/src/core/cdrom.cpp b/src/core/cdrom.cpp index 2c2649a65..2170ce085 100644 --- a/src/core/cdrom.cpp +++ b/src/core/cdrom.cpp @@ -5,7 +5,7 @@ #include "cdrom_async_reader.h" #include "cdrom_subq_replacement.h" #include "dma.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "host.h" #include "interrupt_controller.h" #include "mdec.h" diff --git a/src/core/core.vcxproj b/src/core/core.vcxproj index 4a9bfb1e5..3d1036a79 100644 --- a/src/core/core.vcxproj +++ b/src/core/core.vcxproj @@ -31,7 +31,7 @@ - + @@ -113,7 +113,7 @@ - + diff --git a/src/core/core.vcxproj.filters b/src/core/core.vcxproj.filters index 91fbb4289..f30d2ccea 100644 --- a/src/core/core.vcxproj.filters +++ b/src/core/core.vcxproj.filters @@ -45,7 +45,7 @@ - + @@ -121,7 +121,7 @@ - + diff --git a/src/core/fullscreen_ui.cpp b/src/core/fullscreenui.cpp similarity index 99% rename from src/core/fullscreen_ui.cpp rename to src/core/fullscreenui.cpp index d4597b4d2..228be5887 100644 --- a/src/core/fullscreen_ui.cpp +++ b/src/core/fullscreenui.cpp @@ -1,7 +1,7 @@ // SPDX-FileCopyrightText: 2019-2025 Connor McLaughlin // SPDX-License-Identifier: CC-BY-NC-ND-4.0 -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "achievements.h" #include "bios.h" #include "cheats.h" diff --git a/src/core/fullscreen_ui.h b/src/core/fullscreenui.h similarity index 100% rename from src/core/fullscreen_ui.h rename to src/core/fullscreenui.h diff --git a/src/core/fullscreenui_widgets.cpp b/src/core/fullscreenui_widgets.cpp index 322e326ee..0e2a72fda 100644 --- a/src/core/fullscreenui_widgets.cpp +++ b/src/core/fullscreenui_widgets.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "fullscreenui_widgets.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "gpu_thread.h" #include "host.h" #include "system.h" diff --git a/src/core/game_list.cpp b/src/core/game_list.cpp index 2f6e07cd3..4df4be1a5 100644 --- a/src/core/game_list.cpp +++ b/src/core/game_list.cpp @@ -4,7 +4,7 @@ #include "game_list.h" #include "achievements.h" #include "bios.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "host.h" #include "memory_card_image.h" #include "psf_loader.h" diff --git a/src/core/gpu_presenter.cpp b/src/core/gpu_presenter.cpp index c69a334cb..c4ff41b53 100644 --- a/src/core/gpu_presenter.cpp +++ b/src/core/gpu_presenter.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_presenter.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "fullscreenui_widgets.h" #include "gpu.h" #include "gpu_backend.h" diff --git a/src/core/gpu_thread.cpp b/src/core/gpu_thread.cpp index f4445a7fd..4a6a2b7b6 100644 --- a/src/core/gpu_thread.cpp +++ b/src/core/gpu_thread.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: CC-BY-NC-ND-4.0 #include "gpu_thread.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "gpu_backend.h" #include "gpu_hw_texture_cache.h" #include "gpu_presenter.h" diff --git a/src/core/hotkeys.cpp b/src/core/hotkeys.cpp index 64351ab25..a3b5e06ee 100644 --- a/src/core/hotkeys.cpp +++ b/src/core/hotkeys.cpp @@ -5,7 +5,7 @@ #include "cpu_code_cache.h" #include "cpu_core.h" #include "cpu_pgxp.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "gpu.h" #include "gpu_hw_texture_cache.h" #include "gpu_presenter.h" diff --git a/src/core/imgui_overlays.cpp b/src/core/imgui_overlays.cpp index 0767932e8..2423986b9 100644 --- a/src/core/imgui_overlays.cpp +++ b/src/core/imgui_overlays.cpp @@ -7,7 +7,7 @@ #include "controller.h" #include "cpu_core_private.h" #include "dma.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "fullscreenui_widgets.h" #include "gpu.h" #include "gpu_backend.h" diff --git a/src/core/system.cpp b/src/core/system.cpp index df2efaacf..f3ef27787 100644 --- a/src/core/system.cpp +++ b/src/core/system.cpp @@ -12,7 +12,7 @@ #include "cpu_core.h" #include "cpu_pgxp.h" #include "dma.h" -#include "fullscreen_ui.h" +#include "fullscreenui.h" #include "game_database.h" #include "game_list.h" #include "gpu.h" diff --git a/src/duckstation-mini/mini_host.cpp b/src/duckstation-mini/mini_host.cpp index b2bd15c5d..1d2c2fadf 100644 --- a/src/duckstation-mini/mini_host.cpp +++ b/src/duckstation-mini/mini_host.cpp @@ -6,7 +6,7 @@ #include "core/achievements.h" #include "core/bus.h" #include "core/controller.h" -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "core/game_list.h" #include "core/gpu.h" #include "core/gpu_backend.h" diff --git a/src/duckstation-qt/displaywidget.cpp b/src/duckstation-qt/displaywidget.cpp index a688f1f65..b7d32f392 100644 --- a/src/duckstation-qt/displaywidget.cpp +++ b/src/duckstation-qt/displaywidget.cpp @@ -6,7 +6,7 @@ #include "qthost.h" #include "qtutils.h" -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "util/imgui_manager.h" diff --git a/src/duckstation-qt/gamelistwidget.cpp b/src/duckstation-qt/gamelistwidget.cpp index 6f415e490..d50bbe271 100644 --- a/src/duckstation-qt/gamelistwidget.cpp +++ b/src/duckstation-qt/gamelistwidget.cpp @@ -8,7 +8,7 @@ #include "qtutils.h" #include "settingswindow.h" -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "core/game_list.h" #include "core/host.h" #include "core/settings.h" diff --git a/src/duckstation-qt/graphicssettingswidget.cpp b/src/duckstation-qt/graphicssettingswidget.cpp index ecae29488..b807de784 100644 --- a/src/duckstation-qt/graphicssettingswidget.cpp +++ b/src/duckstation-qt/graphicssettingswidget.cpp @@ -7,7 +7,7 @@ #include "settingwidgetbinder.h" #include "ui_texturereplacementsettingsdialog.h" -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "core/game_database.h" #include "core/gpu.h" #include "core/settings.h" diff --git a/src/duckstation-qt/qthost.cpp b/src/duckstation-qt/qthost.cpp index 6d55840f0..56e196f41 100644 --- a/src/duckstation-qt/qthost.cpp +++ b/src/duckstation-qt/qthost.cpp @@ -14,7 +14,7 @@ #include "core/bus.h" #include "core/cheats.h" #include "core/controller.h" -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "core/fullscreenui_widgets.h" #include "core/game_database.h" #include "core/game_list.h" diff --git a/src/duckstation-regtest/regtest_host.cpp b/src/duckstation-regtest/regtest_host.cpp index b695f264d..dba927645 100644 --- a/src/duckstation-regtest/regtest_host.cpp +++ b/src/duckstation-regtest/regtest_host.cpp @@ -4,7 +4,7 @@ #include "core/achievements.h" #include "core/bus.h" #include "core/controller.h" -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "core/game_list.h" #include "core/gpu.h" #include "core/gpu_backend.h" diff --git a/src/util/imgui_manager.cpp b/src/util/imgui_manager.cpp index 16302c375..67e5dc6c0 100644 --- a/src/util/imgui_manager.cpp +++ b/src/util/imgui_manager.cpp @@ -9,7 +9,7 @@ #include "shadergen.h" // TODO: Remove me when GPUDevice config is also cleaned up. -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "core/fullscreenui_widgets.h" #include "core/gpu_thread.h" #include "core/host.h" diff --git a/src/util/postprocessing.cpp b/src/util/postprocessing.cpp index 86944f77c..497e06373 100644 --- a/src/util/postprocessing.cpp +++ b/src/util/postprocessing.cpp @@ -11,7 +11,7 @@ #include "shadergen.h" // TODO: Remove me -#include "core/fullscreen_ui.h" +#include "core/fullscreenui.h" #include "core/host.h" #include "core/settings.h"