early-access version 1413
This commit is contained in:
parent
043a30bf5c
commit
24e7f47921
6 changed files with 24 additions and 11 deletions
|
@ -1,7 +1,7 @@
|
||||||
yuzu emulator early access
|
yuzu emulator early access
|
||||||
=============
|
=============
|
||||||
|
|
||||||
This is the source code for early-access 1412.
|
This is the source code for early-access 1413.
|
||||||
|
|
||||||
## Legal Notice
|
## Legal Notice
|
||||||
|
|
||||||
|
|
|
@ -568,6 +568,11 @@ KeyManager::KeyManager() {
|
||||||
// Initialize keys
|
// Initialize keys
|
||||||
const std::string hactool_keys_dir = Common::FS::GetHactoolConfigurationPath();
|
const std::string hactool_keys_dir = Common::FS::GetHactoolConfigurationPath();
|
||||||
const std::string yuzu_keys_dir = Common::FS::GetUserPath(Common::FS::UserPath::KeysDir);
|
const std::string yuzu_keys_dir = Common::FS::GetUserPath(Common::FS::UserPath::KeysDir);
|
||||||
|
|
||||||
|
if (!Common::FS::Exists(yuzu_keys_dir)) {
|
||||||
|
Common::FS::CreateDir(yuzu_keys_dir);
|
||||||
|
}
|
||||||
|
|
||||||
if (Settings::values.use_dev_keys) {
|
if (Settings::values.use_dev_keys) {
|
||||||
dev_mode = true;
|
dev_mode = true;
|
||||||
AttemptLoadKeyFile(yuzu_keys_dir, hactool_keys_dir, "dev.keys", false);
|
AttemptLoadKeyFile(yuzu_keys_dir, hactool_keys_dir, "dev.keys", false);
|
||||||
|
|
|
@ -18,12 +18,8 @@ ControllerDialog::ControllerDialog(QWidget* parent) : QWidget(parent, Qt::Dialog
|
||||||
setWindowFlags((windowFlags() & ~Qt::WindowContextHelpButtonHint) |
|
setWindowFlags((windowFlags() & ~Qt::WindowContextHelpButtonHint) |
|
||||||
Qt::WindowMaximizeButtonHint);
|
Qt::WindowMaximizeButtonHint);
|
||||||
|
|
||||||
PlayerControlPreview* widget = new PlayerControlPreview(this);
|
widget = new PlayerControlPreview(this);
|
||||||
const auto& players = Settings::values.players.GetValue();
|
RefreshConfiguration();
|
||||||
constexpr std::size_t player = 0;
|
|
||||||
widget->SetPlayerInputRaw(player, players[player].buttons, players[player].analogs);
|
|
||||||
widget->SetConnectedStatus(players[player].connected);
|
|
||||||
widget->SetControllerType(players[player].controller_type);
|
|
||||||
QLayout* layout = new QVBoxLayout(this);
|
QLayout* layout = new QVBoxLayout(this);
|
||||||
layout->setContentsMargins(0, 0, 0, 0);
|
layout->setContentsMargins(0, 0, 0, 0);
|
||||||
layout->addWidget(widget);
|
layout->addWidget(widget);
|
||||||
|
@ -36,6 +32,14 @@ ControllerDialog::ControllerDialog(QWidget* parent) : QWidget(parent, Qt::Dialog
|
||||||
widget->setFocus();
|
widget->setFocus();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ControllerDialog::RefreshConfiguration() {
|
||||||
|
const auto& players = Settings::values.players.GetValue();
|
||||||
|
constexpr std::size_t player = 0;
|
||||||
|
widget->SetPlayerInputRaw(player, players[player].buttons, players[player].analogs);
|
||||||
|
widget->SetConnectedStatus(players[player].connected);
|
||||||
|
widget->SetControllerType(players[player].controller_type);
|
||||||
|
}
|
||||||
|
|
||||||
QAction* ControllerDialog::toggleViewAction() {
|
QAction* ControllerDialog::toggleViewAction() {
|
||||||
if (toggle_view_action == nullptr) {
|
if (toggle_view_action == nullptr) {
|
||||||
toggle_view_action = new QAction(windowTitle(), this);
|
toggle_view_action = new QAction(windowTitle(), this);
|
||||||
|
|
|
@ -9,6 +9,7 @@
|
||||||
class QAction;
|
class QAction;
|
||||||
class QHideEvent;
|
class QHideEvent;
|
||||||
class QShowEvent;
|
class QShowEvent;
|
||||||
|
class PlayerControlPreview;
|
||||||
|
|
||||||
class ControllerDialog : public QWidget {
|
class ControllerDialog : public QWidget {
|
||||||
Q_OBJECT
|
Q_OBJECT
|
||||||
|
@ -18,6 +19,7 @@ public:
|
||||||
|
|
||||||
/// Returns a QAction that can be used to toggle visibility of this dialog.
|
/// Returns a QAction that can be used to toggle visibility of this dialog.
|
||||||
QAction* toggleViewAction();
|
QAction* toggleViewAction();
|
||||||
|
void RefreshConfiguration();
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
void showEvent(QShowEvent* ev) override;
|
void showEvent(QShowEvent* ev) override;
|
||||||
|
@ -25,4 +27,5 @@ protected:
|
||||||
|
|
||||||
private:
|
private:
|
||||||
QAction* toggle_view_action = nullptr;
|
QAction* toggle_view_action = nullptr;
|
||||||
|
PlayerControlPreview* widget;
|
||||||
};
|
};
|
||||||
|
|
|
@ -690,9 +690,9 @@ void GMainWindow::InitializeDebugWidgets() {
|
||||||
waitTreeWidget->hide();
|
waitTreeWidget->hide();
|
||||||
debug_menu->addAction(waitTreeWidget->toggleViewAction());
|
debug_menu->addAction(waitTreeWidget->toggleViewAction());
|
||||||
|
|
||||||
controllerDialog = new ControllerDialog(this);
|
controller_dialog = new ControllerDialog(this);
|
||||||
controllerDialog->hide();
|
controller_dialog->hide();
|
||||||
debug_menu->addAction(controllerDialog->toggleViewAction());
|
debug_menu->addAction(controller_dialog->toggleViewAction());
|
||||||
|
|
||||||
connect(this, &GMainWindow::EmulationStarting, waitTreeWidget,
|
connect(this, &GMainWindow::EmulationStarting, waitTreeWidget,
|
||||||
&WaitTreeWidget::OnEmulationStarting);
|
&WaitTreeWidget::OnEmulationStarting);
|
||||||
|
@ -2352,6 +2352,7 @@ void GMainWindow::OnConfigure() {
|
||||||
}
|
}
|
||||||
|
|
||||||
configure_dialog.ApplyConfiguration();
|
configure_dialog.ApplyConfiguration();
|
||||||
|
controller_dialog->RefreshConfiguration();
|
||||||
InitializeHotkeys();
|
InitializeHotkeys();
|
||||||
if (UISettings::values.theme != old_theme) {
|
if (UISettings::values.theme != old_theme) {
|
||||||
UpdateUITheme();
|
UpdateUITheme();
|
||||||
|
|
|
@ -314,7 +314,7 @@ private:
|
||||||
ProfilerWidget* profilerWidget;
|
ProfilerWidget* profilerWidget;
|
||||||
MicroProfileDialog* microProfileDialog;
|
MicroProfileDialog* microProfileDialog;
|
||||||
WaitTreeWidget* waitTreeWidget;
|
WaitTreeWidget* waitTreeWidget;
|
||||||
ControllerDialog* controllerDialog;
|
ControllerDialog* controller_dialog;
|
||||||
|
|
||||||
QAction* actions_recent_files[max_recent_files_item];
|
QAction* actions_recent_files[max_recent_files_item];
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue