sneedmca/suyu
1
0
Fork 0
mirror of https://git.suyu.dev/suyu/suyu synced 2024-11-04 14:27:52 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1
suyu/src/yuzu/main.cpp

2662 lines
101 KiB
C++
Raw Normal View History

citra-qt: Added license headers to files.
2015-01-04 17:36:57 +00:00
// Copyright 2014 Citra Emulator Project
// Licensed under GPLv2 or any later version
// Refer to the license.txt file included.
main: Open folder when open save folder location context menu is clicked
2016-12-15 09:56:32 +00:00
#include <cinttypes>
Set the appropriate locale to get float conversion working using std::to_string
2016-03-06 13:04:47 +00:00
#include <clocale>
Common: Remove Common::make_unique, use std::make_unique
2016-04-05 12:29:55 +00:00
#include <memory>
New logging system
2014-10-28 07:36:00 +00:00
#include <thread>
Guard unistd.h with MacOS only macro Fix compile error on Windows caused by #4877 Weird, I thought I saw this guard during the code review...
2019-08-13 19:42:22 +00:00
#ifdef __APPLE__
#include <unistd.h> // for chdir
#endif
loader: Make ResultStatus directly compatible with fmt We can make the enum class type compatible with fmt by providing an overload of operator<<. While we're at it, perform proper bounds checking. If something exceeds the array, it should be a hard fail, because it's, without a doubt, a programmer error in this case.
2018-08-15 09:38:37 +00:00
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
// VFS includes must be before glad as they will conflict with Windows file api, which uses defines.
main: Switch to AppletManager for frontend
2019-03-11 23:39:48 +00:00
#include "applets/error.h"
qt: Register to use Qt ProfileSelector instead of default
2018-11-23 02:00:42 +00:00
#include "applets/profile_select.h"
qt/main: Register Qt Software Keyboard frontend with AM Allows using Qt provider over default.
2018-11-10 01:38:11 +00:00
#include "applets/software_keyboard.h"
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
#include "applets/web_browser.h"
yuzu: add a hotkey to switch between undocked and docked mode
2019-03-06 18:31:23 +00:00
#include "configuration/configure_input.h"
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
#include "configuration/configure_per_game.h"
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
#include "core/file_sys/vfs.h"
#include "core/file_sys/vfs_real.h"
main: Switch to AppletManager for frontend
2019-03-11 23:39:48 +00:00
#include "core/frontend/applets/general_frontend.h"
profile_manager: Load user icons, names, and UUIDs from system save
2018-10-11 01:49:20 +00:00
#include "core/hle/service/acc/profile_manager.h"
qt: Prompt user for confirmation if exit lock is active
2019-09-22 02:46:53 +00:00
#include "core/hle/service/am/applet_ae.h"
#include "core/hle/service/am/applet_oe.h"
qt/main: Register Qt Software Keyboard frontend with AM Allows using Qt provider over default.
2018-11-10 01:38:11 +00:00
#include "core/hle/service/am/applets/applets.h"
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
#include "core/hle/service/hid/controllers/npad.h"
#include "core/hle/service/hid/hid.h"
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
yuzu: Add hotkey for Amiibo loading
2018-11-13 14:06:41 +00:00
// These are wrappers to avoid the calls to CreateDirectory and CreateFile because of the Windows
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
// defines.
static FileSys::VirtualDir VfsFilesystemCreateDirectoryWrapper(
const FileSys::VirtualFilesystem& vfs, const std::string& path, FileSys::Mode mode) {
return vfs->CreateDirectory(path, mode);
}
static FileSys::VirtualFile VfsDirectoryCreateFileWrapper(const FileSys::VirtualDir& dir,
const std::string& path) {
return dir->CreateFile(path);
}
loader: Make ResultStatus directly compatible with fmt We can make the enum class type compatible with fmt by providing an overload of operator<<. While we're at it, perform proper bounds checking. If something exceeds the array, it should be a hard fail, because it's, without a doubt, a programmer error in this case.
2018-08-15 09:38:37 +00:00
#include <fmt/ostream.h>
Frontends, VideoCore: Move glad initialisation to the frontend On SDL2 this allows it to use SDL_GL_GetProcAddress() instead of the default function loader, and fixes a crash when using apitrace with an EGL context. On Qt we will need to migrate from QGLWidget to QOpenGLWidget and QOpenGLContext before we can use gladLoadGLLoader() instead of gladLoadGL(), since the former doesn’t expose a function loader.
2016-03-19 01:31:01 +00:00
#include <glad/glad.h>
loader: Make ResultStatus directly compatible with fmt We can make the enum class type compatible with fmt by providing an overload of operator<<. While we're at it, perform proper bounds checking. If something exceeds the array, it should be a hard fail, because it's, without a doubt, a programmer error in this case.
2018-08-15 09:38:37 +00:00
Frontends, VideoCore: Move glad initialisation to the frontend On SDL2 this allows it to use SDL_GL_GetProcAddress() instead of the default function loader, and fixes a crash when using apitrace with an EGL context. On Qt we will need to migrate from QGLWidget to QOpenGLWidget and QOpenGLContext before we can use gladLoadGLLoader() instead of gladLoadGL(), since the former doesn’t expose a function loader.
2016-03-19 01:31:01 +00:00
#define QT_NO_OPENGL
yuzu/main: Remove unnecessary includes While we're at it, don't use <QtGui> and <QtWidgets> and instead include exactly which headers we actually need.
2019-04-04 15:29:16 +00:00
#include <QClipboard>
#include <QDesktopServices>
Basic QT window
2014-04-01 02:26:50 +00:00
#include <QDesktopWidget>
qt: Add message about not moving contents on dir change
2018-09-03 23:23:10 +00:00
#include <QDialogButtonBox>
yuzu/main: Notify user of loading errors with Amiibo data We shouldn't silently continue if loading failed, since the general assumption is that no messages showing up implicitly indicates success.
2018-10-24 13:37:29 +00:00
#include <QFile>
Basic QT window
2014-04-01 02:26:50 +00:00
#include <QFileDialog>
yuzu/main: Remove unnecessary includes While we're at it, don't use <QtGui> and <QtWidgets> and instead include exactly which headers we actually need.
2019-04-04 15:29:16 +00:00
#include <QInputDialog>
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
#include <QMessageBox>
yuzu/main: Remove unnecessary includes While we're at it, don't use <QtGui> and <QtWidgets> and instead include exactly which headers we actually need.
2019-04-04 15:29:16 +00:00
#include <QProgressBar>
#include <QProgressDialog>
#include <QShortcut>
#include <QStatusBar>
Added Host CPU and OS to log
2019-09-21 12:24:16 +00:00
#include <QSysInfo>
Add a "Open Mods Page" button to the GUI
2020-06-21 04:09:28 +00:00
#include <QUrl>
qt: Add key derivation progress bar on initial setup
2018-09-24 01:06:33 +00:00
#include <QtConcurrent/QtConcurrent>
yuzu/main: Remove unnecessary includes While we're at it, don't use <QtGui> and <QtWidgets> and instead include exactly which headers we actually need.
2019-04-04 15:29:16 +00:00
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
#include <fmt/format.h>
Bug fixes, testing, and review changes
2018-06-14 21:25:40 +00:00
#include "common/common_paths.h"
Port web_service from Citra
2018-09-16 18:05:51 +00:00
#include "common/detached_tasks.h"
vfs_real: Forward declare IOFile Eliminates the need to rebuild some source files if the file_util header ever changes. This also uncovered some indirect inclusions, which have also been fixed.
2018-09-02 14:53:06 +00:00
#include "common/file_util.h"
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
#include "common/logging/backend.h"
#include "common/logging/filter.h"
#include "common/logging/log.h"
main: Log host system memory parameters Logs both physical memory and swapfile sizes, this is useful for support.
2020-05-17 18:45:12 +00:00
#include "common/memory_detect.h"
Integrate the MicroProfile profiling library This brings goodies such as a configurable user interface and multi-threaded timeline view.
2015-08-17 21:25:21 +00:00
#include "common/microprofile.h"
CitraQt: Cleanup includes.
2015-06-21 13:58:59 +00:00
#include "common/scm_rev.h"
New logging system
2014-10-28 07:36:00 +00:00
#include "common/scope_exit.h"
Added Host CPU and OS to log
2019-09-21 12:24:16 +00:00
#ifdef ARCHITECTURE_x86_64
#include "common/x64/cpu_detect.h"
#endif
core/core: Replace includes with forward declarations where applicable The follow-up to e2457418dae19b889b2ad85255bb95d4cd0e4bff, which replaces most of the includes in the core header with forward declarations. This makes it so that if any of the headers the core header was previously including change, then no one will need to rebuild the bulk of the core, due to core.h being quite a prevalent inclusion. This should make turnaround for changes much faster for developers.
2018-08-31 16:21:34 +00:00
#include "common/telemetry.h"
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
#include "core/core.h"
Make XCI comply to review and style guidelines
2018-07-29 01:39:42 +00:00
#include "core/crypto/key_manager.h"
qt: Add 'Install to NAND' option to menu Prompts for title type on NCA files.
2018-08-10 01:33:13 +00:00
#include "core/file_sys/card_image.h"
file_sys: Replace includes with forward declarations where applicable Cuts down on include dependencies, resulting in less files that need to be rebuilt when certain things are changed.
2018-09-04 01:58:19 +00:00
#include "core/file_sys/content_archive.h"
bktr: Fix bucket overlap error
2018-09-04 21:01:40 +00:00
#include "core/file_sys/control_metadata.h"
#include "core/file_sys/patch_manager.h"
service/filesystem: Use forward declarations where applicable Avoids the need to rebuild multiple source files if the filesystem code headers change. This also gets rid of a few instances of indirect inclusions being relied upon
2018-08-21 00:36:36 +00:00
#include "core/file_sys/registered_cache.h"
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
#include "core/file_sys/romfs.h"
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
#include "core/file_sys/savedata_factory.h"
main: Only show DRD deprecation warning once
2018-09-04 18:44:40 +00:00
#include "core/file_sys/submission_package.h"
am: Implement text check software keyboard mode Allows the game to verify and send a message to the frontend.
2018-11-11 21:41:31 +00:00
#include "core/frontend/applets/software_keyboard.h"
main: Only show DRD deprecation warning once
2018-09-04 18:44:40 +00:00
#include "core/hle/kernel/process.h"
qt: Prompt user for confirmation if exit lock is active
2019-09-22 02:46:53 +00:00
#include "core/hle/service/am/am.h"
core/core: Replace includes with forward declarations where applicable The follow-up to e2457418dae19b889b2ad85255bb95d4cd0e4bff, which replaces most of the includes in the core header with forward declarations. This makes it so that if any of the headers the core header was previously including change, then no one will need to rebuild the bulk of the core, due to core.h being quite a prevalent inclusion. This should make turnaround for changes much faster for developers.
2018-08-31 16:21:34 +00:00
#include "core/hle/service/filesystem/filesystem.h"
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
#include "core/hle/service/nfp/nfp.h"
#include "core/hle/service/sm/sm.h"
citra_qt: Reorganize headers
2015-09-11 04:23:00 +00:00
#include "core/loader/loader.h"
core/core: Replace includes with forward declarations where applicable The follow-up to e2457418dae19b889b2ad85255bb95d4cd0e4bff, which replaces most of the includes in the core header with forward declarations. This makes it so that if any of the headers the core header was previously including change, then no one will need to rebuild the bulk of the core, due to core.h being quite a prevalent inclusion. This should make turnaround for changes much faster for developers.
2018-08-31 16:21:34 +00:00
#include "core/perf_stats.h"
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
#include "core/settings.h"
core/core: Replace includes with forward declarations where applicable The follow-up to e2457418dae19b889b2ad85255bb95d4cd0e4bff, which replaces most of the includes in the core header with forward declarations. This makes it so that if any of the headers the core header was previously including change, then no one will need to rebuild the bulk of the core, due to core.h being quite a prevalent inclusion. This should make turnaround for changes much faster for developers.
2018-08-31 16:21:34 +00:00
#include "core/telemetry_session.h"
Implement "About" dialog
2018-01-14 18:15:45 +00:00
#include "yuzu/about_dialog.h"
Remove gpu debugger and get yuzu qt to compile
2018-01-12 03:33:56 +00:00
#include "yuzu/bootmanager.h"
Port web_service from Citra
2018-09-16 18:05:51 +00:00
#include "yuzu/compatdb.h"
yuzu: Move compatibility list specifics to their own source files Lets us keep the generic portions of the compatibility list code together, and allows us to introduce a type alias that makes it so we don't need to type out a very long type declaration anymore, making the immediate readability of some code better.
2018-09-09 23:09:37 +00:00
#include "yuzu/compatibility_list.h"
Remove gpu debugger and get yuzu qt to compile
2018-01-12 03:33:56 +00:00
#include "yuzu/configuration/config.h"
#include "yuzu/configuration/configure_dialog.h"
Add configurable logging backends
2018-07-02 17:10:41 +00:00
#include "yuzu/debugger/console.h"
Remove gpu debugger and get yuzu qt to compile
2018-01-12 03:33:56 +00:00
#include "yuzu/debugger/profiler.h"
#include "yuzu/debugger/wait_tree.h"
Port web_service from Citra
2018-09-16 18:05:51 +00:00
#include "yuzu/discord.h"
Remove gpu debugger and get yuzu qt to compile
2018-01-12 03:33:56 +00:00
#include "yuzu/game_list.h"
core/core: Replace includes with forward declarations where applicable The follow-up to e2457418dae19b889b2ad85255bb95d4cd0e4bff, which replaces most of the includes in the core header with forward declarations. This makes it so that if any of the headers the core header was previously including change, then no one will need to rebuild the bulk of the core, due to core.h being quite a prevalent inclusion. This should make turnaround for changes much faster for developers.
2018-08-31 16:21:34 +00:00
#include "yuzu/game_list_p.h"
Remove gpu debugger and get yuzu qt to compile
2018-01-12 03:33:56 +00:00
#include "yuzu/hotkeys.h"
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
#include "yuzu/install_dialog.h"
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
#include "yuzu/loading_screen.h"
Remove gpu debugger and get yuzu qt to compile
2018-01-12 03:33:56 +00:00
#include "yuzu/main.h"
yuzu/CMakeLists: Remove qt5_wrap_ui macro usage We can simply enable CMAKE_AUTOUIC and let CMake take care of handling the UI code generation for targets. As part of letting CMake automatically handle the header file parsing, we must not name includes with "ui_*" unless they're related to the output of the Qt UIC compiler. Because of this, we need to rename ui_settings, given it would conflict with this restriction.
2019-07-29 20:06:33 +00:00
#include "yuzu/uisettings.h"
OpenGL renderer
2015-05-19 04:21:33 +00:00
Port web_service from Citra
2018-09-16 18:05:51 +00:00
#ifdef USE_DISCORD_PRESENCE
#include "yuzu/discord_impl.h"
#endif
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
#ifdef YUZU_USE_QT_WEB_ENGINE
#include <QWebEngineProfile>
#include <QWebEngineScript>
#include <QWebEngineScriptCollection>
#include <QWebEngineSettings>
#include <QWebEngineView>
#endif
Add mingw compile support
2016-08-01 21:13:35 +00:00
#ifdef QT_STATICPLUGIN
Q_IMPORT_PLUGIN(QWindowsIntegrationPlugin);
#endif
Implement Pull #3528 from citra: use nvidia graphics automatically on laptops with optimus (with AMD support) (#271) * Port 3528: use nvidia graphics automatically on laptops with optimus * Force dedicated AMD Card for switchable Graphics * Ran clang-format
2018-04-19 18:22:26 +00:00
#ifdef _WIN32
Fix to Windows sleep issues Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-03 21:00:34 +00:00
#include <windows.h>
Implement Pull #3528 from citra: use nvidia graphics automatically on laptops with optimus (with AMD support) (#271) * Port 3528: use nvidia graphics automatically on laptops with optimus * Force dedicated AMD Card for switchable Graphics * Ran clang-format
2018-04-19 18:22:26 +00:00
extern "C" {
// tells Nvidia and AMD drivers to use the dedicated GPU by default on laptops with switchable
// graphics
__declspec(dllexport) unsigned long NvOptimusEnablement = 0x00000001;
__declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
}
#endif
yuzu: Option to hide mouse on inactivity Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2020-04-11 02:22:50 +00:00
constexpr int default_mouse_timeout = 2500;
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
constexpr u64 DLC_BASE_TITLE_ID_MASK = 0xFFFFFFFFFFFFE000;
citra_qt: Show one-time callout messages to user.
2017-08-09 00:06:25 +00:00
/**
* "Callouts" are one-time instructional messages shown to the user. In the config settings, there
* is a bitfield "callout_flags" options, used to track if a message has already been shown to the
* user. This is 32-bits - if we have more than 32 callouts, we should retire and recyle old ones.
*/
enum class CalloutFlag : uint32_t {
Telemetry = 0x1,
main: Only show DRD deprecation warning once
2018-09-04 18:44:40 +00:00
DRDDeprecation = 0x2,
citra_qt: Show one-time callout messages to user.
2017-08-09 00:06:25 +00:00
};
Port web_service from Citra
2018-09-16 18:05:51 +00:00
void GMainWindow::ShowTelemetryCallout() {
if (UISettings::values.callout_flags & static_cast<uint32_t>(CalloutFlag::Telemetry)) {
citra_qt: Show one-time callout messages to user.
2017-08-09 00:06:25 +00:00
return;
}
Port web_service from Citra
2018-09-16 18:05:51 +00:00
UISettings::values.callout_flags |= static_cast<uint32_t>(CalloutFlag::Telemetry);
Address a bunch of review comments
2018-09-17 15:16:01 +00:00
const QString telemetry_message =
qt: Update telemetry links These were pointing to a non-existent webpage.
2018-10-06 07:15:27 +00:00
tr("<a href='https://yuzu-emu.org/help/feature/telemetry/'>Anonymous "
Port web_service from Citra
2018-09-16 18:05:51 +00:00
"data is collected</a> to help improve yuzu. "
"<br/><br/>Would you like to share your usage data with us?");
if (QMessageBox::question(this, tr("Telemetry"), telemetry_message) != QMessageBox::Yes) {
Settings::values.enable_telemetry = false;
Settings::Apply();
}
citra_qt: Show one-time callout messages to user.
2017-08-09 00:06:25 +00:00
}
vfs: Fix documentation
2018-08-09 01:44:59 +00:00
const int GMainWindow::max_recent_files_item;
Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" (#1142) * Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" * Fix compilation
2018-08-23 23:52:06 +00:00
static void InitializeLogging() {
Log::Filter log_filter;
log_filter.ParseFilterString(Settings::values.log_filter);
Log::SetGlobalFilter(log_filter);
const std::string& log_dir = FileUtil::GetUserPath(FileUtil::UserPath::LogDir);
FileUtil::CreateFullPath(log_dir);
Log::AddBackend(std::make_unique<Log::FileBackend>(log_dir + LOG_FILE));
logging: Add DebuggerBackend for logging to Visual Studio
2018-10-05 03:22:49 +00:00
#ifdef _WIN32
Log::AddBackend(std::make_unique<Log::DebuggerBackend>());
#endif
Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" (#1142) * Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" * Fix compilation
2018-08-23 23:52:06 +00:00
}
core: Port core to VfsFilesystem for file access
2018-08-03 15:51:48 +00:00
GMainWindow::GMainWindow()
: config(new Config()), emu_thread(nullptr),
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
vfs(std::make_shared<FileSys::RealVfsFilesystem>()),
provider(std::make_unique<FileSys::ManualContentProvider>()) {
Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" (#1142) * Port #4013 from Citra: "Init logging sooner so we dont miss some logs on startup" * Fix compilation
2018-08-23 23:52:06 +00:00
InitializeLogging();
Frontend: Ported the GPU breakpoints and surface viewer widgets from citra.
2018-03-22 20:19:35 +00:00
added drag n drop feature
2017-02-16 03:23:30 +00:00
setAcceptDrops(true);
Basic QT window
2014-04-01 02:26:50 +00:00
ui.setupUi(this);
statusBar()->hide();
Port citra-emu/citra#3610 to yuzu
2018-03-30 15:38:34 +00:00
default_theme_paths = QIcon::themeSearchPaths();
UpdateUITheme();
Port web_service from Citra
2018-09-16 18:05:51 +00:00
SetDiscordEnabled(UISettings::values.enable_discord_presence);
discord_rpc->Update();
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
InitializeWidgets();
Qt: Re-organize setup of debugging widgets
2017-02-18 10:16:24 +00:00
InitializeDebugWidgets();
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
InitializeRecentFileMenuActions();
InitializeHotkeys();
SetDefaultUIGeometry();
RestoreUIState();
Qt: Reorganize connection of menu events
2017-02-18 10:26:57 +00:00
ConnectMenuEvents();
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
ConnectWidgetEvents();
yuzu/main: Move window title updating logic to its own function For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
2019-05-09 05:41:33 +00:00
Addressed feedback: removed CMake hack in favor of building the necessary strings via the supplied title format
2020-04-07 20:41:45 +00:00
const auto build_id = std::string(Common::g_build_id);
const auto fmt = std::string(Common::g_title_bar_format_idle);
Addressed feedback: switched to snake case and fixed clang-format errors
2020-04-07 20:59:09 +00:00
const auto yuzu_build_version =
Addressed feedback: removed CMake hack in favor of building the necessary strings via the supplied title format
2020-04-07 20:41:45 +00:00
fmt::format(fmt.empty() ? "yuzu Development Build" : fmt, std::string{}, std::string{},
std::string{}, std::string{}, std::string{}, build_id);
Addressed feedback: switched to snake case and fixed clang-format errors
2020-04-07 20:59:09 +00:00
LOG_INFO(Frontend, "yuzu Version: {} | {}-{}", yuzu_build_version, Common::g_scm_branch,
Port #3665 from Citra
2018-07-26 13:51:14 +00:00
Common::g_scm_desc);
Added Host CPU and OS to log
2019-09-21 12:24:16 +00:00
#ifdef ARCHITECTURE_x86_64
main: Append AVX and FMA instructions to cpu string Append AVX and FMA instructions to cpu string if the host cpu supports them
2020-05-16 11:35:15 +00:00
const auto& caps = Common::GetCPUCaps();
std::string cpu_string = caps.cpu_string;
if (caps.avx || caps.avx2 || caps.avx512) {
cpu_string += " | AVX";
if (caps.avx512) {
cpu_string += "512";
} else if (caps.avx2) {
cpu_string += '2';
}
if (caps.fma || caps.fma4) {
cpu_string += " | FMA";
}
}
LOG_INFO(Frontend, "Host CPU: {}", cpu_string);
Added Host CPU and OS to log
2019-09-21 12:24:16 +00:00
#endif
LOG_INFO(Frontend, "Host OS: {}", QSysInfo::prettyProductName().toStdString());
main: Log host system memory parameters Logs both physical memory and swapfile sizes, this is useful for support.
2020-05-17 18:45:12 +00:00
LOG_INFO(Frontend, "Host RAM: {:.2f} GB",
Common::GetMemInfo().TotalPhysicalMemory / 1024.0f / 1024 / 1024);
Fix macOS code and change "Swapfile" to "Swap"
2020-05-27 15:21:59 +00:00
LOG_INFO(Frontend, "Host Swap: {:.2f} GB",
main: Log host system memory parameters Logs both physical memory and swapfile sizes, this is useful for support.
2020-05-17 18:45:12 +00:00
Common::GetMemInfo().TotalSwapMemory / 1024.0f / 1024 / 1024);
yuzu/main: Move window title updating logic to its own function For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
2019-05-09 05:41:33 +00:00
UpdateWindowTitle();
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
show();
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
Core::System::GetInstance().SetContentProvider(
std::make_unique<FileSys::ContentProviderUnion>());
Core::System::GetInstance().RegisterContentProvider(
FileSys::ContentProviderUnionSlot::FrontendManual, provider.get());
yuzu: Port old usages of Filesystem namespace to FilesystemController
2019-04-22 21:56:56 +00:00
Core::System::GetInstance().GetFileSystemController().CreateFactories(*vfs);
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
qt: Add key derivation progress bar on initial setup
2018-09-24 01:06:33 +00:00
// Gen keys if necessary
partition_data_manager: Rename system files for hekate x
2018-09-29 15:48:51 +00:00
OnReinitializeKeys(ReinitializeKeyBehavior::NoWarning);
qt: Add key derivation progress bar on initial setup
2018-09-24 01:06:33 +00:00
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
game_list->LoadCompatibilityList();
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
game_list->PopulateAsync(UISettings::values.game_dirs);
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
citra_qt: Show one-time callout messages to user.
2017-08-09 00:06:25 +00:00
// Show one-time "callout" messages to the user
Port web_service from Citra
2018-09-16 18:05:51 +00:00
ShowTelemetryCallout();
citra_qt: Show one-time callout messages to user.
2017-08-09 00:06:25 +00:00
yuzu: Option to hide mouse on inactivity Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2020-04-11 02:22:50 +00:00
// make sure menubar has the arrow cursor instead of inheriting from this
ui.menubar->setCursor(QCursor());
statusBar()->setCursor(QCursor());
mouse_hide_timer.setInterval(default_mouse_timeout);
connect(&mouse_hide_timer, &QTimer::timeout, this, &GMainWindow::HideMouseCursor);
connect(ui.menubar, &QMenuBar::hovered, this, &GMainWindow::ShowMouseCursor);
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
QStringList args = QApplication::arguments();
if (args.length() >= 2) {
Qt: Remove unnecessary std::string usage
2017-02-17 06:32:22 +00:00
BootGame(args[1]);
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
}
}
GMainWindow::~GMainWindow() {
// will get automatically deleted otherwise
if (render_window->parent() == nullptr)
delete render_window;
}
qt: Implement GUI dialog frontend for ProfileSelector Presents profiles in a list, similar to switch.
2018-11-23 02:03:33 +00:00
void GMainWindow::ProfileSelectorSelectProfile() {
QtProfileSelectionDialog dialog(this);
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
dialog.setWindowModality(Qt::WindowModal);
profile_select: Remove unnecessary GetStatus() member function This behavior is already provided by the built-in exec() function. We just need to check the return value of it.
2019-05-29 04:34:42 +00:00
if (dialog.exec() == QDialog::Rejected) {
qt: Implement GUI dialog frontend for ProfileSelector Presents profiles in a list, similar to switch.
2018-11-23 02:03:33 +00:00
emit ProfileSelectorFinishedSelection(std::nullopt);
return;
}
Service::Account::ProfileManager manager;
profile_select: Return int instead of u32 for GetIndex() Qt uses a signed value to represent indices. We should follow this convention where applicable to avoid unnecessary sign-conversion warnings, as well as making it easier to interoperate with other aspects of Qt. While we're at it, we can also make a sign-conversion explicit.
2019-05-29 04:23:46 +00:00
const auto uuid = manager.GetUser(static_cast<std::size_t>(dialog.GetIndex()));
qt: Implement GUI dialog frontend for ProfileSelector Presents profiles in a list, similar to switch.
2018-11-23 02:03:33 +00:00
if (!uuid.has_value()) {
emit ProfileSelectorFinishedSelection(std::nullopt);
return;
}
emit ProfileSelectorFinishedSelection(uuid);
}
software_keyboard: Make GetText asynchronous a
2018-11-12 16:08:09 +00:00
void GMainWindow::SoftwareKeyboardGetText(
am: Allow applets to push multiple and different channels of data
2018-11-12 01:16:38 +00:00
const Core::Frontend::SoftwareKeyboardParameters& parameters) {
am: Implement text check software keyboard mode Allows the game to verify and send a message to the frontend.
2018-11-11 21:41:31 +00:00
QtSoftwareKeyboardDialog dialog(this, parameters);
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
dialog.setWindowModality(Qt::WindowModal);
yuzu/software_keyboard: Remove unnecessary GetStatus() member function Like with the profile selection dialog, we can just use the result of QDialog's exec() function to determine whether or not a dialog was accepted.
2019-05-29 04:52:47 +00:00
if (dialog.exec() == QDialog::Rejected) {
software_keyboard: Make GetText asynchronous a
2018-11-12 16:08:09 +00:00
emit SoftwareKeyboardFinishedText(std::nullopt);
applet: Add operation completed callback
2018-11-17 17:18:03 +00:00
return;
}
am: Allow applets to push multiple and different channels of data
2018-11-12 01:16:38 +00:00
software_keyboard: Make GetText asynchronous a
2018-11-12 16:08:09 +00:00
emit SoftwareKeyboardFinishedText(dialog.GetText());
am: Implement text check software keyboard mode Allows the game to verify and send a message to the frontend.
2018-11-11 21:41:31 +00:00
}
void GMainWindow::SoftwareKeyboardInvokeCheckDialog(std::u16string error_message) {
QMessageBox::warning(this, tr("Text Check Failed"), QString::fromStdU16String(error_message));
applet: Add operation completed callback
2018-11-17 17:18:03 +00:00
emit SoftwareKeyboardFinishedCheckDialog();
am: Implement text check software keyboard mode Allows the game to verify and send a message to the frontend.
2018-11-11 21:41:31 +00:00
}
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
#ifdef YUZU_USE_QT_WEB_ENGINE
void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view additional_args) {
NXInputWebEngineView web_browser_view(this);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
// Scope to contain the QProgressDialog for initialization
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
{
QProgressDialog progress(this);
progress.setMinimumDuration(200);
progress.setLabelText(tr("Loading Web Applet..."));
progress.setRange(0, 4);
progress.setValue(0);
progress.show();
auto future = QtConcurrent::run([this] { emit WebBrowserUnpackRomFS(); });
while (!future.isFinished())
QApplication::processEvents();
progress.setValue(1);
// Load the special shim script to handle input and exit.
QWebEngineScript nx_shim;
nx_shim.setSourceCode(GetNXShimInjectionScript());
nx_shim.setWorldId(QWebEngineScript::MainWorld);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
nx_shim.setName(QStringLiteral("nx_inject.js"));
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
nx_shim.setInjectionPoint(QWebEngineScript::DocumentCreation);
nx_shim.setRunsOnSubFrames(true);
web_browser_view.page()->profile()->scripts()->insert(nx_shim);
web_browser_view.load(
QUrl(QUrl::fromLocalFile(QString::fromStdString(std::string(filename))).toString() +
QString::fromStdString(std::string(additional_args))));
progress.setValue(2);
render_window->hide();
web_browser_view.setFocus();
const auto& layout = render_window->GetFramebufferLayout();
web_browser_view.resize(layout.screen.GetWidth(), layout.screen.GetHeight());
web_browser_view.move(layout.screen.left, layout.screen.top + menuBar()->height());
web_browser_view.setZoomFactor(static_cast<qreal>(layout.screen.GetWidth()) /
Layout::ScreenUndocked::Width);
web_browser_view.settings()->setAttribute(
QWebEngineSettings::LocalContentCanAccessRemoteUrls, true);
web_browser_view.show();
progress.setValue(3);
QApplication::processEvents();
progress.setValue(4);
}
bool finished = false;
QAction* exit_action = new QAction(tr("Exit Web Applet"), this);
connect(exit_action, &QAction::triggered, this, [&finished] { finished = true; });
ui.menubar->addAction(exit_action);
auto& npad =
Core::System::GetInstance()
.ServiceManager()
.GetService<Service::HID::Hid>("hid")
->GetAppletResource()
->GetController<Service::HID::Controller_NPad>(Service::HID::HidController::NPad);
const auto fire_js_keypress = [&web_browser_view](u32 key_code) {
web_browser_view.page()->runJavaScript(
QStringLiteral("document.dispatchEvent(new KeyboardEvent('keydown', {'key': %1}));")
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
.arg(key_code));
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
};
web_browser: Add shortcut to Enter key to exit applet Addresses issues where a user in fullscreen could not exit some web applets without leaving fullscreen.
2019-03-04 23:24:16 +00:00
QMessageBox::information(
this, tr("Exit"),
tr("To exit the web application, use the game provided controls to select exit, select the "
"'Exit Web Applet' option in the menu bar, or press the 'Enter' key."));
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
bool running_exit_check = false;
while (!finished) {
QApplication::processEvents();
if (!running_exit_check) {
web_browser_view.page()->runJavaScript(QStringLiteral("applet_done;"),
[&](const QVariant& res) {
running_exit_check = false;
if (res.toBool())
finished = true;
});
running_exit_check = true;
}
travis: Use correct package for linux Qt5WebEngine
2018-12-29 00:29:44 +00:00
const auto input = npad.GetAndResetPressState();
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
for (std::size_t i = 0; i < Settings::NativeButton::NumButtons; ++i) {
if ((input & (1 << i)) != 0) {
LOG_DEBUG(Frontend, "firing input for button id={:02X}", i);
web_browser_view.page()->runJavaScript(
QStringLiteral("yuzu_key_callbacks[%1]();").arg(i));
}
}
if (input & 0x00888000) // RStick Down | LStick Down | DPad Down
fire_js_keypress(40); // Down Arrow Key
else if (input & 0x00444000) // RStick Right | LStick Right | DPad Right
fire_js_keypress(39); // Right Arrow Key
else if (input & 0x00222000) // RStick Up | LStick Up | DPad Up
fire_js_keypress(38); // Up Arrow Key
else if (input & 0x00111000) // RStick Left | LStick Left | DPad Left
fire_js_keypress(37); // Left Arrow Key
else if (input & 0x00000001) // A Button
fire_js_keypress(13); // Enter Key
}
web_browser_view.hide();
render_window->show();
render_window->setFocus();
ui.menubar->removeAction(exit_action);
// Needed to update render window focus/show and remove menubar action
QApplication::processEvents();
emit WebBrowserFinishedBrowsing();
}
#else
void GMainWindow::WebBrowserOpenPage(std::string_view filename, std::string_view additional_args) {
QMessageBox::warning(
this, tr("Web Applet"),
tr("This version of yuzu was built without QtWebEngine support, meaning that yuzu cannot "
"properly display the game manual or web page requested."),
QMessageBox::Ok, QMessageBox::Ok);
LOG_INFO(Frontend,
"(STUBBED) called - Missing QtWebEngine dependency needed to open website page at "
"'{}' with arguments '{}'!",
filename, additional_args);
emit WebBrowserFinishedBrowsing();
}
#endif
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
void GMainWindow::InitializeWidgets() {
Port web_service from Citra
2018-09-16 18:05:51 +00:00
#ifdef YUZU_ENABLE_COMPATIBILITY_REPORTING
ui.action_Report_Compatibility->setVisible(true);
#endif
Qt: Use signals for emu_thread start/stop and fix disasm widget.
2015-04-29 04:01:41 +00:00
render_window = new GRenderWindow(this, emu_thread.get());
Re-enable toggling window mode.
2014-04-22 03:15:17 +00:00
render_window->hide();
Basic QT window
2014-04-01 02:26:50 +00:00
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
game_list = new GameList(vfs, provider.get(), this);
Initial implementation of a game list
2015-09-01 04:35:33 +00:00
ui.horizontalLayout->addWidget(game_list);
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
game_list_placeholder = new GameListPlaceholder(this);
ui.horizontalLayout->addWidget(game_list_placeholder);
game_list_placeholder->setVisible(false);
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
loading_screen = new LoadingScreen(this);
loading_screen->hide();
ui.horizontalLayout->addWidget(loading_screen);
Add fade out effect to the loading screen
2019-01-21 16:20:16 +00:00
connect(loading_screen, &LoadingScreen::Hidden, [&] {
loading_screen->Clear();
if (emulation_running) {
render_window->show();
render_window->setFocus();
}
});
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
// Create status bar
Added message to status bar to show core errors ignored by the user.
2017-04-13 05:10:19 +00:00
message_label = new QLabel();
// Configured separately for left alignment
message_label->setFrameStyle(QFrame::NoFrame);
message_label->setContentsMargins(4, 0, 4, 0);
message_label->setAlignment(Qt::AlignLeft);
statusBar()->addPermanentWidget(message_label, 1);
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
emu_speed_label = new QLabel();
clang-format
2018-01-16 18:05:21 +00:00
emu_speed_label->setToolTip(
tr("Current emulation speed. Values higher or lower than 100% "
"indicate emulation is running faster or slower than a Switch."));
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
game_fps_label = new QLabel();
Qt: Add tooltips to status bar displays
2017-02-20 03:09:46 +00:00
game_fps_label->setToolTip(tr("How many frames per second the game is currently displaying. "
"This will vary from game to game and scene to scene."));
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
emu_frametime_label = new QLabel();
Qt: Add tooltips to status bar displays
2017-02-20 03:09:46 +00:00
emu_frametime_label->setToolTip(
Minor cleanup
2018-01-13 23:49:16 +00:00
tr("Time taken to emulate a Switch frame, not counting framelimiting or v-sync. For "
Qt: Add tooltips to status bar displays
2017-02-20 03:09:46 +00:00
"full-speed emulation this should be at most 16.67 ms."));
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
for (auto& label : {emu_speed_label, game_fps_label, emu_frametime_label}) {
label->setVisible(false);
Qt: Tweak status bar styling
2017-02-21 00:53:40 +00:00
label->setFrameStyle(QFrame::NoFrame);
label->setContentsMargins(4, 0, 4, 0);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
statusBar()->addPermanentWidget(label);
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
}
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
// Setup Dock button
dock_status_button = new QPushButton();
dock_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton"));
dock_status_button->setFocusPolicy(Qt::NoFocus);
connect(dock_status_button, &QPushButton::clicked, [&] {
Settings::values.use_docked_mode = !Settings::values.use_docked_mode;
dock_status_button->setChecked(Settings::values.use_docked_mode);
OnDockedModeChanged(!Settings::values.use_docked_mode, Settings::values.use_docked_mode);
});
dock_status_button->setText(tr("DOCK"));
dock_status_button->setCheckable(true);
dock_status_button->setChecked(Settings::values.use_docked_mode);
statusBar()->insertPermanentWidget(0, dock_status_button);
// Setup ASync button
async_status_button = new QPushButton();
async_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton"));
async_status_button->setFocusPolicy(Qt::NoFocus);
connect(async_status_button, &QPushButton::clicked, [&] {
if (emulation_running) {
return;
}
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
bool is_async = !Settings::values.use_asynchronous_gpu_emulation.GetValue() ||
Settings::values.use_multi_core.GetValue();
Settings::values.use_asynchronous_gpu_emulation.SetValue(is_async);
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation.GetValue());
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
Settings::Apply();
});
async_status_button->setText(tr("ASYNC"));
async_status_button->setCheckable(true);
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation.GetValue());
GUI: Make multicore only work with Async and add GUI for multicore.
2020-03-16 01:34:22 +00:00
// Setup Multicore button
multicore_status_button = new QPushButton();
multicore_status_button->setObjectName(QStringLiteral("TogglableStatusBarButton"));
multicore_status_button->setFocusPolicy(Qt::NoFocus);
connect(multicore_status_button, &QPushButton::clicked, [&] {
if (emulation_running) {
return;
}
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
Settings::values.use_multi_core.SetValue(!Settings::values.use_multi_core.GetValue());
bool is_async = Settings::values.use_asynchronous_gpu_emulation.GetValue() ||
Settings::values.use_multi_core.GetValue();
Settings::values.use_asynchronous_gpu_emulation.SetValue(is_async);
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation.GetValue());
multicore_status_button->setChecked(Settings::values.use_multi_core.GetValue());
GUI: Make multicore only work with Async and add GUI for multicore.
2020-03-16 01:34:22 +00:00
Settings::Apply();
});
multicore_status_button->setText(tr("MULTICORE"));
multicore_status_button->setCheckable(true);
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
multicore_status_button->setChecked(Settings::values.use_multi_core.GetValue());
GUI: Make multicore only work with Async and add GUI for multicore.
2020-03-16 01:34:22 +00:00
statusBar()->insertPermanentWidget(0, multicore_status_button);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
statusBar()->insertPermanentWidget(0, async_status_button);
// Setup Renderer API button
renderer_status_button = new QPushButton();
renderer_status_button->setObjectName(QStringLiteral("RendererStatusBarButton"));
renderer_status_button->setCheckable(true);
renderer_status_button->setFocusPolicy(Qt::NoFocus);
connect(renderer_status_button, &QPushButton::toggled, [=](bool checked) {
renderer_status_button->setText(checked ? tr("VULKAN") : tr("OPENGL"));
});
renderer_status_button->toggle();
#ifndef HAS_VULKAN
renderer_status_button->setChecked(false);
renderer_status_button->setCheckable(false);
renderer_status_button->setDisabled(true);
#else
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
Settings::RendererBackend::Vulkan);
connect(renderer_status_button, &QPushButton::clicked, [=] {
if (emulation_running) {
return;
}
if (renderer_status_button->isChecked()) {
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
Settings::values.renderer_backend.SetValue(Settings::RendererBackend::Vulkan);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
} else {
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
Settings::values.renderer_backend.SetValue(Settings::RendererBackend::OpenGL);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
}
Settings::Apply();
});
#endif // HAS_VULKAN
statusBar()->insertPermanentWidget(0, renderer_status_button);
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
statusBar()->setVisible(true);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
setStyleSheet(QStringLiteral("QStatusBar::item{border: none;}"));
Qt: Re-organize setup of debugging widgets
2017-02-18 10:16:24 +00:00
}
void GMainWindow::InitializeDebugWidgets() {
QMenu* debug_menu = ui.menu_View_Debugging;
Initial implementation of a game list
2015-09-01 04:35:33 +00:00
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709) * Make Citra build with MICROPROFILE_ENABLED set to 0 * Buildfix with microprofile kept on * moc did not like a dialog to conditionally exist. * Cleanup * Fix end of line
2016-04-29 00:17:31 +00:00
#if MICROPROFILE_ENABLED
Integrate the MicroProfile profiling library This brings goodies such as a configurable user interface and multi-threaded timeline view.
2015-08-17 21:25:21 +00:00
microProfileDialog = new MicroProfileDialog(this);
microProfileDialog->hide();
Qt: Re-organize setup of debugging widgets
2017-02-18 10:16:24 +00:00
debug_menu->addAction(microProfileDialog->toggleViewAction());
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709) * Make Citra build with MICROPROFILE_ENABLED set to 0 * Buildfix with microprofile kept on * moc did not like a dialog to conditionally exist. * Cleanup * Fix end of line
2016-04-29 00:17:31 +00:00
#endif
Integrate the MicroProfile profiling library This brings goodies such as a configurable user interface and multi-threaded timeline view.
2015-08-17 21:25:21 +00:00
implement wait tree widget
2016-04-08 16:28:54 +00:00
waitTreeWidget = new WaitTreeWidget(this);
addDockWidget(Qt::LeftDockWidgetArea, waitTreeWidget);
waitTreeWidget->hide();
debug_menu->addAction(waitTreeWidget->toggleViewAction());
Qt: Re-organize setup of debugging widgets
2017-02-18 10:16:24 +00:00
connect(this, &GMainWindow::EmulationStarting, waitTreeWidget,
&WaitTreeWidget::OnEmulationStarting);
connect(this, &GMainWindow::EmulationStopping, waitTreeWidget,
&WaitTreeWidget::OnEmulationStopping);
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
}
void GMainWindow::InitializeRecentFileMenuActions() {
for (int i = 0; i < max_recent_files_item; ++i) {
actions_recent_files[i] = new QAction(this);
actions_recent_files[i]->setVisible(false);
qt: Migrate to Qt 5 signal/slot connection syntax where applicable
2018-01-19 01:03:13 +00:00
connect(actions_recent_files[i], &QAction::triggered, this, &GMainWindow::OnMenuRecentFile);
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
ui.menu_recent_files->addAction(actions_recent_files[i]);
}
Port #4056 from Citra: "Add Clear Recent Files menu action"
2018-08-21 11:12:45 +00:00
ui.menu_recent_files->addSeparator();
QAction* action_clear_recent_files = new QAction(this);
action_clear_recent_files->setText(tr("Clear Recent Files"));
connect(action_clear_recent_files, &QAction::triggered, this, [this] {
UISettings::values.recent_files.clear();
UpdateRecentFiles();
});
ui.menu_recent_files->addAction(action_clear_recent_files);
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
UpdateRecentFiles();
}
void GMainWindow::InitializeHotkeys() {
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
hotkey_registry.LoadHotkeys();
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString main_window = QStringLiteral("Main Window");
const QString load_file = QStringLiteral("Load File");
GUI: add few missing hotkeys to main menu
2020-01-12 23:49:44 +00:00
const QString load_amiibo = QStringLiteral("Load Amiibo");
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString exit_yuzu = QStringLiteral("Exit yuzu");
GUI: add few missing hotkeys to main menu
2020-01-12 23:49:44 +00:00
const QString restart_emulation = QStringLiteral("Restart Emulation");
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString stop_emulation = QStringLiteral("Stop Emulation");
const QString toggle_filter_bar = QStringLiteral("Toggle Filter Bar");
const QString toggle_status_bar = QStringLiteral("Toggle Status Bar");
const QString fullscreen = QStringLiteral("Fullscreen");
GUI: add few missing hotkeys to main menu
2020-01-12 23:49:44 +00:00
const QString capture_screenshot = QStringLiteral("Capture Screenshot");
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
ui.action_Load_File->setShortcut(hotkey_registry.GetKeySequence(main_window, load_file));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
ui.action_Load_File->setShortcutContext(
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
hotkey_registry.GetShortcutContext(main_window, load_file));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
GUI: add few missing hotkeys to main menu
2020-01-12 23:49:44 +00:00
ui.action_Load_Amiibo->setShortcut(hotkey_registry.GetKeySequence(main_window, load_amiibo));
ui.action_Load_Amiibo->setShortcutContext(
hotkey_registry.GetShortcutContext(main_window, load_amiibo));
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
ui.action_Exit->setShortcut(hotkey_registry.GetKeySequence(main_window, exit_yuzu));
ui.action_Exit->setShortcutContext(hotkey_registry.GetShortcutContext(main_window, exit_yuzu));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
GUI: add few missing hotkeys to main menu
2020-01-12 23:49:44 +00:00
ui.action_Restart->setShortcut(hotkey_registry.GetKeySequence(main_window, restart_emulation));
ui.action_Restart->setShortcutContext(
hotkey_registry.GetShortcutContext(main_window, restart_emulation));
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
ui.action_Stop->setShortcut(hotkey_registry.GetKeySequence(main_window, stop_emulation));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
ui.action_Stop->setShortcutContext(
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
hotkey_registry.GetShortcutContext(main_window, stop_emulation));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
ui.action_Show_Filter_Bar->setShortcut(
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
hotkey_registry.GetKeySequence(main_window, toggle_filter_bar));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
ui.action_Show_Filter_Bar->setShortcutContext(
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
hotkey_registry.GetShortcutContext(main_window, toggle_filter_bar));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
ui.action_Show_Status_Bar->setShortcut(
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
hotkey_registry.GetKeySequence(main_window, toggle_status_bar));
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
ui.action_Show_Status_Bar->setShortcutContext(
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
hotkey_registry.GetShortcutContext(main_window, toggle_status_bar));
GUI: add few missing hotkeys to main menu
2020-01-12 23:49:44 +00:00
ui.action_Capture_Screenshot->setShortcut(
hotkey_registry.GetKeySequence(main_window, capture_screenshot));
ui.action_Capture_Screenshot->setShortcutContext(
hotkey_registry.GetShortcutContext(main_window, capture_screenshot));
Fix issues caused when changing the fullscreen hotkey
2020-06-25 20:54:05 +00:00
ui.action_Fullscreen->setShortcut(
hotkey_registry.GetHotkey(main_window, fullscreen, this)->key());
ui.action_Fullscreen->setShortcutContext(
hotkey_registry.GetShortcutContext(main_window, fullscreen));
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Load File"), this),
&QShortcut::activated, this, &GMainWindow::OnMenuLoadFile);
connect(
hotkey_registry.GetHotkey(main_window, QStringLiteral("Continue/Pause Emulation"), this),
&QShortcut::activated, this, [&] {
if (emulation_running) {
if (emu_thread->IsRunning()) {
OnPauseGame();
} else {
OnStartGame();
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
}
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
});
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Restart Emulation"), this),
yuzu: Make hotkeys configurable via the GUI * Adds a new Hotkeys tab in the Controls group. * Double-click a Hotkey to rebind it.
2019-02-16 15:19:29 +00:00
&QShortcut::activated, this, [this] {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
if (!Core::System::GetInstance().IsPoweredOn()) {
Port #3902 from Citra: "Add restart hotkey & menu option"
2018-08-21 11:24:55 +00:00
return;
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
BootGame(game_path);
Port #3902 from Citra: "Add restart hotkey & menu option"
2018-08-21 11:24:55 +00:00
});
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, fullscreen, render_window),
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
&QShortcut::activated, ui.action_Fullscreen, &QAction::trigger);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, fullscreen, render_window),
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
&QShortcut::activatedAmbiguously, ui.action_Fullscreen, &QAction::trigger);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Exit Fullscreen"), this),
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
&QShortcut::activated, this, [&] {
if (emulation_running) {
ui.action_Fullscreen->setChecked(false);
ToggleFullscreen();
}
});
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Toggle Speed Limit"), this),
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
&QShortcut::activated, this, [&] {
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
Settings::values.use_frame_limit.SetValue(
!Settings::values.use_frame_limit.GetValue());
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
UpdateStatusBar();
});
yuzu/frontend: Remove internal resolution option
2020-06-06 19:56:14 +00:00
constexpr u16 SPEED_LIMIT_STEP = 5;
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Increase Speed Limit"), this),
Port #3353 from Citra
2018-08-20 23:14:06 +00:00
&QShortcut::activated, this, [&] {
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
if (Settings::values.frame_limit.GetValue() < 9999 - SPEED_LIMIT_STEP) {
Settings::values.frame_limit.SetValue(SPEED_LIMIT_STEP +
Settings::values.frame_limit.GetValue());
Port #3353 from Citra
2018-08-20 23:14:06 +00:00
UpdateStatusBar();
}
});
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Decrease Speed Limit"), this),
Port #3353 from Citra
2018-08-20 23:14:06 +00:00
&QShortcut::activated, this, [&] {
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
if (Settings::values.frame_limit.GetValue() > SPEED_LIMIT_STEP) {
Settings::values.frame_limit.SetValue(Settings::values.frame_limit.GetValue() -
SPEED_LIMIT_STEP);
Port #3353 from Citra
2018-08-20 23:14:06 +00:00
UpdateStatusBar();
}
});
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Load Amiibo"), this),
&QShortcut::activated, this, [&] {
yuzu: Add hotkey for Amiibo loading
2018-11-13 14:06:41 +00:00
if (ui.action_Load_Amiibo->isEnabled()) {
OnLoadAmiibo();
}
});
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Capture Screenshot"), this),
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
&QShortcut::activated, this, [&] {
Fix ss crash on game menu, fix ss on windowed mode
2020-07-06 21:30:28 +00:00
if (emu_thread != nullptr && emu_thread->IsRunning()) {
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
OnCaptureScreenshot();
}
});
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Change Docked Mode"), this),
yuzu: add a hotkey to switch between undocked and docked mode
2019-03-06 18:31:23 +00:00
&QShortcut::activated, this, [&] {
Settings::values.use_docked_mode = !Settings::values.use_docked_mode;
OnDockedModeChanged(!Settings::values.use_docked_mode,
Settings::values.use_docked_mode);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
dock_status_button->setChecked(Settings::values.use_docked_mode);
yuzu: add a hotkey to switch between undocked and docked mode
2019-03-06 18:31:23 +00:00
});
Add a "Mute Audio" hotkey
2020-06-25 19:05:03 +00:00
connect(hotkey_registry.GetHotkey(main_window, QStringLiteral("Mute Audio"), this),
&QShortcut::activated, this,
[] { Settings::values.audio_muted = !Settings::values.audio_muted; });
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
}
Basic QT window
2014-04-01 02:26:50 +00:00
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
void GMainWindow::SetDefaultUIGeometry() {
frontend: Set minimum window size to 640x360 instead of 1280x720 (#3413)
2020-05-15 20:22:27 +00:00
// geometry: 53% of the window contents are in the upper screen half, 47% in the lower half
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
const QRect screenRect = QApplication::desktop()->screenGeometry(this);
const int w = screenRect.width() * 2 / 3;
frontend: Set minimum window size to 640x360 instead of 1280x720 (#3413)
2020-05-15 20:22:27 +00:00
const int h = screenRect.height() * 2 / 3;
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
const int x = (screenRect.x() + screenRect.width()) / 2 - w / 2;
frontend: Set minimum window size to 640x360 instead of 1280x720 (#3413)
2020-05-15 20:22:27 +00:00
const int y = (screenRect.y() + screenRect.height()) / 2 - h * 53 / 100;
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
Basic QT window
2014-04-01 02:26:50 +00:00
setGeometry(x, y, w, h);
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
}
Basic QT window
2014-04-01 02:26:50 +00:00
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
void GMainWindow::RestoreUIState() {
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
restoreGeometry(UISettings::values.geometry);
restoreState(UISettings::values.state);
render_window->restoreGeometry(UISettings::values.renderwindow_geometry);
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709) * Make Citra build with MICROPROFILE_ENABLED set to 0 * Buildfix with microprofile kept on * moc did not like a dialog to conditionally exist. * Cleanup * Fix end of line
2016-04-29 00:17:31 +00:00
#if MICROPROFILE_ENABLED
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
microProfileDialog->restoreGeometry(UISettings::values.microprofile_geometry);
microProfileDialog->setVisible(UISettings::values.microprofile_visible);
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709) * Make Citra build with MICROPROFILE_ENABLED set to 0 * Buildfix with microprofile kept on * moc did not like a dialog to conditionally exist. * Cleanup * Fix end of line
2016-04-29 00:17:31 +00:00
#endif
Game list: save and load column sizes, sort order, to QSettings
2015-09-07 06:51:57 +00:00
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
game_list->LoadInterfaceLayout();
Implement gdbstub
2015-09-02 12:56:38 +00:00
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
ui.action_Single_Window_Mode->setChecked(UISettings::values.single_window_mode);
Re-enable toggling window mode.
2014-04-22 03:15:17 +00:00
ToggleWindowMode();
Basic QT window
2014-04-01 02:26:50 +00:00
Merge citra-emu PR#3001 by Styleoshin(citra-qt : Adding fullscreen mode)
2018-01-16 14:50:33 +00:00
ui.action_Fullscreen->setChecked(UISettings::values.fullscreen);
Qt: Fix action name to match conventions
2017-02-18 09:11:57 +00:00
ui.action_Display_Dock_Widget_Headers->setChecked(UISettings::values.display_titlebar);
OnDisplayTitleBars(ui.action_Display_Dock_Widget_Headers->isChecked());
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
citra-qt: game list search function (#2673) * citra-qt: game list search function * Empty search field during game list refresh * Code improvements * Code formatting * Autofocus search field * JayFoxRox's recommendations * lioncash's review
2017-04-30 02:04:39 +00:00
ui.action_Show_Filter_Bar->setChecked(UISettings::values.show_filter_bar);
game_list->setFilterVisible(ui.action_Show_Filter_Bar->isChecked());
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
ui.action_Show_Status_Bar->setChecked(UISettings::values.show_status_bar);
statusBar()->setVisible(ui.action_Show_Status_Bar->isChecked());
Add configurable logging backends
2018-07-02 17:10:41 +00:00
Debugger::ToggleConsole();
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
}
citra-qt: Add option to hide dock widget title bars
2015-01-06 15:09:30 +00:00
yuzu: Pause when in background Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-26 12:54:31 +00:00
void GMainWindow::OnAppFocusStateChanged(Qt::ApplicationState state) {
if (!UISettings::values.pause_when_in_background) {
return;
}
if (state != Qt::ApplicationHidden && state != Qt::ApplicationInactive &&
state != Qt::ApplicationActive) {
LOG_DEBUG(Frontend, "ApplicationState unusual flag: {} ", state);
}
if (ui.action_Pause->isEnabled() &&
(state & (Qt::ApplicationHidden | Qt::ApplicationInactive))) {
auto_paused = true;
OnPauseGame();
} else if (ui.action_Start->isEnabled() && auto_paused && state == Qt::ApplicationActive) {
auto_paused = false;
OnStartGame();
}
}
citra-qt: Move bits of constructor behavior to named functions Makes the initialization process a tad easier to grok, since the constructor isn't just a glob of random unrelated behaviors.
2016-12-19 19:50:58 +00:00
void GMainWindow::ConnectWidgetEvents() {
qt: Migrate to Qt 5 signal/slot connection syntax where applicable
2018-01-19 01:03:13 +00:00
connect(game_list, &GameList::GameChosen, this, &GMainWindow::OnGameListLoadFile);
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
connect(game_list, &GameList::OpenDirectory, this, &GMainWindow::OnGameListOpenDirectory);
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
connect(game_list, &GameList::OpenFolderRequested, this, &GMainWindow::OnGameListOpenFolder);
frontend: Open transferable shader cache for a selected game in the gamelist
2019-02-08 08:05:51 +00:00
connect(game_list, &GameList::OpenTransferableShaderCacheRequested, this,
&GMainWindow::OnTransferableShaderCacheOpenFile);
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
connect(game_list, &GameList::DumpRomFSRequested, this, &GMainWindow::OnGameListDumpRomFS);
connect(game_list, &GameList::CopyTIDRequested, this, &GMainWindow::OnGameListCopyTID);
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
connect(game_list, &GameList::NavigateToGamedbEntryRequested, this,
&GMainWindow::OnGameListNavigateToGamedbEntry);
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
connect(game_list, &GameList::AddDirectory, this, &GMainWindow::OnGameListAddDirectory);
connect(game_list_placeholder, &GameListPlaceholder::AddDirectory, this,
&GMainWindow::OnGameListAddDirectory);
connect(game_list, &GameList::ShowList, this, &GMainWindow::OnGameListShowList);
qt: Add Properties menu to game list right-click
2018-12-04 18:34:46 +00:00
connect(game_list, &GameList::OpenPerGameGeneralRequested, this,
&GMainWindow::OnGameListOpenPerGameProperties);
Basic QT window
2014-04-01 02:26:50 +00:00
qt: Migrate to Qt 5 signal/slot connection syntax where applicable
2018-01-19 01:03:13 +00:00
connect(this, &GMainWindow::EmulationStarting, render_window,
&GRenderWindow::OnEmulationStarting);
connect(this, &GMainWindow::EmulationStopping, render_window,
&GRenderWindow::OnEmulationStopping);
Add performance statistics to status bar
2017-02-19 22:34:47 +00:00
connect(&status_bar_update_timer, &QTimer::timeout, this, &GMainWindow::UpdateStatusBar);
Basic QT window
2014-04-01 02:26:50 +00:00
}
Qt: Reorganize connection of menu events
2017-02-18 10:26:57 +00:00
void GMainWindow::ConnectMenuEvents() {
// File
connect(ui.action_Load_File, &QAction::triggered, this, &GMainWindow::OnMenuLoadFile);
Add 'Load Folder' menu option
2018-06-14 16:27:29 +00:00
connect(ui.action_Load_Folder, &QAction::triggered, this, &GMainWindow::OnMenuLoadFolder);
qt: Add 'Install to NAND' option to menu Prompts for title type on NCA files.
2018-08-10 01:33:13 +00:00
connect(ui.action_Install_File_NAND, &QAction::triggered, this,
&GMainWindow::OnMenuInstallToNAND);
Qt: Move some connections from .ui file to code
2017-02-18 10:30:29 +00:00
connect(ui.action_Exit, &QAction::triggered, this, &QMainWindow::close);
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
connect(ui.action_Load_Amiibo, &QAction::triggered, this, &GMainWindow::OnLoadAmiibo);
Qt: Reorganize connection of menu events
2017-02-18 10:26:57 +00:00
// Emulation
connect(ui.action_Start, &QAction::triggered, this, &GMainWindow::OnStartGame);
connect(ui.action_Pause, &QAction::triggered, this, &GMainWindow::OnPauseGame);
connect(ui.action_Stop, &QAction::triggered, this, &GMainWindow::OnStopGame);
Port web_service from Citra
2018-09-16 18:05:51 +00:00
connect(ui.action_Report_Compatibility, &QAction::triggered, this,
&GMainWindow::OnMenuReportCompatibility);
Correct function name (2/2)
2020-06-21 16:10:23 +00:00
connect(ui.action_Open_Mods_Page, &QAction::triggered, this, &GMainWindow::OnOpenModsPage);
Clang-format again
2020-06-25 21:44:41 +00:00
connect(ui.action_Open_Quickstart_Guide, &QAction::triggered, this,
Update function name again
2020-06-26 16:51:12 +00:00
&GMainWindow::OnOpenQuickstartGuide);
Update FAQ function name (2/2)
2020-06-27 00:14:29 +00:00
connect(ui.action_Open_FAQ, &QAction::triggered, this, &GMainWindow::OnOpenFAQ);
Port #3902 from Citra: "Add restart hotkey & menu option"
2018-08-21 11:24:55 +00:00
connect(ui.action_Restart, &QAction::triggered, this, [this] { BootGame(QString(game_path)); });
Qt: Reorganize connection of menu events
2017-02-18 10:26:57 +00:00
connect(ui.action_Configure, &QAction::triggered, this, &GMainWindow::OnConfigure);
// View
connect(ui.action_Single_Window_Mode, &QAction::triggered, this,
&GMainWindow::ToggleWindowMode);
Qt: Move some connections from .ui file to code
2017-02-18 10:30:29 +00:00
connect(ui.action_Display_Dock_Widget_Headers, &QAction::triggered, this,
&GMainWindow::OnDisplayTitleBars);
citra-qt: game list search function (#2673) * citra-qt: game list search function * Empty search field during game list refresh * Code improvements * Code formatting * Autofocus search field * JayFoxRox's recommendations * lioncash's review
2017-04-30 02:04:39 +00:00
connect(ui.action_Show_Filter_Bar, &QAction::triggered, this, &GMainWindow::OnToggleFilterBar);
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
connect(ui.action_Show_Status_Bar, &QAction::triggered, statusBar(), &QStatusBar::setVisible);
frontend: Set minimum window size to 640x360 instead of 1280x720 (#3413)
2020-05-15 20:22:27 +00:00
connect(ui.action_Reset_Window_Size, &QAction::triggered, this, &GMainWindow::ResetWindowSize);
Implement "About" dialog
2018-01-14 18:15:45 +00:00
Merge citra-emu PR#3001 by Styleoshin(citra-qt : Adding fullscreen mode)
2018-01-16 14:50:33 +00:00
// Fullscreen
connect(ui.action_Fullscreen, &QAction::triggered, this, &GMainWindow::ToggleFullscreen);
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
// Movie
connect(ui.action_Capture_Screenshot, &QAction::triggered, this,
&GMainWindow::OnCaptureScreenshot);
Implement "About" dialog
2018-01-14 18:15:45 +00:00
// Help
qt: Add help option to open yuzu folder Opens a new file manager window at the UserDir.
2018-11-02 02:05:44 +00:00
connect(ui.action_Open_yuzu_Folder, &QAction::triggered, this, &GMainWindow::OnOpenYuzuFolder);
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
connect(ui.action_Rederive, &QAction::triggered, this,
partition_data_manager: Rename system files for hekate x
2018-09-29 15:48:51 +00:00
std::bind(&GMainWindow::OnReinitializeKeys, this, ReinitializeKeyBehavior::Warning));
Implement "About" dialog
2018-01-14 18:15:45 +00:00
connect(ui.action_About, &QAction::triggered, this, &GMainWindow::OnAbout);
Qt: Reorganize connection of menu events
2017-02-18 10:26:57 +00:00
}
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
void GMainWindow::OnDisplayTitleBars(bool show) {
citra-qt: Add option to hide dock widget title bars
2015-01-06 15:09:30 +00:00
QList<QDockWidget*> widgets = findChildren<QDockWidget*>();
if (show) {
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
for (QDockWidget* widget : widgets) {
citra-qt: Add option to hide dock widget title bars
2015-01-06 15:09:30 +00:00
QWidget* old = widget->titleBarWidget();
widget->setTitleBarWidget(nullptr);
if (old != nullptr)
delete old;
}
} else {
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
for (QDockWidget* widget : widgets) {
citra-qt: Add option to hide dock widget title bars
2015-01-06 15:09:30 +00:00
QWidget* old = widget->titleBarWidget();
widget->setTitleBarWidget(new QWidget());
if (old != nullptr)
delete old;
}
}
}
Fix to Windows sleep issues Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-03 21:00:34 +00:00
void GMainWindow::PreventOSSleep() {
#ifdef _WIN32
SetThreadExecutionState(ES_CONTINUOUS | ES_SYSTEM_REQUIRED | ES_DISPLAY_REQUIRED);
#endif
}
void GMainWindow::AllowOSSleep() {
#ifdef _WIN32
SetThreadExecutionState(ES_CONTINUOUS);
#endif
}
Qt: Remove unnecessary std::string usage
2017-02-17 06:32:22 +00:00
bool GMainWindow::LoadROM(const QString& filename) {
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
// Shutdown previous session if the emu thread is still active...
if (emu_thread != nullptr)
ShutdownGame();
yuzu: Implement Vulkan frontend Adds a Qt and SDL2 frontend for Vulkan. It also finishes the missing bits on Vulkan initialization.
2020-01-21 19:40:53 +00:00
if (!render_window->InitRenderTarget()) {
qt: add check for GL extension support
2018-05-30 20:38:22 +00:00
return false;
}
Address clang-format issues.
2016-12-17 06:20:47 +00:00
Core::System& system{Core::System::GetInstance()};
core: Port core to VfsFilesystem for file access
2018-08-03 15:51:48 +00:00
system.SetFilesystem(vfs);
Improve error report from Init() functions Add error popup when citra initialization failed
2016-01-07 19:33:54 +00:00
main: Switch to AppletManager for frontend
2019-03-11 23:39:48 +00:00
system.SetAppletFrontendSet({
general_frontend: Add documentation for parental controls and ecommerce applets
2019-06-06 22:40:59 +00:00
nullptr, // Parental Controls
std::make_unique<QtErrorDisplay>(*this), //
nullptr, // Photo Viewer
std::make_unique<QtProfileSelector>(*this), //
std::make_unique<QtSoftwareKeyboard>(*this), //
std::make_unique<QtWebBrowser>(*this), //
nullptr, // E-Commerce
main: Switch to AppletManager for frontend
2019-03-11 23:39:48 +00:00
});
qt/main: Register Qt Software Keyboard frontend with AM Allows using Qt provider over default.
2018-11-10 01:38:11 +00:00
General: Setup yuzu threads' microprofile, naming and registry.
2020-02-25 15:12:46 +00:00
system.RegisterHostThread();
video_core: Make global EmuWindow instance part of the base renderer class Makes the global a member of the RendererBase class. We also change this to be a reference. Passing any form of null pointer to these functions is incorrect entirely, especially given the code itself assumes that the pointer would always be in a valid state. This also makes it easier to follow the lifecycle of instances being used, as we explicitly interact the renderer with the rasterizer, rather than it just operating on a global pointer.
2018-08-02 00:59:42 +00:00
const Core::System::ResultStatus result{system.Load(*render_window, filename.toStdString())};
More Qt changes for debugger
2014-04-04 01:24:07 +00:00
main: Only show DRD deprecation warning once
2018-09-04 18:44:40 +00:00
const auto drd_callout =
(UISettings::values.callout_flags & static_cast<u32>(CalloutFlag::DRDDeprecation)) == 0;
if (result == Core::System::ResultStatus::Success &&
system.GetAppLoader().GetFileType() == Loader::FileType::DeconstructedRomDirectory &&
drd_callout) {
UISettings::values.callout_flags |= static_cast<u32>(CalloutFlag::DRDDeprecation);
qt: Add deprecation warnings for DRD format
2018-08-30 20:59:49 +00:00
QMessageBox::warning(
this, tr("Warning Outdated Game Format"),
tr("You are using the deconstructed ROM directory format for this game, which is an "
"outdated format that has been superseded by others such as NCA, NAX, XCI, or "
main: Only show DRD deprecation warning once
2018-09-04 18:44:40 +00:00
"NSP. Deconstructed ROM directories lack icons, metadata, and update "
"support.<br><br>For an explanation of the various Switch formats yuzu supports, <a "
qt: Add deprecation warnings for DRD format
2018-08-30 20:59:49 +00:00
"href='https://yuzu-emu.org/wiki/overview-of-switch-game-formats'>check out our "
main: Only show DRD deprecation warning once
2018-09-04 18:44:40 +00:00
"wiki</a>. This message will not be shown again."));
qt: Add deprecation warnings for DRD format
2018-08-30 20:59:49 +00:00
}
core: Consolidate top-level system state into a singleton.
2016-11-05 03:14:38 +00:00
if (result != Core::System::ResultStatus::Success) {
switch (result) {
case Core::System::ResultStatus::ErrorGetLoader:
Rename logging macro back to LOG_*
2018-07-02 16:13:26 +00:00
LOG_CRITICAL(Frontend, "Failed to obtain loader for {}!", filename.toStdString());
core: Consolidate top-level system state into a singleton.
2016-11-05 03:14:38 +00:00
QMessageBox::critical(this, tr("Error while loading ROM!"),
Address clang-format issues.
2016-12-17 06:20:47 +00:00
tr("The ROM format is not supported."));
core: Consolidate top-level system state into a singleton.
2016-11-05 03:14:38 +00:00
break;
Made some changes from review comments: - Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review). - Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore. - Made dialog messages more clear. - Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic. - Cleaned up some other stuff.
2017-03-09 01:21:31 +00:00
case Core::System::ResultStatus::ErrorVideoCore:
QMessageBox::critical(
video_core: Eliminate the g_renderer global variable We move the initialization of the renderer to the core class, while keeping the creation of it and any other specifics in video_core. This way we can ensure that the renderer is initialized and doesn't give unfettered access to the renderer. This also makes dependencies on types more explicit. For example, the GPU class doesn't need to depend on the existence of a renderer, it only needs to care about whether or not it has a rasterizer, but since it was accessing the global variable, it was also making the renderer a part of its dependency chain. By adjusting the interface, we can get rid of this dependency.
2018-08-03 16:55:58 +00:00
this, tr("An error occurred initializing the video core."),
Minor cleanup
2018-01-13 23:49:16 +00:00
tr("yuzu has encountered an error while running the video core, please see the "
Made some changes from review comments: - Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review). - Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore. - Made dialog messages more clear. - Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic. - Cleaned up some other stuff.
2017-03-09 01:21:31 +00:00
"log for more details."
"For more information on accessing the log, please see the following page: "
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How "
"to "
"Upload the Log File</a>."
"Ensure that you have the latest graphics drivers for your GPU."));
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
break;
Display errors in GUI when loading ROM failed
2016-01-07 17:36:10 +00:00
default:
loader: Add more descriptive errors Full list of new errors and descriptions in core/loader/loader.h
2018-08-10 01:06:44 +00:00
if (static_cast<u32>(result) >
static_cast<u32>(Core::System::ResultStatus::ErrorLoader)) {
const u16 loader_id = static_cast<u16>(Core::System::ResultStatus::ErrorLoader);
const u16 error_id = static_cast<u16>(result) - loader_id;
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
const std::string error_code = fmt::format("({:04X}-{:04X})", loader_id, error_id);
LOG_CRITICAL(Frontend, "Failed to load ROM! {}", error_code);
loader: Add more descriptive errors Full list of new errors and descriptions in core/loader/loader.h
2018-08-10 01:06:44 +00:00
QMessageBox::critical(
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
this,
tr("Error while loading ROM! ").append(QString::fromStdString(error_code)),
loader: Add more descriptive errors Full list of new errors and descriptions in core/loader/loader.h
2018-08-10 01:06:44 +00:00
QString::fromStdString(fmt::format(
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
"{}<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the "
"yuzu quickstart guide</a> to redump your files.<br>You can refer "
"to the yuzu wiki</a> or the yuzu Discord</a> for help.",
static_cast<Loader::ResultStatus>(error_id))));
loader: Add more descriptive errors Full list of new errors and descriptions in core/loader/loader.h
2018-08-10 01:06:44 +00:00
} else {
QMessageBox::critical(
this, tr("Error while loading ROM!"),
tr("An unknown error occurred. Please see the log for more details."));
}
Display errors in GUI when loading ROM failed
2016-01-07 17:36:10 +00:00
break;
}
Improve error report from Init() functions Add error popup when citra initialization failed
2016-01-07 19:33:54 +00:00
return false;
More Qt changes for debugger
2014-04-04 01:24:07 +00:00
}
Port #4056 from Citra: "Add Clear Recent Files menu action"
2018-08-21 11:12:45 +00:00
game_path = filename;
yuzu: Remove usage of the global telemetry accessor In these cases the system object is nearby, and in the other, the long-form of accessing the telemetry instance is already used, so we can get rid of the use of the global accessor.
2019-03-02 20:20:49 +00:00
system.TelemetrySession().AddField(Telemetry::FieldType::App, "Frontend", "Qt");
Improve error report from Init() functions Add error popup when citra initialization failed
2016-01-07 19:33:54 +00:00
return true;
}
qt: Add setting to prompt for user on game boot Using the QtProfileSelectorDialog, this implementation is trivial. This mimics the real switch behavior of asking which user on every game boot, but it is default disabled as that might get inconvenient.
2018-12-25 15:42:02 +00:00
void GMainWindow::SelectAndSetCurrentUser() {
QtProfileSelectionDialog dialog(this);
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
dialog.setWindowModality(Qt::WindowModal);
profile_select: Remove unnecessary GetStatus() member function This behavior is already provided by the built-in exec() function. We just need to check the return value of it.
2019-05-29 04:34:42 +00:00
if (dialog.exec() == QDialog::Rejected) {
return;
qt: Add setting to prompt for user on game boot Using the QtProfileSelectorDialog, this implementation is trivial. This mimics the real switch behavior of asking which user on every game boot, but it is default disabled as that might get inconvenient.
2018-12-25 15:42:02 +00:00
}
profile_select: Remove unnecessary GetStatus() member function This behavior is already provided by the built-in exec() function. We just need to check the return value of it.
2019-05-29 04:34:42 +00:00
Settings::values.current_user = dialog.GetIndex();
qt: Add setting to prompt for user on game boot Using the QtProfileSelectorDialog, this implementation is trivial. This mimics the real switch behavior of asking which user on every game boot, but it is default disabled as that might get inconvenient.
2018-12-25 15:42:02 +00:00
}
Qt: Remove unnecessary std::string usage
2017-02-17 06:32:22 +00:00
void GMainWindow::BootGame(const QString& filename) {
Rename logging macro back to LOG_*
2018-07-02 16:13:26 +00:00
LOG_INFO(Frontend, "yuzu starting...");
Register ROM started through the gamelist in the list of ROM recently started
2016-03-06 10:22:45 +00:00
StoreRecentFile(filename); // Put the filename on top of the list
Improve error report from Init() functions Add error popup when citra initialization failed
2016-01-07 19:33:54 +00:00
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
u64 title_id{0};
const auto v_file = Core::GetGameFileFromPath(vfs, filename.toUtf8().constData());
const auto loader = Loader::GetLoader(v_file);
if (!(loader == nullptr || loader->ReadProgramId(title_id) != Loader::ResultStatus::Success)) {
// Load per game settings
Config per_game_config(fmt::format("{:016X}.ini", title_id), false);
}
Settings::LogSettings();
qt: Add setting to prompt for user on game boot Using the QtProfileSelectorDialog, this implementation is trivial. This mimics the real switch behavior of asking which user on every game boot, but it is default disabled as that might get inconvenient.
2018-12-25 15:42:02 +00:00
if (UISettings::values.select_user_on_boot) {
SelectAndSetCurrentUser();
}
Improve error report from Init() functions Add error popup when citra initialization failed
2016-01-07 19:33:54 +00:00
Kernel/Loader: Grab the system mode from the NCCH ExHeader. 3dsx and elf files default to system mode 2 (96MB allocated to the application). This allows Home Menu to boot without modifications. Closes #1849
2016-11-20 01:40:04 +00:00
if (!LoadROM(filename))
Improve error report from Init() functions Add error popup when citra initialization failed
2016-01-07 19:33:54 +00:00
return;
Qt: Use signals for emu_thread start/stop and fix disasm widget.
2015-04-29 04:01:41 +00:00
// Create and start the emulation thread
Frontend/GPU: Refactor context management Changes the GraphicsContext to be managed by the GPU core. This eliminates the need for the frontends to fool around with tricky MakeCurrent/DoneCurrent calls that are dependent on the settings (such as async gpu option). This also refactors out the need to use QWidget::fromWindowContainer as that caused issues with focus and input handling. Now we use a regular QWidget and just access the native windowHandle() directly. Another change is removing the debug tool setting in FrameMailbox. Instead of trying to block the frontend until a new frame is ready, the core will now take over presentation and draw directly to the window if the renderer detects that its hooked by NSight or RenderDoc Lastly, since it was in the way, I removed ScopeAcquireWindowContext and replaced it with a simple subclass in GraphicsContext that achieves the same result
2020-03-25 02:58:49 +00:00
emu_thread = std::make_unique<EmuThread>();
Qt: Fixed a bug in shutdown procedure, various cleanups.
2015-04-30 23:46:50 +00:00
emit EmulationStarting(emu_thread.get());
Qt: Move EmuThread ownership from render window to main window.
2015-04-16 22:35:09 +00:00
emu_thread->start();
Re-enable toggling window mode.
2014-04-22 03:15:17 +00:00
qt: Migrate to Qt 5 signal/slot connection syntax where applicable
2018-01-19 01:03:13 +00:00
connect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
// BlockingQueuedConnection is important here, it makes sure we've finished refreshing our views
// before the CPU continues
qt: Migrate to Qt 5 signal/slot connection syntax where applicable
2018-01-19 01:03:13 +00:00
connect(emu_thread.get(), &EmuThread::DebugModeEntered, waitTreeWidget,
&WaitTreeWidget::OnDebugModeEntered, Qt::BlockingQueuedConnection);
connect(emu_thread.get(), &EmuThread::DebugModeLeft, waitTreeWidget,
&WaitTreeWidget::OnDebugModeLeft, Qt::BlockingQueuedConnection);
Qt: Use signals for emu_thread start/stop and fix disasm widget.
2015-04-29 04:01:41 +00:00
gl_shader_cache: Link loading screen with disk shader cache load
2019-01-21 19:38:23 +00:00
connect(emu_thread.get(), &EmuThread::LoadProgress, loading_screen,
&LoadingScreen::OnLoadProgress, Qt::QueuedConnection);
Qt: Use signals for emu_thread start/stop and fix disasm widget.
2015-04-29 04:01:41 +00:00
// Update the GUI
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
UpdateStatusButtons();
Initial implementation of a game list
2015-09-01 04:35:33 +00:00
if (ui.action_Single_Window_Mode->isChecked()) {
game_list->hide();
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
game_list_placeholder->hide();
Initial implementation of a game list
2015-09-01 04:35:33 +00:00
}
Qt: Increase status bar update interval to 2 seconds
2017-02-21 00:36:44 +00:00
status_bar_update_timer.start(2000);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
async_status_button->setDisabled(true);
GUI: Make multicore only work with Async and add GUI for multicore.
2020-03-16 01:34:22 +00:00
multicore_status_button->setDisabled(true);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
renderer_status_button->setDisabled(true);
Add performance statistics to status bar
2017-02-19 22:34:47 +00:00
yuzu: Option to hide mouse on inactivity Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2020-04-11 02:22:50 +00:00
if (UISettings::values.hide_mouse) {
mouse_hide_timer.start();
setMouseTracking(true);
ui.centralwidget->setMouseTracking(true);
}
qt: Add filename and title id to window title while running
2018-08-23 18:12:56 +00:00
std::string title_name;
Add game versio to title bar
2020-06-08 21:58:04 +00:00
std::string title_version;
qt: Add filename and title id to window title while running
2018-08-23 18:12:56 +00:00
const auto res = Core::System::GetInstance().GetGameName(title_name);
patch_manager: Centralize Control-type NCA parsing
2018-09-03 22:57:52 +00:00
Add game versio to title bar
2020-06-08 21:58:04 +00:00
const auto metadata = FileSys::PatchManager(title_id).GetControlMetadata();
if (metadata.first != nullptr) {
title_version = metadata.first->GetVersionString();
title_name = metadata.first->GetApplicationName();
patch_manager: Centralize Control-type NCA parsing
2018-09-03 22:57:52 +00:00
}
Add game versio to title bar
2020-06-08 21:58:04 +00:00
if (res != Loader::ResultStatus::Success || title_name.empty()) {
title_name = FileUtil::GetFilename(filename.toStdString());
}
LOG_INFO(Frontend, "Booting game: {:016X} | {} | {}", title_id, title_name, title_version);
UpdateWindowTitle(title_name, title_version);
qt: Add filename and title id to window title while running
2018-08-23 18:12:56 +00:00
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
loading_screen->Prepare(Core::System::GetInstance().GetAppLoader());
loading_screen->show();
Qt: Use signals for emu_thread start/stop and fix disasm widget.
2015-04-29 04:01:41 +00:00
Don't show render window until a game is started
2015-09-01 01:30:06 +00:00
emulation_running = true;
Merge citra-emu PR#3159 by FearlessTobi(citra-qt : Fix a bug in our fullscreen implementation)
2018-01-16 14:59:30 +00:00
if (ui.action_Fullscreen->isChecked()) {
ShowFullscreen();
}
Qt: Auto-start game when selected, play game that's passed via argv[1]. Also moves system initialization to when the game is booted.
2014-10-31 05:44:51 +00:00
OnStartGame();
Basic QT window
2014-04-01 02:26:50 +00:00
}
Qt: Fix loading a new game without stopping emulation.
2015-04-28 03:13:57 +00:00
void GMainWindow::ShutdownGame() {
yuzu: fix the stuck in fullscreen mode bug Co-Authored-By: Valentin Vanelslande <vvanelslandedev@gmail.com>
2020-03-28 01:31:35 +00:00
if (!emulation_running) {
return;
}
if (ui.action_Fullscreen->isChecked()) {
HideFullscreen();
}
Fix to Windows sleep issues Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-03 21:00:34 +00:00
AllowOSSleep();
Port web_service from Citra
2018-09-16 18:05:51 +00:00
discord_rpc->Pause();
Qt: Fixed a bug in shutdown procedure, various cleanups.
2015-04-30 23:46:50 +00:00
emu_thread->RequestStop();
Qt: Fix loading a new game without stopping emulation.
2015-04-28 03:13:57 +00:00
Qt: Fixed a bug in shutdown procedure, various cleanups.
2015-04-30 23:46:50 +00:00
emit EmulationStopping();
Qt: Use signals for emu_thread start/stop and fix disasm widget.
2015-04-29 04:01:41 +00:00
// Wait for emulation thread to complete and delete it
emu_thread->wait();
emu_thread = nullptr;
Port web_service from Citra
2018-09-16 18:05:51 +00:00
discord_rpc->Update();
Stop emulation when render window is closed
2015-09-05 10:29:44 +00:00
// The emulation is stopped, so closing the window or not does not matter anymore
qt: Migrate to Qt 5 signal/slot connection syntax where applicable
2018-01-19 01:03:13 +00:00
disconnect(render_window, &GRenderWindow::Closed, this, &GMainWindow::OnStopGame);
Stop emulation when render window is closed
2015-09-05 10:29:44 +00:00
Qt: Restructured to remove unnecessary shutdown event and various cleanups.
2015-04-28 23:03:01 +00:00
// Update the GUI
Qt: Disable "Start" unless we are paused (it otherwise has no meaning and causes a crash).
2015-04-30 23:58:26 +00:00
ui.action_Start->setEnabled(false);
Update Start menu text to match with the real state of the emulator. Move start menu text update in ShutdownGame as adviced by neobrain
2015-07-26 14:38:51 +00:00
ui.action_Start->setText(tr("Start"));
Qt: Fix loading a new game without stopping emulation.
2015-04-28 03:13:57 +00:00
ui.action_Pause->setEnabled(false);
ui.action_Stop->setEnabled(false);
Port #3902 from Citra: "Add restart hotkey & menu option"
2018-08-21 11:24:55 +00:00
ui.action_Restart->setEnabled(false);
Port web_service from Citra
2018-09-16 18:05:51 +00:00
ui.action_Report_Compatibility->setEnabled(false);
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
ui.action_Load_Amiibo->setEnabled(false);
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
ui.action_Capture_Screenshot->setEnabled(false);
Qt: Fix loading a new game without stopping emulation.
2015-04-28 03:13:57 +00:00
render_window->hide();
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
loading_screen->hide();
loading_screen->Clear();
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
if (game_list->isEmpty())
game_list_placeholder->show();
else
game_list->show();
citra-qt: game list search function (#2673) * citra-qt: game list search function * Empty search field during game list refresh * Code improvements * Code formatting * Autofocus search field * JayFoxRox's recommendations * lioncash's review
2017-04-30 02:04:39 +00:00
game_list->setFilterFocus();
yuzu/main: Move window title updating logic to its own function For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
2019-05-09 05:41:33 +00:00
yuzu: Option to hide mouse on inactivity Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2020-04-11 02:22:50 +00:00
setMouseTracking(false);
ui.centralwidget->setMouseTracking(false);
yuzu/main: Move window title updating logic to its own function For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
2019-05-09 05:41:33 +00:00
UpdateWindowTitle();
Don't show render window until a game is started
2015-09-01 01:30:06 +00:00
Add performance statistics to status bar
2017-02-19 22:34:47 +00:00
// Disable status bar updates
status_bar_update_timer.stop();
emu_speed_label->setVisible(false);
game_fps_label->setVisible(false);
emu_frametime_label->setVisible(false);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
async_status_button->setEnabled(true);
GUI: Make multicore only work with Async and add GUI for multicore.
2020-03-16 01:34:22 +00:00
multicore_status_button->setEnabled(true);
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
#ifdef HAS_VULKAN
renderer_status_button->setEnabled(true);
#endif
Add performance statistics to status bar
2017-02-19 22:34:47 +00:00
Don't show render window until a game is started
2015-09-01 01:30:06 +00:00
emulation_running = false;
Port #4056 from Citra: "Add Clear Recent Files menu action"
2018-08-21 11:12:45 +00:00
game_path.clear();
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
// When closing the game, destroy the GLWindow to clear the context after the game is closed
render_window->ReleaseRenderTarget();
Qt: Fix loading a new game without stopping emulation.
2015-04-28 03:13:57 +00:00
}
Qt: Remove unnecessary std::string usage
2017-02-17 06:32:22 +00:00
void GMainWindow::StoreRecentFile(const QString& filename) {
UISettings::values.recent_files.prepend(filename);
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
UISettings::values.recent_files.removeDuplicates();
while (UISettings::values.recent_files.size() > max_recent_files_item) {
UISettings::values.recent_files.removeLast();
citra-qt: Trim recently used files list to size when insterting new item Even though they weren't visible in the UI, old entries would never be removed from the list and would be stored in the config file across sessions.
2015-09-08 01:00:08 +00:00
}
Improvements for MRU avoid duplicates always put the last file loaded to top of the list
2015-08-17 20:50:52 +00:00
UpdateRecentFiles();
}
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
void GMainWindow::UpdateRecentFiles() {
qt/main: Avoid sign conversions in UpdateRecentFiles() This was intermixing signed and unsigned values when they could all just be signed.
2018-08-06 18:30:04 +00:00
const int num_recent_files =
std::min(UISettings::values.recent_files.size(), max_recent_files_item);
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
qt/main: Avoid sign conversions in UpdateRecentFiles() This was intermixing signed and unsigned values when they could all just be signed.
2018-08-06 18:30:04 +00:00
for (int i = 0; i < num_recent_files; i++) {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString text = QStringLiteral("&%1. %2").arg(i + 1).arg(
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
QFileInfo(UISettings::values.recent_files[i]).fileName());
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
actions_recent_files[i]->setText(text);
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
actions_recent_files[i]->setData(UISettings::values.recent_files[i]);
actions_recent_files[i]->setToolTip(UISettings::values.recent_files[i]);
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
actions_recent_files[i]->setVisible(true);
}
for (int j = num_recent_files; j < max_recent_files_item; ++j) {
actions_recent_files[j]->setVisible(false);
}
qt/main: Collapse if statement in UpdateRecentFiles() Given the function accepts a boolean, we don't need to use an if statement here and repeat ourselves.
2018-08-06 18:28:01 +00:00
// Enable the recent files menu if the list isn't empty
ui.menu_recent_files->setEnabled(num_recent_files != 0);
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
}
Initial implementation of a game list
2015-09-01 04:35:33 +00:00
void GMainWindow::OnGameListLoadFile(QString game_path) {
Qt: Remove unnecessary std::string usage
2017-02-17 06:32:22 +00:00
BootGame(game_path);
Initial implementation of a game list
2015-09-01 04:35:33 +00:00
}
yuzu: game_list: Fix 'Open Save Data Location' for device saves.
2020-04-14 19:08:13 +00:00
void GMainWindow::OnGameListOpenFolder(GameListOpenTarget target, const std::string& game_path) {
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
std::string path;
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
QString open_target;
yuzu: game_list: Fix 'Open Save Data Location' for device saves.
2020-04-14 19:08:13 +00:00
const auto v_file = Core::GetGameFileFromPath(vfs, game_path);
const auto loader = Loader::GetLoader(v_file);
FileSys::NACP control{};
u64 program_id{};
loader->ReadControlData(control);
loader->ReadProgramId(program_id);
const bool has_user_save{control.GetDefaultNormalSaveSize() > 0};
const bool has_device_save{control.GetDeviceSaveDataSize() > 0};
ASSERT_MSG(has_user_save != has_device_save, "Game uses both user and device savedata?");
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
switch (target) {
case GameListOpenTarget::SaveData: {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
open_target = tr("Save Data");
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
const std::string nand_dir = FileUtil::GetUserPath(FileUtil::UserPath::NANDDir);
ASSERT(program_id != 0);
qt: Allow user to select emu user on open save data
2018-10-10 01:53:26 +00:00
yuzu: game_list: Fix 'Open Save Data Location' for device saves.
2020-04-14 19:08:13 +00:00
if (has_user_save) {
// User save data
const auto select_profile = [this] {
QtProfileSelectionDialog dialog(this);
dialog.setWindowFlags(Qt::Dialog | Qt::CustomizeWindowHint | Qt::WindowTitleHint |
Qt::WindowSystemMenuHint | Qt::WindowCloseButtonHint);
dialog.setWindowModality(Qt::WindowModal);
qt: Use ProfileSelectionDialog when selecting user for save data This allows us to present a much nicer UI to the user over a simple combo box and is made easy with the modular nature of the profile-selection applet frontend.
2018-12-25 15:52:43 +00:00
yuzu: game_list: Fix 'Open Save Data Location' for device saves.
2020-04-14 19:08:13 +00:00
if (dialog.exec() == QDialog::Rejected) {
return -1;
}
qt: Allow user to select emu user on open save data
2018-10-10 01:53:26 +00:00
yuzu: game_list: Fix 'Open Save Data Location' for device saves.
2020-04-14 19:08:13 +00:00
return dialog.GetIndex();
};
qt: Allow user to select emu user on open save data
2018-10-10 01:53:26 +00:00
yuzu: game_list: Fix 'Open Save Data Location' for device saves.
2020-04-14 19:08:13 +00:00
const auto index = select_profile();
if (index == -1) {
return;
}
qt: Allow user to select emu user on open save data
2018-10-10 01:53:26 +00:00
yuzu: game_list: Fix 'Open Save Data Location' for device saves.
2020-04-14 19:08:13 +00:00
Service::Account::ProfileManager manager;
const auto user_id = manager.GetUser(static_cast<std::size_t>(index));
ASSERT(user_id);
path = nand_dir + FileSys::SaveDataFactory::GetFullPath(
FileSys::SaveDataSpaceId::NandUser,
FileSys::SaveDataType::SaveData, program_id, user_id->uuid, 0);
} else {
// Device save data
path = nand_dir + FileSys::SaveDataFactory::GetFullPath(
FileSys::SaveDataSpaceId::NandUser,
FileSys::SaveDataType::SaveData, program_id, {}, 0);
}
qt: Allow user to select emu user on open save data
2018-10-10 01:53:26 +00:00
if (!FileUtil::Exists(path)) {
FileUtil::CreateFullPath(path);
FileUtil::CreateDir(path);
}
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
break;
}
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
case GameListOpenTarget::ModData: {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
open_target = tr("Mod Data");
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
const auto load_dir = FileUtil::GetUserPath(FileUtil::UserPath::LoadDir);
path = fmt::format("{}{:016X}", load_dir, program_id);
break;
}
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
default:
UNIMPLEMENTED();
}
const QString qpath = QString::fromStdString(path);
const QDir dir(qpath);
if (!dir.exists()) {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
QMessageBox::warning(this, tr("Error Opening %1 Folder").arg(open_target),
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
tr("Folder does not exist!"));
return;
}
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
LOG_INFO(Frontend, "Opening {} path for program_id={:016x}", open_target.toStdString(),
program_id);
qt/main: Port part of citra(#3411), open savedata works
2018-08-21 04:46:40 +00:00
QDesktopServices::openUrl(QUrl::fromLocalFile(qpath));
main: Open folder when open save folder location context menu is clicked
2016-12-15 09:56:32 +00:00
}
frontend: Open transferable shader cache for a selected game in the gamelist
2019-02-08 08:05:51 +00:00
void GMainWindow::OnTransferableShaderCacheOpenFile(u64 program_id) {
ASSERT(program_id != 0);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString shader_dir =
QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::ShaderDir));
Use QString instead of std::string where applicable
2019-02-08 13:18:41 +00:00
const QString tranferable_shader_cache_folder_path =
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
shader_dir + QStringLiteral("opengl") + QDir::separator() + QStringLiteral("transferable");
Use QString instead of std::string where applicable
2019-02-08 13:18:41 +00:00
const QString transferable_shader_cache_file_path =
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
tranferable_shader_cache_folder_path + QDir::separator() +
yuzu/main: Remove unnecessary string concatenation in OnTransferableShaderCacheOpenFile() We can just make the trailing portion of the string part of the formatting, getting rid of the need to make another temporary string.
2019-04-04 03:58:56 +00:00
QString::fromStdString(fmt::format("{:016X}.bin", program_id));
frontend: Open transferable shader cache for a selected game in the gamelist
2019-02-08 08:05:51 +00:00
yuzu/main: Use static variant of QFile's exists() There's no need to construct a QFile instance just to check for its existence.
2019-04-04 03:53:29 +00:00
if (!QFile::exists(transferable_shader_cache_file_path)) {
yuzu/main: Tidy up the error dialog string in OnTransferableShaderCacheOpenFile() Rather than scream that the file doesn't exist, we can clearly state what specifically doesn't exist, to avoid ambiguity, and make it easier to understand for non-primary English speakers/readers.
2019-04-04 04:06:32 +00:00
QMessageBox::warning(this, tr("Error Opening Transferable Shader Cache"),
tr("A shader cache for this title does not exist."));
frontend: Open transferable shader cache for a selected game in the gamelist
2019-02-08 08:05:51 +00:00
return;
}
// Windows supports opening a folder with selecting a specified file in explorer. On every other
// OS we just open the transferable shader cache folder without preselecting the transferable
// shader cache file for the selected game.
#if defined(Q_OS_WIN)
yuzu/main: Use QStringLiteral where applicable within OnTransferableShaderCacheOpenFile() Allows these strings to have no allocation cost when used at runtime.
2019-04-04 04:12:52 +00:00
const QString explorer = QStringLiteral("explorer");
frontend: Open transferable shader cache for a selected game in the gamelist
2019-02-08 08:05:51 +00:00
QStringList param;
Use QString instead of std::string where applicable
2019-02-08 13:18:41 +00:00
if (!QFileInfo(transferable_shader_cache_file_path).isDir()) {
yuzu/main: Use QStringLiteral where applicable within OnTransferableShaderCacheOpenFile() Allows these strings to have no allocation cost when used at runtime.
2019-04-04 04:12:52 +00:00
param << QStringLiteral("/select,");
Use QString instead of std::string where applicable
2019-02-08 13:18:41 +00:00
}
param << QDir::toNativeSeparators(transferable_shader_cache_file_path);
frontend: Open transferable shader cache for a selected game in the gamelist
2019-02-08 08:05:51 +00:00
QProcess::startDetached(explorer, param);
#else
Use QString instead of std::string where applicable
2019-02-08 13:18:41 +00:00
QDesktopServices::openUrl(QUrl::fromLocalFile(tranferable_shader_cache_folder_path));
frontend: Open transferable shader cache for a selected game in the gamelist
2019-02-08 08:05:51 +00:00
#endif
}
yuzu/main: Move functions stored into static std::function instances out of OnGameListDumpRomFS() This can cause warnings about static constructors, and is also not ideal performance-wise due to the indirection through std::function. This also keeps the behavior itself separate from the surrounding code, which can make it nicer to read, due to the size of the code.
2018-09-25 22:04:22 +00:00
static std::size_t CalculateRomFSEntrySize(const FileSys::VirtualDir& dir, bool full) {
std::size_t out = 0;
for (const auto& subdir : dir->GetSubdirectories()) {
out += 1 + CalculateRomFSEntrySize(subdir, full);
}
yuzu/main: Resolve precedence bug within CalculateRomFSEntrySize() Ternary operators have a lower precedence than arithmetic operators, so what was actually occurring here is "return (out + full) ? x : y" which most definitely isn't intended, given we calculate out recursively above. We were essentially doing a lot of work for nothing.
2018-09-25 22:06:35 +00:00
return out + (full ? dir->GetFiles().size() : 0);
yuzu/main: Move functions stored into static std::function instances out of OnGameListDumpRomFS() This can cause warnings about static constructors, and is also not ideal performance-wise due to the indirection through std::function. This also keeps the behavior itself separate from the surrounding code, which can make it nicer to read, due to the size of the code.
2018-09-25 22:04:22 +00:00
}
static bool RomFSRawCopy(QProgressDialog& dialog, const FileSys::VirtualDir& src,
const FileSys::VirtualDir& dest, std::size_t block_size, bool full) {
if (src == nullptr || dest == nullptr || !src->IsReadable() || !dest->IsWritable())
return false;
if (dialog.wasCanceled())
return false;
if (full) {
for (const auto& file : src->GetFiles()) {
const auto out = VfsDirectoryCreateFileWrapper(dest, file->GetName());
if (!FileSys::VfsRawCopy(file, out, block_size))
return false;
dialog.setValue(dialog.value() + 1);
if (dialog.wasCanceled())
return false;
}
}
for (const auto& dir : src->GetSubdirectories()) {
const auto out = dest->CreateSubdirectory(dir->GetName());
if (!RomFSRawCopy(dialog, dir, out, block_size, full))
return false;
dialog.setValue(dialog.value() + 1);
if (dialog.wasCanceled())
return false;
}
return true;
}
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
void GMainWindow::OnGameListDumpRomFS(u64 program_id, const std::string& game_path) {
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
const auto failed = [this] {
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
QMessageBox::warning(this, tr("RomFS Extraction Failed!"),
tr("There was an error copying the RomFS files or the user "
"cancelled the operation."));
};
const auto loader = Loader::GetLoader(vfs->OpenFile(game_path, FileSys::Mode::Read));
if (loader == nullptr) {
failed();
return;
}
FileSys::VirtualFile file;
if (loader->ReadRomFS(file) != Loader::ResultStatus::Success) {
failed();
return;
}
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
const auto& installed = Core::System::GetInstance().GetContentProvider();
filesystem: De-globalize registered_cache_union We can just return a new instance of this when it's requested. This only ever holds pointers to the existing registed caches, so it's not a large object. Plus, this also gets rid of the need to keep around a separate member function just to properly clear out the union. Gets rid of one of five globals in the filesystem code.
2018-12-02 01:32:38 +00:00
const auto romfs_title_id = SelectRomFSDumpTarget(installed, program_id);
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
if (!romfs_title_id) {
failed();
return;
}
const auto path = fmt::format(
"{}{:016X}/romfs", FileUtil::GetUserPath(FileUtil::UserPath::DumpDir), *romfs_title_id);
FileSys::VirtualFile romfs;
if (*romfs_title_id == program_id) {
Update src/yuzu/main.cpp with missing const Co-Authored-By: Mat M. <mathew1800@gmail.com>
2020-04-23 12:10:06 +00:00
const u64 ivfc_offset = loader->ReadRomFSIVFCOffset();
Dump RomFS command to include Updates Patch the RomFS with the selected updates before dumping. Previously the resulting RomFS only contained data from the original title. To dump the RomFS without updates the user can disable the update under Properties before choosing Dump RomFS.
2020-04-23 12:05:50 +00:00
FileSys::PatchManager pm{program_id};
romfs = pm.PatchRomFS(file, ivfc_offset, FileSys::ContentRecordType::Program);
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
} else {
filesystem: De-globalize registered_cache_union We can just return a new instance of this when it's requested. This only ever holds pointers to the existing registed caches, so it's not a large object. Plus, this also gets rid of the need to keep around a separate member function just to properly clear out the union. Gets rid of one of five globals in the filesystem code.
2018-12-02 01:32:38 +00:00
romfs = installed.GetEntry(*romfs_title_id, FileSys::ContentRecordType::Data)->GetRomFS();
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
}
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
fsmitm: Cleanup and modernize fsmitm port
2018-09-24 01:50:16 +00:00
const auto extracted = FileSys::ExtractRomFS(romfs, FileSys::RomFSExtractionType::Full);
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
if (extracted == nullptr) {
failed();
return;
}
const auto out = VfsFilesystemCreateDirectoryWrapper(vfs, path, FileSys::Mode::ReadWrite);
if (out == nullptr) {
failed();
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
vfs->DeleteDirectory(path);
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
return;
}
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
bool ok = false;
const QStringList selections{tr("Full"), tr("Skeleton")};
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
const auto res = QInputDialog::getItem(
this, tr("Select RomFS Dump Mode"),
tr("Please select the how you would like the RomFS dumped.<br>Full will copy all of the "
"files into the new directory while <br>skeleton will only create the directory "
"structure."),
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
selections, 0, false, &ok);
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
if (!ok) {
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
failed();
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
vfs->DeleteDirectory(path);
return;
}
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const auto full = res == selections.constFirst();
yuzu/main: Move functions stored into static std::function instances out of OnGameListDumpRomFS() This can cause warnings about static constructors, and is also not ideal performance-wise due to the indirection through std::function. This also keeps the behavior itself separate from the surrounding code, which can make it nicer to read, due to the size of the code.
2018-09-25 22:04:22 +00:00
const auto entry_size = CalculateRomFSEntrySize(extracted, full);
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
yuzu/main: Fix compiler warning
2018-11-06 14:22:24 +00:00
QProgressDialog progress(tr("Extracting RomFS..."), tr("Cancel"), 0,
static_cast<s32>(entry_size), this);
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
progress.setWindowModality(Qt::WindowModal);
progress.setMinimumDuration(100);
yuzu/main: Move functions stored into static std::function instances out of OnGameListDumpRomFS() This can cause warnings about static constructors, and is also not ideal performance-wise due to the indirection through std::function. This also keeps the behavior itself separate from the surrounding code, which can make it nicer to read, due to the size of the code.
2018-09-25 22:04:22 +00:00
if (RomFSRawCopy(progress, extracted, out, 0x400000, full)) {
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
progress.close();
QMessageBox::information(this, tr("RomFS Extraction Succeeded!"),
tr("The operation completed successfully."));
QDesktopServices::openUrl(QUrl::fromLocalFile(QString::fromStdString(path)));
} else {
progress.close();
failed();
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
vfs->DeleteDirectory(path);
qt: Add UI elements for LayeredFS and related tools
2018-09-20 02:09:23 +00:00
}
}
void GMainWindow::OnGameListCopyTID(u64 program_id) {
QClipboard* clipboard = QGuiApplication::clipboard();
clipboard->setText(QString::fromStdString(fmt::format("{:016X}", program_id)));
}
yuzu: Move compatibility list specifics to their own source files Lets us keep the generic portions of the compatibility list code together, and allows us to introduce a type alias that makes it so we don't need to type out a very long type declaration anymore, making the immediate readability of some code better.
2018-09-09 23:09:37 +00:00
void GMainWindow::OnGameListNavigateToGamedbEntry(u64 program_id,
game_list: Make CompatibilityList parameter of NavigateToGamedbEntryRequested() a const reference The compatibility list isn't modified within any of the slots connected to this signal, so we can make it const to enforce immutability.
2018-09-09 23:35:05 +00:00
const CompatibilityList& compatibility_list) {
yuzu: Move compatibility list specifics to their own source files Lets us keep the generic portions of the compatibility list code together, and allows us to introduce a type alias that makes it so we don't need to type out a very long type declaration anymore, making the immediate readability of some code better.
2018-09-09 23:09:37 +00:00
const auto it = FindMatchingCompatibilityEntry(compatibility_list, program_id);
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
QString directory;
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
if (it != compatibility_list.end()) {
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
directory = it->second.second;
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
QDesktopServices::openUrl(QUrl(QStringLiteral("https://yuzu-emu.org/game/") + directory));
Show game compatibility within yuzu
2018-08-29 13:42:53 +00:00
}
Address trivial review comments
2019-05-03 17:21:57 +00:00
void GMainWindow::OnGameListOpenDirectory(const QString& directory) {
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
QString path;
Separate UserNand and Sdmc directories
2019-05-05 01:07:09 +00:00
if (directory == QStringLiteral("SDMC")) {
path = QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::SDMCDir) +
"Nintendo/Contents/registered");
} else if (directory == QStringLiteral("UserNAND")) {
Address trivial review comments
2019-05-03 17:21:57 +00:00
path = QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
Address more trivial review comments
2019-05-04 23:52:17 +00:00
"user/Contents/registered");
Separate UserNand and Sdmc directories
2019-05-05 01:07:09 +00:00
} else if (directory == QStringLiteral("SysNAND")) {
Address more trivial review comments
2019-05-04 23:52:17 +00:00
path = QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::NANDDir) +
"system/Contents/registered");
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
} else {
path = directory;
}
if (!QFileInfo::exists(path)) {
QMessageBox::critical(this, tr("Error Opening %1").arg(path), tr("Folder does not exist!"));
return;
}
QDesktopServices::openUrl(QUrl::fromLocalFile(path));
}
void GMainWindow::OnGameListAddDirectory() {
Address trivial review comments
2019-05-03 17:21:57 +00:00
const QString dir_path = QFileDialog::getExistingDirectory(this, tr("Select Directory"));
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
if (dir_path.isEmpty())
return;
UISettings::GameDir game_dir{dir_path, false, true};
if (!UISettings::values.game_dirs.contains(game_dir)) {
UISettings::values.game_dirs.append(game_dir);
game_list->PopulateAsync(UISettings::values.game_dirs);
} else {
LOG_WARNING(Frontend, "Selected directory is already in the game list");
}
}
void GMainWindow::OnGameListShowList(bool show) {
if (emulation_running && ui.action_Single_Window_Mode->isChecked())
return;
game_list->setVisible(show);
game_list_placeholder->setVisible(!show);
};
qt: Add Properties menu to game list right-click
2018-12-04 18:34:46 +00:00
void GMainWindow::OnGameListOpenPerGameProperties(const std::string& file) {
u64 title_id{};
const auto v_file = Core::GetGameFileFromPath(vfs, file);
const auto loader = Loader::GetLoader(v_file);
if (loader == nullptr || loader->ReadProgramId(title_id) != Loader::ResultStatus::Success) {
QMessageBox::information(this, tr("Properties"),
tr("The game properties could not be loaded."));
return;
}
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
ConfigurePerGame dialog(this, title_id);
yuzu/configuration: Make function naming consistent
2019-05-26 04:39:23 +00:00
dialog.LoadFromFile(v_file);
qt: Add Properties menu to game list right-click
2018-12-04 18:34:46 +00:00
auto result = dialog.exec();
if (result == QDialog::Accepted) {
yuzu/configuration: Make function naming consistent
2019-05-26 04:39:23 +00:00
dialog.ApplyConfiguration();
qt: Add Properties menu to game list right-click
2018-12-04 18:34:46 +00:00
const auto reload = UISettings::values.is_game_list_reload_pending.exchange(false);
if (reload) {
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
game_list->PopulateAsync(UISettings::values.game_dirs);
qt: Add Properties menu to game list right-click
2018-12-04 18:34:46 +00:00
}
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
// Do not cause the global config to write local settings into the config file
Settings::RestoreGlobalState();
if (!Core::System::GetInstance().IsPoweredOn()) {
config->Save();
}
} else {
Settings::RestoreGlobalState();
qt: Add Properties menu to game list right-click
2018-12-04 18:34:46 +00:00
}
}
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
void GMainWindow::OnMenuLoadFile() {
yuzu/main: Simplify OnMenuLoadFile() We can utilize QStringList's join() function to perform all of the appending in a single function call. While we're at it, make the extension list a single translatable string and add a disambiguation comment to explain to translators what %1 actually is.
2018-10-13 14:23:50 +00:00
const QString extensions =
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
QStringLiteral("*.")
.append(GameList::supported_file_extensions.join(QStringLiteral(" *.")))
.append(QStringLiteral(" main"));
yuzu/main: Simplify OnMenuLoadFile() We can utilize QStringList's join() function to perform all of the appending in a single function call. While we're at it, make the extension list a single translatable string and add a disambiguation comment to explain to translators what %1 actually is.
2018-10-13 14:23:50 +00:00
const QString file_filter = tr("Switch Executable (%1);;All Files (*.*)",
"%1 is an identifier for the Switch executable file extensions.")
.arg(extensions);
const QString filename = QFileDialog::getOpenFileName(
this, tr("Load File"), UISettings::values.roms_path, file_filter);
if (filename.isEmpty()) {
return;
Qt: Restructured to remove unnecessary shutdown event and various cleanups.
2015-04-28 23:03:01 +00:00
}
yuzu/main: Simplify OnMenuLoadFile() We can utilize QStringList's join() function to perform all of the appending in a single function call. While we're at it, make the extension list a single translatable string and add a disambiguation comment to explain to translators what %1 actually is.
2018-10-13 14:23:50 +00:00
UISettings::values.roms_path = QFileInfo(filename).path();
BootGame(filename);
Basic QT window
2014-04-01 02:26:50 +00:00
}
Add 'Load Folder' menu option
2018-06-14 16:27:29 +00:00
void GMainWindow::OnMenuLoadFolder() {
qt: Don't show error dialog when canceling the Load Folder dialog Previously, when canceling out of the Load Folder dialog, a user would get an error dialog about the selected folder not containing a main file, however, by canceling out of the dialog, no selection was actually made.
2018-08-06 18:02:31 +00:00
const QString dir_path =
QFileDialog::getExistingDirectory(this, tr("Open Extracted ROM Directory"));
Add 'Load Folder' menu option
2018-06-14 16:27:29 +00:00
qt: Don't show error dialog when canceling the Load Folder dialog Previously, when canceling out of the Load Folder dialog, a user would get an error dialog about the selected folder not containing a main file, however, by canceling out of the dialog, no selection was actually made.
2018-08-06 18:02:31 +00:00
if (dir_path.isNull()) {
return;
}
const QDir dir{dir_path};
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QStringList matching_main = dir.entryList({QStringLiteral("main")}, QDir::Files);
Bug fixes, testing, and review changes
2018-06-14 21:25:40 +00:00
if (matching_main.size() == 1) {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
BootGame(dir.path() + QDir::separator() + matching_main[0]);
Bug fixes, testing, and review changes
2018-06-14 21:25:40 +00:00
} else {
QMessageBox::warning(this, tr("Invalid Directory Selected"),
tr("The directory you have selected does not contain a 'main' file."));
Add 'Load Folder' menu option
2018-06-14 16:27:29 +00:00
}
}
qt: Add 'Install to NAND' option to menu Prompts for title type on NCA files.
2018-08-10 01:33:13 +00:00
void GMainWindow::OnMenuInstallToNAND() {
file_sys: Comply to style guidelines
2018-08-10 03:10:32 +00:00
const QString file_filter =
qt: Add UI support for NSP files
2018-08-25 15:50:15 +00:00
tr("Installable Switch File (*.nca *.nsp *.xci);;Nintendo Content Archive "
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
"(*.nca);;Nintendo Submission Package (*.nsp);;NX Cartridge "
qt: Add 'Install to NAND' option to menu Prompts for title type on NCA files.
2018-08-10 01:33:13 +00:00
"Image (*.xci)");
qt: Use custom RawCopy with progress bar for installs
2018-08-10 19:07:06 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
QStringList filenames = QFileDialog::getOpenFileNames(
this, tr("Install Files"), UISettings::values.roms_path, file_filter);
if (filenames.isEmpty()) {
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
return;
}
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
InstallDialog installDialog(this, filenames);
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
if (installDialog.exec() == QDialog::Rejected) {
qt/main: Unindent code in OnMenuInstallToNAND() We can change this into an early-return if the filename is empty. There's no need to include all of the code within the if statement.
2018-08-16 14:37:56 +00:00
return;
}
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
const QStringList files = installDialog.GetFiles();
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
const bool overwrite_files = installDialog.ShouldOverwriteFiles();
int count = 0;
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
const int total_count = filenames.size();
QStringList new_files{}; // Newly installed files that do not yet exist in the NAND
QStringList overwritten_files{}; // Files that overwrote those existing in the NAND
QStringList existing_files{}; // Files that were not installed as they already exist in the NAND
QStringList failed_files{}; // Files that failed to install due to errors
ui.action_Install_File_NAND->setEnabled(false);
QProgressDialog install_progress(QStringLiteral(""), tr("Cancel"), 0, total_count, this);
install_progress.setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint &
~Qt::WindowMaximizeButtonHint);
install_progress.setAutoClose(false);
install_progress.setFixedWidth(installDialog.GetMinimumWidth());
install_progress.show();
for (const QString& file : files) {
install_progress.setWindowTitle(tr("%n file(s) remaining", "", total_count - count));
install_progress.setLabelText(
tr("Installing file \"%1\"...").arg(QFileInfo(file).fileName()));
QFuture<InstallResult> future;
InstallResult result;
if (file.endsWith(QStringLiteral("xci"), Qt::CaseInsensitive) ||
file.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) {
future = QtConcurrent::run([this, &file, &overwrite_files, &install_progress] {
return InstallNSPXCI(file, overwrite_files, install_progress);
});
while (!future.isFinished()) {
QCoreApplication::processEvents();
}
result = future.result();
} else {
result = InstallNCA(file, overwrite_files, install_progress);
}
switch (result) {
case InstallResult::Success:
new_files.append(QFileInfo(file).fileName());
break;
case InstallResult::Overwrite:
overwritten_files.append(QFileInfo(file).fileName());
break;
case InstallResult::AlreadyExists:
existing_files.append(QFileInfo(file).fileName());
break;
case InstallResult::Failure:
failed_files.append(QFileInfo(file).fileName());
break;
}
install_progress.setValue(++count);
std::this_thread::sleep_for(std::chrono::milliseconds(10));
}
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
install_progress.close();
const QString install_results =
(new_files.isEmpty() ? QStringLiteral("")
: tr("%n file(s) were newly installed\n", "", new_files.size())) +
(overwritten_files.isEmpty()
? QStringLiteral("")
: tr("%n file(s) were overwritten\n", "", overwritten_files.size())) +
(existing_files.isEmpty()
? QStringLiteral("")
: tr("%n file(s) already exist in NAND\n", "", existing_files.size())) +
(failed_files.isEmpty() ? QStringLiteral("")
: tr("%n file(s) failed to install\n", "", failed_files.size()));
QMessageBox::information(this, tr("Install Results"), install_results);
game_list->PopulateAsync(UISettings::values.game_dirs);
FileUtil::DeleteDirRecursively(FileUtil::GetUserPath(FileUtil::UserPath::CacheDir) + DIR_SEP +
"game_list");
ui.action_Install_File_NAND->setEnabled(true);
}
InstallResult GMainWindow::InstallNSPXCI(const QString& filename, bool overwrite_files,
QProgressDialog& install_progress) {
const auto qt_raw_copy = [this, &install_progress](const FileSys::VirtualFile& src,
const FileSys::VirtualFile& dest,
std::size_t block_size) {
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
if (src == nullptr || dest == nullptr) {
qt: Use custom RawCopy with progress bar for installs
2018-08-10 19:07:06 +00:00
return false;
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
}
if (!dest->Resize(src->GetSize())) {
qt: Use custom RawCopy with progress bar for installs
2018-08-10 19:07:06 +00:00
return false;
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
}
qt: Use custom RawCopy with progress bar for installs
2018-08-10 19:07:06 +00:00
qt/main: Get rid of compilation warnings Gets rid of truncation warnings about conversion to int. While we're at it, we can also de-hardcode the buffer size being used.
2018-08-16 14:28:03 +00:00
std::array<u8, 0x1000> buffer{};
qt: Use custom RawCopy with progress bar for installs
2018-08-10 19:07:06 +00:00
Port #4182 from Citra: "Prefix all size_t with std::"
2018-09-15 13:21:06 +00:00
for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) {
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
if (install_progress.wasCanceled()) {
qt: Use custom RawCopy with progress bar for installs
2018-08-10 19:07:06 +00:00
dest->Resize(0);
return false;
}
const auto read = src->Read(buffer.data(), buffer.size(), i);
dest->Write(buffer.data(), read, i);
}
return true;
};
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
std::shared_ptr<FileSys::NSP> nsp;
if (filename.endsWith(QStringLiteral("nsp"), Qt::CaseInsensitive)) {
nsp = std::make_shared<FileSys::NSP>(
vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read));
if (nsp->IsExtractedType()) {
return InstallResult::Failure;
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
}
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
} else {
const auto xci = std::make_shared<FileSys::XCI>(
vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read));
nsp = xci->GetSecurePartitionNSP();
}
registration: Add support for force overwrite of installed
2018-08-12 03:01:38 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
if (nsp->GetStatus() != Loader::ResultStatus::Success) {
return InstallResult::Failure;
}
const auto res =
Core::System::GetInstance().GetFileSystemController().GetUserNANDContents()->InstallEntry(
*nsp, false, qt_raw_copy);
if (res == FileSys::InstallResult::Success) {
return InstallResult::Success;
} else if (res == FileSys::InstallResult::ErrorAlreadyExists) {
if (overwrite_files) {
const auto res2 = Core::System::GetInstance()
.GetFileSystemController()
.GetUserNANDContents()
->InstallEntry(*nsp, true, qt_raw_copy);
if (res2 != FileSys::InstallResult::Success) {
return InstallResult::Failure;
}
return InstallResult::Overwrite;
} else {
return InstallResult::AlreadyExists;
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
}
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
} else {
return InstallResult::Failure;
}
}
registration: Add support for force overwrite of installed
2018-08-12 03:01:38 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
InstallResult GMainWindow::InstallNCA(const QString& filename, bool overwrite_files,
QProgressDialog& install_progress) {
const auto qt_raw_copy = [this, &install_progress](const FileSys::VirtualFile& src,
const FileSys::VirtualFile& dest,
std::size_t block_size) {
if (src == nullptr || dest == nullptr) {
return false;
}
if (!dest->Resize(src->GetSize())) {
return false;
}
registration: Add support for force overwrite of installed
2018-08-12 03:01:38 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
std::array<u8, 0x1000> buffer{};
registration: Add support for installing NSP files
2018-08-25 15:50:04 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
for (std::size_t i = 0; i < src->GetSize(); i += buffer.size()) {
if (install_progress.wasCanceled()) {
dest->Resize(0);
return false;
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
}
qt: Add 'Install to NAND' option to menu Prompts for title type on NCA files.
2018-08-10 01:33:13 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
const auto read = src->Read(buffer.data(), buffer.size(), i);
dest->Write(buffer.data(), read, i);
}
return true;
};
qt: Install System TitleTypes to System NAND Fixes an issue where installed system archive NCAs would be installed to user NAND and not recognized by games.
2018-09-27 13:19:53 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
const auto nca =
std::make_shared<FileSys::NCA>(vfs->OpenFile(filename.toStdString(), FileSys::Mode::Read));
const auto id = nca->GetStatus();
qt/main: Unindent code in OnMenuInstallToNAND() We can change this into an early-return if the filename is empty. There's no need to include all of the code within the if statement.
2018-08-16 14:37:56 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
// Game updates necessary are missing base RomFS
if (id != Loader::ResultStatus::Success &&
id != Loader::ResultStatus::ErrorMissingBKTRBaseRomFS) {
return InstallResult::Failure;
}
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
const QStringList tt_options{tr("System Application"),
tr("System Archive"),
tr("System Application Update"),
tr("Firmware Package (Type A)"),
tr("Firmware Package (Type B)"),
tr("Game"),
tr("Game Update"),
tr("Game DLC"),
tr("Delta Title")};
bool ok;
const auto item = QInputDialog::getItem(
this, tr("Select NCA Install Type..."),
tr("Please select the type of title you would like to install this NCA as:\n(In "
"most instances, the default 'Game' is fine.)"),
tt_options, 5, false, &ok);
auto index = tt_options.indexOf(item);
if (!ok || index == -1) {
QMessageBox::warning(this, tr("Failed to Install"),
tr("The title type you selected for the NCA is invalid."));
return InstallResult::Failure;
}
// If index is equal to or past Game, add the jump in TitleType.
if (index >= 5) {
index += static_cast<size_t>(FileSys::TitleType::Application) -
static_cast<size_t>(FileSys::TitleType::FirmwarePackageB);
}
FileSys::InstallResult res;
if (index >= static_cast<s32>(FileSys::TitleType::Application)) {
res = Core::System::GetInstance()
.GetFileSystemController()
.GetUserNANDContents()
->InstallEntry(*nca, static_cast<FileSys::TitleType>(index), false, qt_raw_copy);
} else {
res = Core::System::GetInstance()
.GetFileSystemController()
.GetSystemNANDContents()
->InstallEntry(*nca, static_cast<FileSys::TitleType>(index), false, qt_raw_copy);
}
Add support for batch install to NAND This adds support to batch install files to NAND
2020-04-17 03:27:38 +00:00
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
if (res == FileSys::InstallResult::Success) {
return InstallResult::Success;
} else if (res == FileSys::InstallResult::ErrorAlreadyExists) {
if (overwrite_files) {
const auto res2 =
Core::System::GetInstance()
.GetFileSystemController()
.GetUserNANDContents()
->InstallEntry(*nca, static_cast<FileSys::TitleType>(index), true, qt_raw_copy);
if (res2 != FileSys::InstallResult::Success) {
return InstallResult::Failure;
}
return InstallResult::Overwrite;
} else {
return InstallResult::AlreadyExists;
qt: Add 'Install to NAND' option to menu Prompts for title type on NCA files.
2018-08-10 01:33:13 +00:00
}
Refactor batch installing files Key issues fixed: - Progress dialog showing up as white/hanging/getting stuck/unresponsive. Key changes: - Progress dialog now shows progress as a function of all files instead of per nca within a file. - Overwrite existing files will overwrite all files in the selection.
2020-07-01 20:15:57 +00:00
} else {
return InstallResult::Failure;
qt: Add 'Install to NAND' option to menu Prompts for title type on NCA files.
2018-08-10 01:33:13 +00:00
}
}
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
void GMainWindow::OnMenuRecentFile() {
QAction* action = qobject_cast<QAction*>(sender());
assert(action);
qt/main: Better file-existence checking within OnMenuRecentFile() and UpdateUITheme() In OnMenuRecentFile() we don't need to construct a QFileInfo instance just to check if a file exists, we can just use the static member function to do that (which Qt's documentation also notes as quicker than constructing an instance). In UpdateUITheme(), we just want to try and open the file and check the success of that operation. Technically speaking, between the existence check and the open call, the file can be deleted or moved, but still appear to succeed in code. i.e. 1. Existence check -> Returns true 2. File is moved/deleted 3. Open is called, the return value of which isn't checked 4. Nonsense behavior This way we combine the existence check and the open into one.
2018-08-06 18:12:57 +00:00
const QString filename = action->data().toString();
if (QFileInfo::exists(filename)) {
Qt: Remove unnecessary std::string usage
2017-02-17 06:32:22 +00:00
BootGame(filename);
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
} else {
// Display an error message and remove the file from the list.
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
QMessageBox::information(this, tr("File not found"),
tr("File \"%1\" not found").arg(filename));
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
UISettings::values.recent_files.removeOne(filename);
Improvements for MRU avoid duplicates always put the last file loaded to top of the list
2015-08-17 20:50:52 +00:00
UpdateRecentFiles();
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
}
}
void GMainWindow::OnStartGame() {
Fix to Windows sleep issues Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-03 21:00:34 +00:00
PreventOSSleep();
Qt: Restructured to remove unnecessary shutdown event and various cleanups.
2015-04-28 23:03:01 +00:00
emu_thread->SetRunning(true);
am: Deglobalize software keyboard applet
2018-11-11 21:39:25 +00:00
qRegisterMetaType<Core::Frontend::SoftwareKeyboardParameters>(
am: Allow applets to push multiple and different channels of data
2018-11-12 01:16:38 +00:00
"Core::Frontend::SoftwareKeyboardParameters");
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
qRegisterMetaType<Core::System::ResultStatus>("Core::System::ResultStatus");
Created a whitelist of system archives to prevent false positives creating dialogs.
2017-04-13 05:18:54 +00:00
qRegisterMetaType<std::string>("std::string");
am: Allow applets to push multiple and different channels of data
2018-11-12 01:16:38 +00:00
qRegisterMetaType<std::optional<std::u16string>>("std::optional<std::u16string>");
main: Add main window integrations for QtWebBrowserApplet
2018-12-24 21:23:31 +00:00
qRegisterMetaType<std::string_view>("std::string_view");
am: Deglobalize software keyboard applet
2018-11-11 21:39:25 +00:00
qt: Migrate to Qt 5 signal/slot connection syntax where applicable
2018-01-19 01:03:13 +00:00
connect(emu_thread.get(), &EmuThread::ErrorThrown, this, &GMainWindow::OnCoreError);
More Qt changes for debugger
2014-04-04 01:24:07 +00:00
ui.action_Start->setEnabled(false);
Update Start menu text to match with the real state of the emulator. Move start menu text update in ShutdownGame as adviced by neobrain
2015-07-26 14:38:51 +00:00
ui.action_Start->setText(tr("Continue"));
More Qt changes for debugger
2014-04-04 01:24:07 +00:00
ui.action_Pause->setEnabled(true);
ui.action_Stop->setEnabled(true);
Fix two stupid errors made in #1141
2018-08-28 13:16:03 +00:00
ui.action_Restart->setEnabled(true);
Port web_service from Citra
2018-09-16 18:05:51 +00:00
ui.action_Report_Compatibility->setEnabled(true);
discord_rpc->Update();
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
ui.action_Load_Amiibo->setEnabled(true);
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
ui.action_Capture_Screenshot->setEnabled(true);
Basic QT window
2014-04-01 02:26:50 +00:00
}
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
void GMainWindow::OnPauseGame() {
Qt: Restructured to remove unnecessary shutdown event and various cleanups.
2015-04-28 23:03:01 +00:00
emu_thread->SetRunning(false);
More Qt changes for debugger
2014-04-04 01:24:07 +00:00
ui.action_Start->setEnabled(true);
ui.action_Pause->setEnabled(false);
ui.action_Stop->setEnabled(true);
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
ui.action_Capture_Screenshot->setEnabled(false);
Fix to Windows sleep issues Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-03 21:00:34 +00:00
AllowOSSleep();
Basic QT window
2014-04-01 02:26:50 +00:00
}
Qt: Create emu thread on bootup, kill it on shutdown.
2015-04-17 03:31:14 +00:00
void GMainWindow::OnStopGame() {
qt: Prompt user for confirmation if exit lock is active
2019-09-22 02:46:53 +00:00
Core::System& system{Core::System::GetInstance()};
if (system.GetExitLock() && !ConfirmForceLockedExit()) {
return;
}
Qt: Fix loading a new game without stopping emulation.
2015-04-28 03:13:57 +00:00
ShutdownGame();
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
Settings::RestoreGlobalState();
UpdateStatusButtons();
Basic QT window
2014-04-01 02:26:50 +00:00
}
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
void GMainWindow::OnLoadComplete() {
Add fade out effect to the loading screen
2019-01-21 16:20:16 +00:00
loading_screen->OnLoadComplete();
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
}
main: Add GMainWindow hooks for Error display
2019-03-11 23:45:22 +00:00
void GMainWindow::ErrorDisplayDisplayError(QString body) {
QMessageBox::critical(this, tr("Error Display"), body);
emit ErrorDisplayFinished();
}
Port web_service from Citra
2018-09-16 18:05:51 +00:00
void GMainWindow::OnMenuReportCompatibility() {
if (!Settings::values.yuzu_token.empty() && !Settings::values.yuzu_username.empty()) {
CompatDB compatdb{this};
compatdb.exec();
} else {
QMessageBox::critical(
this, tr("Missing yuzu Account"),
tr("In order to submit a game compatibility test case, you must link your yuzu "
"account.<br><br/>To link your yuzu account, go to Emulation &gt; Configuration "
"&gt; "
"Web."));
}
}
Fix typo 2: electric boogaloo
2020-06-25 21:32:43 +00:00
void GMainWindow::OpenURL(const QUrl& url) {
Add "Open Quickstart Guide" and "FAQ" buttons to the Help menu While we're at it, also refactor the function used by OnOpenModsPage to be compatible with other URLs
2020-06-25 21:02:33 +00:00
const bool open = QDesktopServices::openUrl(url);
Add a "Open Mods Page" button to the GUI
2020-06-21 04:09:28 +00:00
if (!open) {
QMessageBox::warning(this, tr("Error opening URL"),
Use QUrl (2/2)
2020-06-25 21:31:01 +00:00
tr("Unable to open the URL \"%1\".").arg(url.toString()));
Add a "Open Mods Page" button to the GUI
2020-06-21 04:09:28 +00:00
}
}
Add "Open Quickstart Guide" and "FAQ" buttons to the Help menu While we're at it, also refactor the function used by OnOpenModsPage to be compatible with other URLs
2020-06-25 21:02:33 +00:00
void GMainWindow::OnOpenModsPage() {
Use QUrl (2/2)
2020-06-25 21:31:01 +00:00
OpenURL(QUrl(QStringLiteral("https://github.com/yuzu-emu/yuzu/wiki/Switch-Mods")));
Add "Open Quickstart Guide" and "FAQ" buttons to the Help menu While we're at it, also refactor the function used by OnOpenModsPage to be compatible with other URLs
2020-06-25 21:02:33 +00:00
}
Update function name (2/2)
2020-06-26 16:50:28 +00:00
void GMainWindow::OnOpenQuickstartGuide() {
Use QUrl (2/2)
2020-06-25 21:31:01 +00:00
OpenURL(QUrl(QStringLiteral("https://yuzu-emu.org/help/quickstart/")));
Add "Open Quickstart Guide" and "FAQ" buttons to the Help menu While we're at it, also refactor the function used by OnOpenModsPage to be compatible with other URLs
2020-06-25 21:02:33 +00:00
}
Update FAQ function name (2/2)
2020-06-27 00:14:29 +00:00
void GMainWindow::OnOpenFAQ() {
Use QUrl (2/2)
2020-06-25 21:31:01 +00:00
OpenURL(QUrl(QStringLiteral("https://yuzu-emu.org/wiki/faq/")));
Add "Open Quickstart Guide" and "FAQ" buttons to the Help menu While we're at it, also refactor the function used by OnOpenModsPage to be compatible with other URLs
2020-06-25 21:02:33 +00:00
}
Merge citra-emu PR#3001 by Styleoshin(citra-qt : Adding fullscreen mode)
2018-01-16 14:50:33 +00:00
void GMainWindow::ToggleFullscreen() {
if (!emulation_running) {
return;
}
if (ui.action_Fullscreen->isChecked()) {
Merge citra-emu PR#3159 by FearlessTobi(citra-qt : Fix a bug in our fullscreen implementation)
2018-01-16 14:59:30 +00:00
ShowFullscreen();
Merge citra-emu PR#3001 by Styleoshin(citra-qt : Adding fullscreen mode)
2018-01-16 14:50:33 +00:00
} else {
Merge citra-emu PR#3159 by FearlessTobi(citra-qt : Fix a bug in our fullscreen implementation)
2018-01-16 14:59:30 +00:00
HideFullscreen();
}
}
void GMainWindow::ShowFullscreen() {
if (ui.action_Single_Window_Mode->isChecked()) {
UISettings::values.geometry = saveGeometry();
ui.menubar->hide();
statusBar()->hide();
showFullScreen();
} else {
UISettings::values.renderwindow_geometry = render_window->saveGeometry();
render_window->showFullScreen();
}
}
void GMainWindow::HideFullscreen() {
if (ui.action_Single_Window_Mode->isChecked()) {
statusBar()->setVisible(ui.action_Show_Status_Bar->isChecked());
ui.menubar->show();
showNormal();
restoreGeometry(UISettings::values.geometry);
} else {
render_window->showNormal();
render_window->restoreGeometry(UISettings::values.renderwindow_geometry);
Merge citra-emu PR#3001 by Styleoshin(citra-qt : Adding fullscreen mode)
2018-01-16 14:50:33 +00:00
}
}
Qt: Move EmuThread ownership from render window to main window.
2015-04-16 22:35:09 +00:00
void GMainWindow::ToggleWindowMode() {
if (ui.action_Single_Window_Mode->isChecked()) {
// Render in the main window...
Re-enable toggling window mode.
2014-04-22 03:15:17 +00:00
render_window->BackupGeometry();
ui.horizontalLayout->addWidget(render_window);
Set render window to also accept focus via tabbing (Qt::StrongFocus) (#5089)
2020-03-26 18:36:49 +00:00
render_window->setFocusPolicy(Qt::StrongFocus);
Don't show render window until a game is started
2015-09-01 01:30:06 +00:00
if (emulation_running) {
render_window->setVisible(true);
render_window->setFocus();
Game list: propely hide on toggling window mode Properly hides the game list upon toggling from external window mode to single window mode. Previously, both the game list and the render window would have been shown at the same time upon toggling.
2015-10-06 19:20:26 +00:00
game_list->hide();
Don't show render window until a game is started
2015-09-01 01:30:06 +00:00
}
Qt: Move EmuThread ownership from render window to main window.
2015-04-16 22:35:09 +00:00
} else {
// Render in a separate window...
ui.horizontalLayout->removeWidget(render_window);
render_window->setParent(nullptr);
render_window->setFocusPolicy(Qt::NoFocus);
Don't show render window until a game is started
2015-09-01 01:30:06 +00:00
if (emulation_running) {
render_window->setVisible(true);
render_window->RestoreGeometry();
Initial implementation of a game list
2015-09-01 04:35:33 +00:00
game_list->show();
Don't show render window until a game is started
2015-09-01 01:30:06 +00:00
}
Basic QT window
2014-04-01 02:26:50 +00:00
}
}
frontend: Set minimum window size to 640x360 instead of 1280x720 (#3413)
2020-05-15 20:22:27 +00:00
void GMainWindow::ResetWindowSize() {
const auto aspect_ratio = Layout::EmulationAspectRatio(
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
static_cast<Layout::AspectRatio>(Settings::values.aspect_ratio.GetValue()),
frontend: Set minimum window size to 640x360 instead of 1280x720 (#3413)
2020-05-15 20:22:27 +00:00
static_cast<float>(Layout::ScreenUndocked::Height) / Layout::ScreenUndocked::Width);
if (!ui.action_Single_Window_Mode->isChecked()) {
render_window->resize(Layout::ScreenUndocked::Height / aspect_ratio,
Layout::ScreenUndocked::Height);
} else {
resize(Layout::ScreenUndocked::Height / aspect_ratio,
Layout::ScreenUndocked::Height + menuBar()->height() +
(ui.action_Show_Status_Bar->isChecked() ? statusBar()->height() : 0));
}
}
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
void GMainWindow::OnConfigure() {
yuzu/configuration: Make function naming consistent
2019-05-26 04:39:23 +00:00
const auto old_theme = UISettings::values.theme;
Port web_service from Citra
2018-09-16 18:05:51 +00:00
const bool old_discord_presence = UISettings::values.enable_discord_presence;
game_list: Only reload game list after relevant settings changed Prevents unnecessary reloads on every configuration operation.
2018-11-04 00:38:39 +00:00
yuzu/configuration: Make function naming consistent
2019-05-26 04:39:23 +00:00
ConfigureDialog configure_dialog(this, hotkey_registry);
const auto result = configure_dialog.exec();
if (result != QDialog::Accepted) {
return;
}
game_list: Only reload game list after relevant settings changed Prevents unnecessary reloads on every configuration operation.
2018-11-04 00:38:39 +00:00
yuzu/configuration: Make function naming consistent
2019-05-26 04:39:23 +00:00
configure_dialog.ApplyConfiguration();
InitializeHotkeys();
if (UISettings::values.theme != old_theme) {
UpdateUITheme();
}
if (UISettings::values.enable_discord_presence != old_discord_presence) {
SetDiscordEnabled(UISettings::values.enable_discord_presence);
}
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
emit UpdateThemedIcons();
yuzu/configuration: Make function naming consistent
2019-05-26 04:39:23 +00:00
const auto reload = UISettings::values.is_game_list_reload_pending.exchange(false);
if (reload) {
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
game_list->PopulateAsync(UISettings::values.game_dirs);
Add Configure widget
2016-01-24 17:34:05 +00:00
}
yuzu/configuration: Make function naming consistent
2019-05-26 04:39:23 +00:00
config->Save();
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
yuzu: Option to hide mouse on inactivity Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2020-04-11 02:22:50 +00:00
if (UISettings::values.hide_mouse && emulation_running) {
setMouseTracking(true);
ui.centralwidget->setMouseTracking(true);
mouse_hide_timer.start();
} else {
setMouseTracking(false);
ui.centralwidget->setMouseTracking(false);
}
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
UpdateStatusButtons();
Basic QT window
2014-04-01 02:26:50 +00:00
}
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
void GMainWindow::OnLoadAmiibo() {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString extensions{QStringLiteral("*.bin")};
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
const QString file_filter = tr("Amiibo File (%1);; All Files (*.*)").arg(extensions);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString filename = QFileDialog::getOpenFileName(this, tr("Load Amiibo"), {}, file_filter);
yuzu/main: Notify user of loading errors with Amiibo data We shouldn't silently continue if loading failed, since the general assumption is that no messages showing up implicitly indicates success.
2018-10-24 13:37:29 +00:00
if (filename.isEmpty()) {
return;
}
citra_qt: add amiibo drag and drop support Co-Authored-By: Valentin Vanelslande <vvanelslandedev@gmail.com>
2019-11-02 18:22:36 +00:00
LoadAmiibo(filename);
}
void GMainWindow::LoadAmiibo(const QString& filename) {
yuzu/main: Notify user of loading errors with Amiibo data We shouldn't silently continue if loading failed, since the general assumption is that no messages showing up implicitly indicates success.
2018-10-24 13:37:29 +00:00
Core::System& system{Core::System::GetInstance()};
Service::SM::ServiceManager& sm = system.ServiceManager();
auto nfc = sm.GetService<Service::NFP::Module::Interface>("nfp:user");
if (nfc == nullptr) {
return;
}
QFile nfc_file{filename};
if (!nfc_file.open(QIODevice::ReadOnly)) {
QMessageBox::warning(this, tr("Error opening Amiibo data file"),
tr("Unable to open Amiibo file \"%1\" for reading.").arg(filename));
return;
}
const u64 nfc_file_size = nfc_file.size();
std::vector<u8> buffer(nfc_file_size);
const u64 read_size = nfc_file.read(reinterpret_cast<char*>(buffer.data()), nfc_file_size);
if (nfc_file_size != read_size) {
QMessageBox::warning(this, tr("Error reading Amiibo data file"),
tr("Unable to fully read Amiibo data. Expected to read %1 bytes, but "
"was only able to read %2 bytes.")
.arg(nfc_file_size)
.arg(read_size));
return;
}
if (!nfc->LoadAmiibo(buffer)) {
QMessageBox::warning(this, tr("Error loading Amiibo data"),
tr("Unable to load Amiibo data."));
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
}
}
qt: Add help option to open yuzu folder Opens a new file manager window at the UserDir.
2018-11-02 02:05:44 +00:00
void GMainWindow::OnOpenYuzuFolder() {
QDesktopServices::openUrl(QUrl::fromLocalFile(
QString::fromStdString(FileUtil::GetUserPath(FileUtil::UserPath::UserDir))));
}
Implement "About" dialog
2018-01-14 18:15:45 +00:00
void GMainWindow::OnAbout() {
AboutDialog aboutDialog(this);
aboutDialog.exec();
}
citra-qt: game list search function (#2673) * citra-qt: game list search function * Empty search field during game list refresh * Code improvements * Code formatting * Autofocus search field * JayFoxRox's recommendations * lioncash's review
2017-04-30 02:04:39 +00:00
void GMainWindow::OnToggleFilterBar() {
game_list->setFilterVisible(ui.action_Show_Filter_Bar->isChecked());
if (ui.action_Show_Filter_Bar->isChecked()) {
game_list->setFilterFocus();
} else {
game_list->clearFilter();
}
}
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
void GMainWindow::OnCaptureScreenshot() {
OnPauseGame();
Add file extension to screenshot filename if not provided
2019-01-20 03:10:30 +00:00
QFileDialog png_dialog(this, tr("Capture Screenshot"), UISettings::values.screenshot_path,
tr("PNG Image (*.png)"));
png_dialog.setAcceptMode(QFileDialog::AcceptSave);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
png_dialog.setDefaultSuffix(QStringLiteral("png"));
Fix crash when no files are selected
2019-01-20 03:14:19 +00:00
if (png_dialog.exec()) {
const QString path = png_dialog.selectedFiles().first();
if (!path.isEmpty()) {
UISettings::values.screenshot_path = QFileInfo(path).path();
render_window->CaptureScreenshot(UISettings::values.screenshot_resolution_factor, path);
}
yuzu, video_core: Screenshot functionality Allows capturing screenshot at the current internal resolution (native for software renderer), but a setting is available to capture it in other resolutions. The screenshot is saved to a single PNG in the current layout.
2018-08-31 06:16:16 +00:00
}
OnStartGame();
}
Add game versio to title bar
2020-06-08 21:58:04 +00:00
void GMainWindow::UpdateWindowTitle(const std::string& title_name,
const std::string& title_version) {
qt: Change titlebar formatting
2019-10-05 04:10:04 +00:00
const auto full_name = std::string(Common::g_build_fullname);
const auto branch_name = std::string(Common::g_scm_branch);
const auto description = std::string(Common::g_scm_desc);
const auto build_id = std::string(Common::g_build_id);
const auto date =
QDateTime::currentDateTime().toString(QStringLiteral("yyyy-MM-dd")).toStdString();
yuzu/main: Move window title updating logic to its own function For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
2019-05-09 05:41:33 +00:00
Add game versio to title bar
2020-06-08 21:58:04 +00:00
if (title_name.empty()) {
qt: Change titlebar formatting
2019-10-05 04:10:04 +00:00
const auto fmt = std::string(Common::g_title_bar_format_idle);
setWindowTitle(QString::fromStdString(fmt::format(fmt.empty() ? "yuzu {0}| {1}-{2}" : fmt,
full_name, branch_name, description,
std::string{}, date, build_id)));
yuzu/main: Move window title updating logic to its own function For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
2019-05-09 05:41:33 +00:00
} else {
qt: Fix game name format error
2019-10-06 19:07:00 +00:00
const auto fmt = std::string(Common::g_title_bar_format_running);
qt: Change titlebar formatting
2019-10-05 04:10:04 +00:00
setWindowTitle(QString::fromStdString(
Reorder variables to comply with the Auzure build pipeline
2020-06-22 13:56:41 +00:00
fmt::format(fmt.empty() ? "yuzu {0}| {3} | {6} | {1}-{2}" : fmt, full_name, branch_name,
description, title_name, date, build_id, title_version)));
yuzu/main: Move window title updating logic to its own function For similar reasons to the previous change, we move this to a single function, so we don't need to duplicate the conversion logic in several places within main.cpp.
2019-05-09 05:41:33 +00:00
}
}
Add performance statistics to status bar
2017-02-19 22:34:47 +00:00
void GMainWindow::UpdateStatusBar() {
if (emu_thread == nullptr) {
status_bar_update_timer.stop();
return;
}
auto results = Core::System::GetInstance().GetAndResetPerfStats();
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
if (Settings::values.use_frame_limit.GetValue()) {
Port #3353 from Citra
2018-08-20 23:14:06 +00:00
emu_speed_label->setText(tr("Speed: %1% / %2%")
.arg(results.emulation_speed * 100.0, 0, 'f', 0)
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
.arg(Settings::values.frame_limit.GetValue()));
Port #3353 from Citra
2018-08-20 23:14:06 +00:00
} else {
emu_speed_label->setText(tr("Speed: %1%").arg(results.emulation_speed * 100.0, 0, 'f', 0));
}
Qt: Don't show fractional figures in the status bar They're not very important and this makes the display changes less often, making it less distracting.
2017-02-20 02:56:26 +00:00
game_fps_label->setText(tr("Game: %1 FPS").arg(results.game_fps, 0, 'f', 0));
Add performance statistics to status bar
2017-02-19 22:34:47 +00:00
emu_frametime_label->setText(tr("Frame: %1 ms").arg(results.frametime * 1000.0, 0, 'f', 2));
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
emu_speed_label->setVisible(!Settings::values.use_multi_core.GetValue());
Add performance statistics to status bar
2017-02-19 22:34:47 +00:00
game_fps_label->setVisible(true);
emu_frametime_label->setVisible(true);
}
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
void GMainWindow::UpdateStatusButtons() {
dock_status_button->setChecked(Settings::values.use_docked_mode);
multicore_status_button->setChecked(Settings::values.use_multi_core.GetValue());
Settings::values.use_asynchronous_gpu_emulation.SetValue(
Settings::values.use_asynchronous_gpu_emulation.GetValue() ||
Settings::values.use_multi_core.GetValue());
async_status_button->setChecked(Settings::values.use_asynchronous_gpu_emulation.GetValue());
#ifdef HAS_VULKAN
renderer_status_button->setChecked(Settings::values.renderer_backend.GetValue() ==
Settings::RendererBackend::Vulkan);
#endif
}
yuzu: Option to hide mouse on inactivity Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2020-04-11 02:22:50 +00:00
void GMainWindow::HideMouseCursor() {
if (emu_thread == nullptr || UISettings::values.hide_mouse == false) {
mouse_hide_timer.stop();
ShowMouseCursor();
return;
}
setCursor(QCursor(Qt::BlankCursor));
}
void GMainWindow::ShowMouseCursor() {
unsetCursor();
if (emu_thread != nullptr && UISettings::values.hide_mouse) {
mouse_hide_timer.start();
}
}
void GMainWindow::mouseMoveEvent(QMouseEvent* event) {
ShowMouseCursor();
}
void GMainWindow::mousePressEvent(QMouseEvent* event) {
ShowMouseCursor();
}
Created a whitelist of system archives to prevent false positives creating dialogs.
2017-04-13 05:18:54 +00:00
void GMainWindow::OnCoreError(Core::System::ResultStatus result, std::string details) {
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
QMessageBox::StandardButton answer;
QString status_message;
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
const QString common_message =
tr("The game you are trying to load requires additional files from your Switch to be "
"dumped "
"before playing.<br/><br/>For more information on dumping these files, please see the "
"following wiki page: <a "
"href='https://yuzu-emu.org/wiki/"
"dumping-system-archives-and-the-shared-fonts-from-a-switch-console/'>Dumping System "
"Archives and the Shared Fonts from a Switch Console</a>.<br/><br/>Would you like to "
"quit "
"back to the game list? Continuing emulation may result in crashes, corrupted save "
"data, or other bugs.");
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
switch (result) {
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
case Core::System::ResultStatus::ErrorSystemFiles: {
yuzu/main: Make error messages within OnCoreError more localization-friendly Previously, a translated string was being appended onto another string in a manner that doesn't allow the translator to control where the appended text is placed. This can be a nuisance for languages where grammar and text ordering differs from English. We now append the strings via the format strings themselves, which allows translators to reorder where the text will be placed.
2019-07-07 14:50:06 +00:00
QString message;
if (details.empty()) {
message =
tr("yuzu was unable to locate a Switch system archive. %1").arg(common_message);
Addressed Bunnei's review comments, and made some other tweaks: - Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped.
2017-06-02 21:03:38 +00:00
} else {
yuzu/main: Make error messages within OnCoreError more localization-friendly Previously, a translated string was being appended onto another string in a manner that doesn't allow the translator to control where the appended text is placed. This can be a nuisance for languages where grammar and text ordering differs from English. We now append the strings via the format strings themselves, which allows translators to reorder where the text will be placed.
2019-07-07 14:50:06 +00:00
message = tr("yuzu was unable to locate a Switch system archive: %1. %2")
.arg(QString::fromStdString(details), common_message);
Addressed Bunnei's review comments, and made some other tweaks: - Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped.
2017-06-02 21:03:38 +00:00
}
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
answer = QMessageBox::question(this, tr("System Archive Not Found"), message,
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
status_message = tr("System Archive Missing");
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
break;
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
}
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
case Core::System::ResultStatus::ErrorSharedFont: {
yuzu/main: Make error messages within OnCoreError more localization-friendly Previously, a translated string was being appended onto another string in a manner that doesn't allow the translator to control where the appended text is placed. This can be a nuisance for languages where grammar and text ordering differs from English. We now append the strings via the format strings themselves, which allows translators to reorder where the text will be placed.
2019-07-07 14:50:06 +00:00
const QString message =
tr("yuzu was unable to locate the Switch shared fonts. %1").arg(common_message);
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
answer = QMessageBox::question(this, tr("Shared Fonts Not Found"), message,
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
status_message = tr("Shared Font Missing");
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
break;
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
}
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
Made some changes from review comments: - Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review). - Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore. - Made dialog messages more clear. - Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic. - Cleaned up some other stuff.
2017-03-09 01:21:31 +00:00
default:
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
answer = QMessageBox::question(
this, tr("Fatal Error"),
Minor cleanup
2018-01-13 23:49:16 +00:00
tr("yuzu has encountered a fatal error, please see the log for more details. "
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
"For more information on accessing the log, please see the following page: "
Added Amiibo support (#1390) * Fixed conflict with nfp * Few fixups for nfc * Conflict 2 * Fixed AttachAvailabilityChangeEvent * Conflict 3 * Fixed byte padding * Refactored amiibo to not reside in "System" * Removed remaining references of nfc from system * used enum for Nfc GetStateOld * Added missing newline * Moved file operations to front end * Conflict 4 * Amiibos now use structs and added mutexes * Removed amiibo_path
2018-10-23 23:28:17 +00:00
"<a href='https://community.citra-emu.org/t/how-to-upload-the-log-file/296'>How "
"to "
"Upload the Log File</a>.<br/><br/>Would you like to quit back to the game "
"list? "
"Continuing emulation may result in crashes, corrupted save data, or other "
"bugs."),
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
status_message = tr("Fatal Error encountered");
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
break;
}
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
if (answer == QMessageBox::Yes) {
Addressed Bunnei's review comments, and made some other tweaks: - Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped.
2017-06-02 21:03:38 +00:00
if (emu_thread) {
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
ShutdownGame();
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
Settings::RestoreGlobalState();
UpdateStatusButtons();
Addressed Bunnei's review comments, and made some other tweaks: - Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped.
2017-06-02 21:03:38 +00:00
}
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
} else {
Addressed Bunnei's review comments, and made some other tweaks: - Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped.
2017-06-02 21:03:38 +00:00
// Only show the message if the game is still running.
if (emu_thread) {
Implement Pull #3333 from citra: citra_qt: Pause emulation on CoreError (#39)
2018-01-16 16:32:27 +00:00
emu_thread->SetRunning(true);
Addressed Bunnei's review comments, and made some other tweaks: - Deleted GetStatus() because it wasn't used anywhere outside of Core::System. - Fixed design flaw where the message bar status could be set despite the game being stopped.
2017-06-02 21:03:38 +00:00
message_label->setText(status_message);
}
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
}
Added system for handling core errors in citra-qt.
2017-03-08 21:28:30 +00:00
}
partition_data_manager: Rename system files for hekate x
2018-09-29 15:48:51 +00:00
void GMainWindow::OnReinitializeKeys(ReinitializeKeyBehavior behavior) {
if (behavior == ReinitializeKeyBehavior::Warning) {
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
const auto res = QMessageBox::information(
this, tr("Confirm Key Rederivation"),
tr("You are about to force rederive all of your keys. \nIf you do not know what this "
"means or what you are doing, \nthis is a potentially destructive action. \nPlease "
QT Frontend: Add a Loading screen with progressbar With shader caches on the horizon, one requirement is to provide visible feedback for the progress. The shader cache reportedly takes several minutes to load for large caches that were invalidated, and as such we should provide a loading screen with progress. Adds a loading screen widget that will be shown until the first frame of the game is swapped. This was chosen in case shader caches are not being used, several games still take more than a few seconds to launch and could benefit from a loading screen.
2019-01-17 07:01:00 +00:00
"make sure this is what you want \nand optionally make backups.\n\nThis will delete "
"your autogenerated key files and re-run the key derivation module."),
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
QMessageBox::StandardButtons{QMessageBox::Ok, QMessageBox::Cancel});
if (res == QMessageBox::Cancel)
return;
FileUtil::Delete(FileUtil::GetUserPath(FileUtil::UserPath::KeysDir) +
"prod.keys_autogenerated");
FileUtil::Delete(FileUtil::GetUserPath(FileUtil::UserPath::KeysDir) +
"console.keys_autogenerated");
FileUtil::Delete(FileUtil::GetUserPath(FileUtil::UserPath::KeysDir) +
"title.keys_autogenerated");
}
key_manager: Correct casing of instance() Our codebase uppercases member function names.
2020-07-01 04:28:49 +00:00
Core::Crypto::KeyManager& keys = Core::Crypto::KeyManager::Instance();
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
if (keys.BaseDeriveNecessary()) {
Core::Crypto::PartitionDataManager pdm{vfs->OpenDirectory(
FileUtil::GetUserPath(FileUtil::UserPath::SysDataDir), FileSys::Mode::Read)};
partition_data_manager: Rename system files for hekate x
2018-09-29 15:48:51 +00:00
const auto function = [this, &keys, &pdm] {
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
keys.PopulateFromPartitionData(pdm);
yuzu: Port old usages of Filesystem namespace to FilesystemController
2019-04-22 21:56:56 +00:00
Core::System::GetInstance().GetFileSystemController().CreateFactories(*vfs);
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
keys.DeriveETicket(pdm);
};
partition_data_manager: Rename system files for hekate x
2018-09-29 15:48:51 +00:00
QString errors;
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
if (!pdm.HasFuses()) {
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
errors += tr("Missing fuses");
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
if (!pdm.HasBoot0()) {
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
errors += tr(" - Missing BOOT0");
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
if (!pdm.HasPackage2()) {
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
errors += tr(" - Missing BCPKG2-1-Normal-Main");
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
if (!pdm.HasProdInfo()) {
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
errors += tr(" - Missing PRODINFO");
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
partition_data_manager: Rename system files for hekate x
2018-09-29 15:48:51 +00:00
if (!errors.isEmpty()) {
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
QMessageBox::warning(
yuzu/main: Add better popup texts and remove duplicated actions Makes popup texts more compact and clear and also links our quickstart guide now. Also removes OnMenuSelectEmulatedDirectory from the File dropdown, as the action already exists in the Filesystem tab and provides better visual feedback there.
2020-04-14 00:56:22 +00:00
this, tr("Derivation Components Missing"),
tr("Components are missing that may hinder key derivation from completing. "
"<br>Please follow <a href='https://yuzu-emu.org/help/quickstart/'>the yuzu "
"quickstart guide</a> to get all your keys and "
"games.<br><br><small>(%1)</small>")
.arg(errors));
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
}
QProgressDialog prog;
prog.setRange(0, 0);
prog.setLabelText(tr("Deriving keys...\nThis may take up to a minute depending \non your "
"system's performance."));
prog.setWindowTitle(tr("Deriving Keys"));
prog.show();
auto future = QtConcurrent::run(function);
while (!future.isFinished()) {
QCoreApplication::processEvents();
}
prog.close();
}
yuzu: Port old usages of Filesystem namespace to FilesystemController
2019-04-22 21:56:56 +00:00
Core::System::GetInstance().GetFileSystemController().CreateFactories(*vfs);
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
partition_data_manager: Rename system files for hekate x
2018-09-29 15:48:51 +00:00
if (behavior == ReinitializeKeyBehavior::Warning) {
yuzu: Add support for multiple game directories Ported from https://github.com/citra-emu/citra/pull/3617.
2019-05-01 21:21:04 +00:00
game_list->PopulateAsync(UISettings::values.game_dirs);
qt: Add rederive keyset menu option
2018-09-24 01:35:32 +00:00
}
}
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
std::optional<u64> GMainWindow::SelectRomFSDumpTarget(const FileSys::ContentProvider& installed,
u64 program_id) {
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
const auto dlc_entries =
installed.ListEntriesFilter(FileSys::TitleType::AOC, FileSys::ContentRecordType::Data);
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
std::vector<FileSys::ContentProviderEntry> dlc_match;
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
dlc_match.reserve(dlc_entries.size());
std::copy_if(dlc_entries.begin(), dlc_entries.end(), std::back_inserter(dlc_match),
game_list: Register content with ContentProvider
2019-03-04 17:40:53 +00:00
[&program_id, &installed](const FileSys::ContentProviderEntry& entry) {
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
return (entry.title_id & DLC_BASE_TITLE_ID_MASK) == program_id &&
installed.GetEntry(entry)->GetStatus() == Loader::ResultStatus::Success;
});
std::vector<u64> romfs_tids;
romfs_tids.push_back(program_id);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
for (const auto& entry : dlc_match) {
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
romfs_tids.push_back(entry.title_id);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
if (romfs_tids.size() > 1) {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
QStringList list{QStringLiteral("Base")};
for (std::size_t i = 1; i < romfs_tids.size(); ++i) {
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
list.push_back(QStringLiteral("DLC %1").arg(romfs_tids[i] & 0x7FF));
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
}
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
bool ok;
const auto res = QInputDialog::getItem(
this, tr("Select RomFS Dump Target"),
tr("Please select which RomFS you would like to dump."), list, 0, false, &ok);
if (!ok) {
global: Use std::optional instead of boost::optional (#1578) * get rid of boost::optional * Remove optional references * Use std::reference_wrapper for optional references * Fix clang format * Fix clang format part 2 * Adressed feedback * Fix clang format and MacOS build
2018-10-30 04:03:25 +00:00
return {};
qt: Add support for dumping a DLC Data RomFS
2018-10-17 22:27:23 +00:00
}
return romfs_tids[list.indexOf(res)];
}
return program_id;
}
Add check before closure when emulation is running Implement confirmation in a specific function Fix typos and coding style Coding convention
2016-01-10 12:31:20 +00:00
bool GMainWindow::ConfirmClose() {
Add more stuff to configure.
2016-01-24 20:54:04 +00:00
if (emu_thread == nullptr || !UISettings::values.confirm_before_closing)
Add a configuration entry to enable/disable the check
2016-01-13 17:40:41 +00:00
return true;
Add check before closure when emulation is running Implement confirmation in a specific function Fix typos and coding style Coding convention
2016-01-10 12:31:20 +00:00
Optimized messages that were repetitive and added ability for core errors to specify more details optionally.
2017-04-13 05:15:23 +00:00
QMessageBox::StandardButton answer =
Minor cleanup
2018-01-13 23:49:16 +00:00
QMessageBox::question(this, tr("yuzu"), tr("Are you sure you want to close yuzu?"),
Made some changes from review comments: - Made LoadKernelSystemMode return a pair consisting of a system mode and a result code (Could use review). - Deleted ErrorOpenGL error code in favor of just having ErrorVideoCore. - Made dialog messages more clear. - Compared archive ID in fs_user.cpp to ArchiveIdCode::NCCH as opposed to hex magic. - Cleaned up some other stuff.
2017-03-09 01:21:31 +00:00
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No;
Add check before closure when emulation is running Implement confirmation in a specific function Fix typos and coding style Coding convention
2016-01-10 12:31:20 +00:00
}
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
void GMainWindow::closeEvent(QCloseEvent* event) {
Add check before closure when emulation is running Implement confirmation in a specific function Fix typos and coding style Coding convention
2016-01-10 12:31:20 +00:00
if (!ConfirmClose()) {
event->ignore();
return;
}
yuzu: Add a missing "!" to fix the stuck-in-fullscreen bug
2018-11-12 19:57:15 +00:00
if (!ui.action_Fullscreen->isChecked()) {
Fix the stuck in fullscreen bug (Original PR: citra-emu/citra#3611)
2018-04-14 11:05:47 +00:00
UISettings::values.geometry = saveGeometry();
UISettings::values.renderwindow_geometry = render_window->saveGeometry();
}
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
UISettings::values.state = saveState();
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709) * Make Citra build with MICROPROFILE_ENABLED set to 0 * Buildfix with microprofile kept on * moc did not like a dialog to conditionally exist. * Cleanup * Fix end of line
2016-04-29 00:17:31 +00:00
#if MICROPROFILE_ENABLED
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
UISettings::values.microprofile_geometry = microProfileDialog->saveGeometry();
UISettings::values.microprofile_visible = microProfileDialog->isVisible();
Make Citra build with MICROPROFILE_ENABLED set to 0 (#1709) * Make Citra build with MICROPROFILE_ENABLED set to 0 * Buildfix with microprofile kept on * moc did not like a dialog to conditionally exist. * Cleanup * Fix end of line
2016-04-29 00:17:31 +00:00
#endif
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
UISettings::values.single_window_mode = ui.action_Single_Window_Mode->isChecked();
Merge citra-emu PR#3001 by Styleoshin(citra-qt : Adding fullscreen mode)
2018-01-16 14:50:33 +00:00
UISettings::values.fullscreen = ui.action_Fullscreen->isChecked();
Qt: Fix action name to match conventions
2017-02-18 09:11:57 +00:00
UISettings::values.display_titlebar = ui.action_Display_Dock_Widget_Headers->isChecked();
citra-qt: game list search function (#2673) * citra-qt: game list search function * Empty search field during game list refresh * Code improvements * Code formatting * Autofocus search field * JayFoxRox's recommendations * lioncash's review
2017-04-30 02:04:39 +00:00
UISettings::values.show_filter_bar = ui.action_Show_Filter_Bar->isChecked();
Qt: Add (empty) status bar
2017-02-18 20:09:14 +00:00
UISettings::values.show_status_bar = ui.action_Show_Status_Bar->isChecked();
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
UISettings::values.first_start = false;
citra-qt: Separate UI layout state in a separate section of the config Closes #1113
2015-09-08 01:11:21 +00:00
Whole config is handled by Config class. This also means : we have only one config file, now
2016-01-24 20:23:55 +00:00
game_list->SaveInterfaceLayout();
qt/hotkey: Get rid of global hotkey map instance Instead, we make a proper registry class and house it within the main window, then pass it to whatever needs access to the loaded hotkeys. This way, we avoid a global variable, and don't need to initialize a std::map instance before the program can do anything.
2018-08-07 04:43:07 +00:00
hotkey_registry.SaveHotkeys();
Basic QT window
2014-04-01 02:26:50 +00:00
Qt: Shutdown emulation session only if EmuThread exists.
2015-05-13 03:14:24 +00:00
// Shutdown session if the emu thread is active...
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
if (emu_thread != nullptr) {
Qt: Shutdown emulation session only if EmuThread exists.
2015-05-13 03:14:24 +00:00
ShutdownGame();
Qt: Shutdown game on emulator close event.
2015-05-01 20:53:16 +00:00
configuration: implement per-game configurations (#4098) * Switch game settings to use a pointer In order to add full per-game settings, we need to be able to tell yuzu to switch to using either the global or game configuration. Using a pointer makes it easier to switch. * configuration: add new UI without changing existing funcitonality The new UI also adds General, System, Graphics, Advanced Graphics, and Audio tabs, but as yet they do nothing. This commit keeps yuzu to the same functionality as originally branched. * configuration: Rename files These weren't included in the last commit. Now they are. * configuration: setup global configuration checkbox Global config checkbox now enables/disables the appropriate tabs in the game properties dialog. The use global configuration setting is now saved to the config, defaulting to true. This also addresses some changes requested in the PR. * configuration: swap to per-game config memory for properties dialog Does not set memory going in-game. Swaps to game values when opening the properties dialog, then swaps back when closing it. Uses a `memcpy` to swap. Also implements saving config files, limited to certain groups of configurations so as to not risk setting unsafe configurations. * configuration: change config interfaces to use config-specific pointers When a game is booted, we need to be able to open the configuration dialogs without changing the settings pointer in the game's emualtion. A new pointer specific to just the configuration dialogs can be used to separate changes to just those config dialogs without affecting the emulation. * configuration: boot a game using per-game settings Swaps values where needed to boot a game. * configuration: user correct config during emulation Creates a new pointer specifically for modifying the configuration while emulation is in progress. Both the regular configuration dialog and the game properties dialog now use the pointer Settings::config_values to focus edits to the correct struct. * settings: split Settings::values into two different structs By splitting the settings into two mutually exclusive structs, it becomes easier, as a developer, to determine how to use the Settings structs after per-game configurations is merged. Other benefits include only duplicating the required settings in memory. * settings: move use_docked_mode to Controls group `use_docked_mode` is set in the input settings and cannot be accessed from the system settings. Grouping it with system settings causes it to be saved with per-game settings, which may make transferring configs more difficult later on, especially since docked mode cannot be set from within the game properties dialog. * configuration: Fix the other yuzu executables and a regression In main.cpp, we have to get the title ID before the ROM is loaded, else the renderer will reflect only the global settings and now the user's game specific settings. * settings: use a template to duplicate memory for each setting Replaces the type of each variable in the Settings::Values struct with a new class that allows basic data reading and writing. The new struct Settings::Setting duplicates the data in memory and can manage global overrides per each setting. * configuration: correct add-ons config and swap settings when apropriate Any add-ons interaction happens directly through the global values struct. Swapping bewteen structs now also includes copying the necessary global configs that cannot be changed nor saved in per-game settings. General and System config menus now update based on whether it is viewing the global or per-game settings. * settings: restore old values struct No longer needed with the Settings::Setting class template. * configuration: implement hierarchical game properties dialog This sets the apropriate global or local data in each setting. * clang format * clang format take 2 can the docker container save this? * address comments and style issues * config: read and write settings with global awareness Adds new functions to read and write settings while keeping the global state in focus. Files now generated per-game are much smaller since often they only need address the global state. * settings: restore global state when necessary Upon closing a game or the game properties dialog, we need to restore all global settings to the original global state so that we can properly open the configuration dialog or boot a different game. * configuration: guard setting values incorrectly This disables setting values while a game is running if the setting is overwritten by a per game setting. * config: don't write local settings in the global config Simple guards to prevent writing the wrong settings in the wrong files. * configuration: add comments, assume less, and clang format No longer assumes that a disabled UI element means the global state is turned off, instead opting to directly answer that question. Still however assumes a game is running if it is in that state. * configuration: fix a logic error Should not be negated * restore settings' global state regardless of accept/cancel Fixes loading a properties dialog and causing the global config dialog to show local settings. * fix more logic errors Fixed the frame limit would set the global setting from the game properties dialog. Also strengthened the Settings::Setting member variables and simplified the logic in config reading (ReadSettingGlobal). * fix another logic error In my efforts to guard RestoreGlobalState, I accidentally negated the IsPowered condition. * configure_audio: set toggle_stretched_audio to tristate * fixed custom rtc and rng seed overwriting the global value * clang format * rebased * clang format take 4 * address my own review Basically revert unintended changes * settings: literal instead of casting "No need to cast, use 1U instead" Thanks, Morph! Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> * Revert "settings: literal instead of casting " This reverts commit 95e992a87c898f3e882ffdb415bb0ef9f80f613f. * main: fix status buttons reporting wrong settings after stop emulation * settings: Log UseDockedMode in the Controls group This should have happened when use_docked_mode was moved over to the controls group internally. This just reflects this in the log. * main: load settings if the file has a title id In other words, don't exit if the loader has trouble getting a title id. * use a zero * settings: initalize resolution factor with constructor instead of casting * Revert "settings: initalize resolution factor with constructor instead of casting" This reverts commit 54c35ecb46a29953842614620f9b7de1aa9d5dc8. * configure_graphics: guard device selector when Vulkan is global Prevents the user from editing the device selector if Vulkan is the global renderer backend. Also resets the vulkan_device variable when the users switches back-and-forth between global and Vulkan. * address reviewer concerns Changes function variables to const wherever they don't need to be changed. Sets Settings::Setting to final as it should not be inherited from. Sets ConfigurationShared::use_global_text to static. Co-Authored-By: VolcaEM <volcaem@users.noreply.github.com> * main: load per-game settings after LoadROM This prevents `Restart Emulation` from restoring the global settings *after* the per-game settings were applied. Thanks to BSoDGamingYT for finding this bug. * Revert "main: load per-game settings after LoadROM" This reverts commit 9d0d48c52d2dcf3bfb1806cc8fa7d5a271a8a804. * main: only restore global settings when necessary Loading the per-game settings cannot happen after the ROM is loaded, so we have to specify when to restore the global state. Again thanks to BSoD for finding the bug. * configuration_shared: address reviewer concerns except operator overrides Dropping operator override usage in next commit. Co-Authored-By: LC <lioncash@users.noreply.github.com> * settings: Drop operator overrides from Setting template Requires using GetValue and SetValue explicitly. Also reverts a change that broke title ID formatting in the game properties dialog. * complete rebase * configuration_shared: translate "Use global configuration" Uses ConfigurePerGame to do so, since its usage, at least as of now, corresponds with ConfigurationShared. * configure_per_game: address reviewer concern As far as I understand, it prevents the program from unnecessarily copying strings. Co-Authored-By: LC <lioncash@users.noreply.github.com> Co-authored-by: Morph <39850852+Morph1984@users.noreply.github.com> Co-authored-by: VolcaEM <volcaem@users.noreply.github.com> Co-authored-by: LC <lioncash@users.noreply.github.com>
2020-07-10 02:42:09 +00:00
Settings::RestoreGlobalState();
UpdateStatusButtons();
}
Basic QT window
2014-04-01 02:26:50 +00:00
render_window->close();
QWidget::closeEvent(event);
}
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
static bool IsSingleFileDropEvent(const QMimeData* mime) {
return mime->hasUrls() && mime->urls().length() == 1;
yuzu: Implement Vulkan frontend Adds a Qt and SDL2 frontend for Vulkan. It also finishes the missing bits on Vulkan initialization.
2020-01-21 19:40:53 +00:00
}
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
void GMainWindow::AcceptDropEvent(QDropEvent* event) {
if (IsSingleFileDropEvent(event->mimeData())) {
event->setDropAction(Qt::DropAction::LinkAction);
event->accept();
yuzu: Implement Vulkan frontend Adds a Qt and SDL2 frontend for Vulkan. It also finishes the missing bits on Vulkan initialization.
2020-01-21 19:40:53 +00:00
}
}
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
bool GMainWindow::DropAction(QDropEvent* event) {
if (!IsSingleFileDropEvent(event->mimeData())) {
return false;
citra_qt: add amiibo drag and drop support Co-Authored-By: Valentin Vanelslande <vvanelslandedev@gmail.com>
2019-11-02 18:22:36 +00:00
}
const QMimeData* mime_data = event->mimeData();
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
const QString& filename = mime_data->urls().at(0).toLocalFile();
citra_qt: add amiibo drag and drop support Co-Authored-By: Valentin Vanelslande <vvanelslandedev@gmail.com>
2019-11-02 18:22:36 +00:00
if (emulation_running && QFileInfo(filename).suffix() == QStringLiteral("bin")) {
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
// Amiibo
citra_qt: add amiibo drag and drop support Co-Authored-By: Valentin Vanelslande <vvanelslandedev@gmail.com>
2019-11-02 18:22:36 +00:00
LoadAmiibo(filename);
} else {
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
// Game
citra_qt: add amiibo drag and drop support Co-Authored-By: Valentin Vanelslande <vvanelslandedev@gmail.com>
2019-11-02 18:22:36 +00:00
if (ConfirmChangeGame()) {
BootGame(filename);
}
added drag n drop feature
2017-02-16 03:23:30 +00:00
}
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
return true;
}
void GMainWindow::dropEvent(QDropEvent* event) {
DropAction(event);
added drag n drop feature
2017-02-16 03:23:30 +00:00
}
void GMainWindow::dragEnterEvent(QDragEnterEvent* event) {
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
AcceptDropEvent(event);
added drag n drop feature
2017-02-16 03:23:30 +00:00
}
void GMainWindow::dragMoveEvent(QDragMoveEvent* event) {
frontent: qt: main: Various updates/refactoring for separate presentation thread.
2020-02-17 20:49:52 +00:00
AcceptDropEvent(event);
added drag n drop feature
2017-02-16 03:23:30 +00:00
}
bool GMainWindow::ConfirmChangeGame() {
if (emu_thread == nullptr)
return true;
main: Use const on all variable initializations
2019-09-22 14:02:07 +00:00
const auto answer = QMessageBox::question(
Minor cleanup
2018-01-13 23:49:16 +00:00
this, tr("yuzu"),
added drag n drop feature
2017-02-16 03:23:30 +00:00
tr("Are you sure you want to stop the emulation? Any unsaved progress will be lost."),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No;
}
qt: Prompt user for confirmation if exit lock is active
2019-09-22 02:46:53 +00:00
bool GMainWindow::ConfirmForceLockedExit() {
if (emu_thread == nullptr)
return true;
main: Use const on all variable initializations
2019-09-22 14:02:07 +00:00
const auto answer =
qt: Prompt user for confirmation if exit lock is active
2019-09-22 02:46:53 +00:00
QMessageBox::question(this, tr("yuzu"),
tr("The currently running application has requested yuzu to not "
"exit.\n\nWould you like to bypass this and exit anyway?"),
QMessageBox::Yes | QMessageBox::No, QMessageBox::No);
return answer != QMessageBox::No;
}
void GMainWindow::RequestGameExit() {
auto& sm{Core::System::GetInstance().ServiceManager()};
auto applet_oe = sm.GetService<Service::AM::AppletOE>("appletOE");
auto applet_ae = sm.GetService<Service::AM::AppletAE>("appletAE");
bool has_signalled = false;
if (applet_oe != nullptr) {
applet_oe->GetMessageQueue()->RequestExit();
has_signalled = true;
}
if (applet_ae != nullptr && !has_signalled) {
applet_ae->GetMessageQueue()->RequestExit();
}
}
citra-qt: game list search function (#2673) * citra-qt: game list search function * Empty search field during game list refresh * Code improvements * Code formatting * Autofocus search field * JayFoxRox's recommendations * lioncash's review
2017-04-30 02:04:39 +00:00
void GMainWindow::filterBarSetChecked(bool state) {
ui.action_Show_Filter_Bar->setChecked(state);
emit(OnToggleFilterBar());
}
Add Dark theme, Icon theming configure_general.ui: Add UI Option for Themes config.cpp: Save Theme Settings
2018-03-30 09:50:10 +00:00
void GMainWindow::UpdateUITheme() {
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString default_icons = QStringLiteral(":/icons/default");
const QString& current_theme = UISettings::values.theme;
const bool is_default_theme = current_theme == QString::fromUtf8(UISettings::themes[0].second);
Add Dark theme, Icon theming configure_general.ui: Add UI Option for Themes config.cpp: Save Theme Settings
2018-03-30 09:50:10 +00:00
QStringList theme_paths(default_theme_paths);
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
if (is_default_theme || current_theme.isEmpty()) {
GUI: Togglable graphics settings buttons in status bar
2020-01-28 22:59:30 +00:00
const QString theme_uri(QStringLiteral(":default/style.qss"));
QFile f(theme_uri);
if (f.open(QFile::ReadOnly | QFile::Text)) {
QTextStream ts(&f);
qApp->setStyleSheet(ts.readAll());
setStyleSheet(ts.readAll());
} else {
qApp->setStyleSheet({});
setStyleSheet({});
}
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
theme_paths.append(default_icons);
QIcon::setThemeName(default_icons);
} else {
const QString theme_uri(QLatin1Char{':'} + current_theme + QStringLiteral("/style.qss"));
Add Dark theme, Icon theming configure_general.ui: Add UI Option for Themes config.cpp: Save Theme Settings
2018-03-30 09:50:10 +00:00
QFile f(theme_uri);
qt/main: Better file-existence checking within OnMenuRecentFile() and UpdateUITheme() In OnMenuRecentFile() we don't need to construct a QFileInfo instance just to check if a file exists, we can just use the static member function to do that (which Qt's documentation also notes as quicker than constructing an instance). In UpdateUITheme(), we just want to try and open the file and check the success of that operation. Technically speaking, between the existence check and the open call, the file can be deleted or moved, but still appear to succeed in code. i.e. 1. Existence check -> Returns true 2. File is moved/deleted 3. Open is called, the return value of which isn't checked 4. Nonsense behavior This way we combine the existence check and the open into one.
2018-08-06 18:12:57 +00:00
if (f.open(QFile::ReadOnly | QFile::Text)) {
Add Dark theme, Icon theming configure_general.ui: Add UI Option for Themes config.cpp: Save Theme Settings
2018-03-30 09:50:10 +00:00
QTextStream ts(&f);
qApp->setStyleSheet(ts.readAll());
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
setStyleSheet(ts.readAll());
qt/main: Better file-existence checking within OnMenuRecentFile() and UpdateUITheme() In OnMenuRecentFile() we don't need to construct a QFileInfo instance just to check if a file exists, we can just use the static member function to do that (which Qt's documentation also notes as quicker than constructing an instance). In UpdateUITheme(), we just want to try and open the file and check the success of that operation. Technically speaking, between the existence check and the open call, the file can be deleted or moved, but still appear to succeed in code. i.e. 1. Existence check -> Returns true 2. File is moved/deleted 3. Open is called, the return value of which isn't checked 4. Nonsense behavior This way we combine the existence check and the open into one.
2018-08-06 18:12:57 +00:00
} else {
LOG_ERROR(Frontend, "Unable to set style, stylesheet file not found");
Add Dark theme, Icon theming configure_general.ui: Add UI Option for Themes config.cpp: Save Theme Settings
2018-03-30 09:50:10 +00:00
}
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
const QString theme_name = QStringLiteral(":/icons/") + current_theme;
theme_paths.append({default_icons, theme_name});
QIcon::setThemeName(theme_name);
Add Dark theme, Icon theming configure_general.ui: Add UI Option for Themes config.cpp: Save Theme Settings
2018-03-30 09:50:10 +00:00
}
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
Add Dark theme, Icon theming configure_general.ui: Add UI Option for Themes config.cpp: Save Theme Settings
2018-03-30 09:50:10 +00:00
QIcon::setThemeSearchPaths(theme_paths);
}
yuzu/main: Apply the [[maybe_unused]] attribute to the parameter of SetDiscordEnabled() Depending on whether or not USE_DISCORD_PRESENCE is defined, the "state" parameter can be used or unused. If USE_DISCORD_PRESENCE is not defined, the parameter will be considered unused, which can lead to compiler warnings. So, we can explicitly mark it with [[maybe_unused]] to inform the compiler that this is intentional.
2018-10-13 14:10:27 +00:00
void GMainWindow::SetDiscordEnabled([[maybe_unused]] bool state) {
Port web_service from Citra
2018-09-16 18:05:51 +00:00
#ifdef USE_DISCORD_PRESENCE
if (state) {
discord_rpc = std::make_unique<DiscordRPC::DiscordImpl>();
} else {
discord_rpc = std::make_unique<DiscordRPC::NullImpl>();
}
#else
discord_rpc = std::make_unique<DiscordRPC::NullImpl>();
#endif
discord_rpc->Update();
}
Basic QT window
2014-04-01 02:26:50 +00:00
#ifdef main
#undef main
#endif
Add menu and logic to save and load recently loaded files. This menu is only for ROM and will not save symbols recently loaded. When the menu is empty, the menu is disabled (greyed out)
2015-07-28 16:43:18 +00:00
int main(int argc, char* argv[]) {
Port web_service from Citra
2018-09-16 18:05:51 +00:00
Common::DetachedTasks detached_tasks;
Integrate the MicroProfile profiling library This brings goodies such as a configurable user interface and multi-threaded timeline view.
2015-08-17 21:25:21 +00:00
MicroProfileOnThreadCreate("Frontend");
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
SCOPE_EXIT({ MicroProfileShutdown(); });
Integrate the MicroProfile profiling library This brings goodies such as a configurable user interface and multi-threaded timeline view.
2015-08-17 21:25:21 +00:00
Save the path leading where the last file have been loaded I use two variables to save the path for the ROMs and the symbols. Use of QSettings to avoid new member variable to the class. Global settings of QSettings is done in main.
2015-07-26 15:13:02 +00:00
// Init settings params
yuzu/main: Specify string conversions where applicable
2019-05-24 23:44:06 +00:00
QCoreApplication::setOrganizationName(QStringLiteral("yuzu team"));
QCoreApplication::setApplicationName(QStringLiteral("yuzu"));
Save the path leading where the last file have been loaded I use two variables to save the path for the ROMs and the symbols. Use of QSettings to avoid new member variable to the class. Global settings of QSettings is done in main.
2015-07-26 15:13:02 +00:00
citra_qt: on osx chdir to bundle dir to allow detection of user folder
2019-08-11 10:28:07 +00:00
#ifdef __APPLE__
Address review comments
2019-09-05 01:40:49 +00:00
// If you start a bundle (binary) on OSX without the Terminal, the working directory is "/".
// But since we require the working directory to be the executable path for the location of the
// user folder in the Qt Frontend, we need to cd into that working directory
const std::string bin_path = FileUtil::GetBundleDirectory() + DIR_SEP + "..";
citra_qt: on osx chdir to bundle dir to allow detection of user folder
2019-08-11 10:28:07 +00:00
chdir(bin_path.c_str());
#endif
QT Frontend: Migrate to QOpenGLWindow
2019-01-12 04:06:34 +00:00
// Enables the core to make the qt created contexts current on std::threads
QCoreApplication::setAttribute(Qt::AA_DontCheckOpenGLContextThreadAffinity);
Basic QT window
2014-04-01 02:26:50 +00:00
QApplication app(argc, argv);
Add configurable per-class log filtering
2014-12-06 22:00:08 +00:00
Sources: Run clang-format on everything.
2016-09-18 00:38:01 +00:00
// Qt changes the locale and causes issues in float conversion using std::to_string() when
// generating shaders
Set the appropriate locale to get float conversion working using std::to_string
2016-03-06 13:04:47 +00:00
setlocale(LC_ALL, "C");
Basic QT window
2014-04-01 02:26:50 +00:00
GMainWindow main_window;
Add configurable per-class log filtering
2014-12-06 22:00:08 +00:00
// After settings have been loaded by GMainWindow, apply the filter
Basic QT window
2014-04-01 02:26:50 +00:00
main_window.show();
citra_qt: Log settings on launch
2018-07-10 10:02:14 +00:00
yuzu: Pause when in background Co-Authored-By: Vitor K <vitor-k@users.noreply.github.com>
2019-09-26 12:54:31 +00:00
QObject::connect(&app, &QGuiApplication::applicationStateChanged, &main_window,
&GMainWindow::OnAppFocusStateChanged);
Port web_service from Citra
2018-09-16 18:05:51 +00:00
int result = app.exec();
detached_tasks.WaitForAllTasks();
return result;
Basic QT window
2014-04-01 02:26:50 +00:00
}
Reference in a new issue Copy permalink