summaryrefslogtreecommitdiff
path: root/src/yuzu
diff options
context:
space:
mode:
Diffstat (limited to 'src/yuzu')
-rw-r--r--src/yuzu/aboutdialog.ui2
-rw-r--r--src/yuzu/configuration/config.cpp13
-rw-r--r--src/yuzu/configuration/configure_graphics.cpp31
-rw-r--r--src/yuzu/configuration/configure_graphics.ui40
-rw-r--r--src/yuzu/configuration/configure_input.cpp18
-rw-r--r--src/yuzu/configuration/configure_input.ui283
6 files changed, 228 insertions, 159 deletions
diff --git a/src/yuzu/aboutdialog.ui b/src/yuzu/aboutdialog.ui
index cdcaa15b0..2680480cc 100644
--- a/src/yuzu/aboutdialog.ui
+++ b/src/yuzu/aboutdialog.ui
@@ -87,7 +87,7 @@
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;">
-<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv2.0 or any later version.</span></p>
+<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:12pt;">yuzu is an experimental open-source emulator for the Nintendo Switch licensed under GPLv2.0.</span></p>
<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"><br /></p>
&lt;p style=&quot; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;&quot;&gt;&lt;span style=&quot; font-family:'MS Shell Dlg 2'; font-size:12pt;&quot;&gt;This software should not be used to play games you have not legally obtained.&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
diff --git a/src/yuzu/configuration/config.cpp b/src/yuzu/configuration/config.cpp
index 4c713fcbc..ab6ba0ec9 100644
--- a/src/yuzu/configuration/config.cpp
+++ b/src/yuzu/configuration/config.cpp
@@ -8,7 +8,6 @@
#include "yuzu/configuration/config.h"
#include "yuzu/ui_settings.h"
-
Config::Config() {
// TODO: Don't hardcode the path; let the frontend decide where to put the config files.
qt_config_loc = FileUtil::GetUserPath(D_CONFIG_IDX) + "qt-config.ini";
@@ -19,16 +18,18 @@ Config::Config() {
}
const std::array<int, Settings::NativeButton::NumButtons> Config::default_buttons = {
- Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_T, Qt::Key_G, Qt::Key_F, Qt::Key_H,
- Qt::Key_Q, Qt::Key_W, Qt::Key_M, Qt::Key_N, Qt::Key_1, Qt::Key_2, Qt::Key_B,
+ Qt::Key_A, Qt::Key_S, Qt::Key_Z, Qt::Key_X, Qt::Key_3, Qt::Key_4, Qt::Key_Q, Qt::Key_W,
+ Qt::Key_1, Qt::Key_2, Qt::Key_N, Qt::Key_M, Qt::Key_F, Qt::Key_T, Qt::Key_H, Qt::Key_G,
+ Qt::Key_Left, Qt::Key_Up, Qt::Key_Right, Qt::Key_Down, Qt::Key_J, Qt::Key_I, Qt::Key_L,
+ Qt::Key_K, Qt::Key_D, Qt::Key_C, Qt::Key_B, Qt::Key_V,
};
const std::array<std::array<int, 5>, Settings::NativeAnalog::NumAnalogs> Config::default_analogs{{
{
- Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_D,
+ Qt::Key_Up, Qt::Key_Down, Qt::Key_Left, Qt::Key_Right, Qt::Key_E,
},
{
- Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_D,
+ Qt::Key_I, Qt::Key_K, Qt::Key_J, Qt::Key_L, Qt::Key_R,
},
}};
@@ -86,7 +87,7 @@ void Config::ReadValues() {
qt_config->endGroup();
qt_config->beginGroup("Miscellaneous");
- Settings::values.log_filter = qt_config->value("log_filter", "*:Trace").toString().toStdString();
+ Settings::values.log_filter = qt_config->value("log_filter", "*:Info").toString().toStdString();
qt_config->endGroup();
qt_config->beginGroup("Debugging");
diff --git a/src/yuzu/configuration/configure_graphics.cpp b/src/yuzu/configuration/configure_graphics.cpp
index 5f91d5492..47b9b6e95 100644
--- a/src/yuzu/configuration/configure_graphics.cpp
+++ b/src/yuzu/configuration/configure_graphics.cpp
@@ -7,7 +7,6 @@
#include "ui_configure_graphics.h"
#include "yuzu/configuration/configure_graphics.h"
-
ConfigureGraphics::ConfigureGraphics(QWidget* parent)
: QWidget(parent), ui(new Ui::ConfigureGraphics) {
@@ -23,12 +22,6 @@ enum class Resolution : int {
Scale2x,
Scale3x,
Scale4x,
- Scale5x,
- Scale6x,
- Scale7x,
- Scale8x,
- Scale9x,
- Scale10x,
};
float ToResolutionFactor(Resolution option) {
@@ -43,18 +36,6 @@ float ToResolutionFactor(Resolution option) {
return 3.f;
case Resolution::Scale4x:
return 4.f;
- case Resolution::Scale5x:
- return 5.f;
- case Resolution::Scale6x:
- return 6.f;
- case Resolution::Scale7x:
- return 7.f;
- case Resolution::Scale8x:
- return 8.f;
- case Resolution::Scale9x:
- return 9.f;
- case Resolution::Scale10x:
- return 10.f;
}
return 0.f;
}
@@ -70,18 +51,6 @@ Resolution FromResolutionFactor(float factor) {
return Resolution::Scale3x;
} else if (factor == 4.f) {
return Resolution::Scale4x;
- } else if (factor == 5.f) {
- return Resolution::Scale5x;
- } else if (factor == 6.f) {
- return Resolution::Scale6x;
- } else if (factor == 7.f) {
- return Resolution::Scale7x;
- } else if (factor == 8.f) {
- return Resolution::Scale8x;
- } else if (factor == 9.f) {
- return Resolution::Scale9x;
- } else if (factor == 10.f) {
- return Resolution::Scale10x;
}
return Resolution::Auto;
}
diff --git a/src/yuzu/configuration/configure_graphics.ui b/src/yuzu/configuration/configure_graphics.ui
index 489156805..366931a9a 100644
--- a/src/yuzu/configuration/configure_graphics.ui
+++ b/src/yuzu/configuration/configure_graphics.ui
@@ -34,7 +34,7 @@
<item>
<widget class="QLabel" name="label">
<property name="text">
- <string>Internal Resolution:</string>
+ <string>Internal Resolution:(Currently does nothing.)</string>
</property>
</widget>
</item>
@@ -47,52 +47,22 @@
</item>
<item>
<property name="text">
- <string>Native (400x240)</string>
+ <string>Native (1280x720)</string>
</property>
</item>
<item>
<property name="text">
- <string>2x Native (800x480)</string>
+ <string>2x Native (2560x1440)</string>
</property>
</item>
<item>
<property name="text">
- <string>3x Native (1200x720)</string>
+ <string>3x Native (3840x2160)</string>
</property>
</item>
<item>
<property name="text">
- <string>4x Native (1600x960)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>5x Native (2000x1200)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>6x Native (2400x1440)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>7x Native (2800x1680)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>8x Native (3200x1920)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>9x Native (3600x2160)</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>10x Native (4000x2400)</string>
+ <string>4x Native (5120x2880)</string>
</property>
</item>
</widget>
diff --git a/src/yuzu/configuration/configure_input.cpp b/src/yuzu/configuration/configure_input.cpp
index 4c2a3e738..d92a1fed9 100644
--- a/src/yuzu/configuration/configure_input.cpp
+++ b/src/yuzu/configuration/configure_input.cpp
@@ -54,19 +54,23 @@ ConfigureInput::ConfigureInput(QWidget* parent)
setFocusPolicy(Qt::ClickFocus);
button_map = {
- ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY, ui->buttonDpadUp,
- ui->buttonDpadDown, ui->buttonDpadLeft, ui->buttonDpadRight, ui->buttonL, ui->buttonR,
- ui->buttonStart, ui->buttonSelect, ui->buttonZL, ui->buttonZR, ui->buttonHome,
+ ui->buttonA, ui->buttonB, ui->buttonX, ui->buttonY,
+ ui->buttonLStick, ui->buttonRStick, ui->buttonL, ui->buttonR,
+ ui->buttonZL, ui->buttonZR, ui->buttonPlus, ui->buttonMinus,
+ ui->buttonDpadLeft, ui->buttonDpadUp, ui->buttonDpadRight, ui->buttonDpadDown,
+ ui->buttonLStickLeft, ui->buttonLStickUp, ui->buttonLStickRight, ui->buttonLStickDown,
+ ui->buttonRStickLeft, ui->buttonRStickUp, ui->buttonRStickRight, ui->buttonRStickDown,
+ ui->buttonSL, ui->buttonSR, ui->buttonHome, ui->buttonScreenshot,
};
analog_map = {{
{
- ui->buttonCircleUp, ui->buttonCircleDown, ui->buttonCircleLeft, ui->buttonCircleRight,
- ui->buttonCircleMod,
+ ui->buttonLStickUp, ui->buttonLStickDown, ui->buttonLStickLeft, ui->buttonLStickRight,
+ ui->buttonLStickMod,
},
{
- ui->buttonCStickUp, ui->buttonCStickDown, ui->buttonCStickLeft, ui->buttonCStickRight,
- nullptr,
+ ui->buttonRStickUp, ui->buttonRStickDown, ui->buttonRStickLeft, ui->buttonRStickRight,
+ ui->buttonRStickMod,
},
}};
diff --git a/src/yuzu/configuration/configure_input.ui b/src/yuzu/configuration/configure_input.ui
index 2760787e5..5143c9d72 100644
--- a/src/yuzu/configuration/configure_input.ui
+++ b/src/yuzu/configuration/configure_input.ui
@@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
- <width>370</width>
- <height>534</height>
+ <width>343</width>
+ <height>665</height>
</rect>
</property>
<property name="windowTitle">
@@ -190,7 +190,108 @@
</layout>
</widget>
</item>
- <item row="1" column="0">
+ <item row="3" column="1">
+ <widget class="QGroupBox" name="faceButtons_6">
+ <property name="title">
+ <string>Misc.</string>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_25">
+ <item>
+ <widget class="QLabel" name="label_29">
+ <property name="text">
+ <string>Plus:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonPlus">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="0" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_26">
+ <item>
+ <widget class="QLabel" name="label_30">
+ <property name="text">
+ <string>Minus:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonMinus">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_27">
+ <item>
+ <widget class="QLabel" name="label_31">
+ <property name="text">
+ <string>Home:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonHome">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_28">
+ <item>
+ <widget class="QLabel" name="label_11">
+ <property name="text">
+ <string>Screen
+Capture:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonScreenshot">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="1">
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="3" column="0">
<widget class="QGroupBox" name="faceButtons_3">
<property name="title">
<string>Shoulder Buttons</string>
@@ -274,13 +375,49 @@
</item>
</layout>
</item>
+ <item row="2" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_8">
+ <item>
+ <widget class="QLabel" name="label_7">
+ <property name="text">
+ <string>SL:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonSL">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="2" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_29">
+ <item>
+ <widget class="QLabel" name="label_8">
+ <property name="text">
+ <string>SR:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QPushButton" name="buttonSR">
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
</layout>
</widget>
</item>
- <item row="1" column="1">
+ <item row="1" column="0">
<widget class="QGroupBox" name="faceButtons_4">
<property name="title">
- <string>Circle Pad</string>
+ <string>Left Stick</string>
</property>
<property name="flat">
<bool>false</bool>
@@ -299,7 +436,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCircleLeft">
+ <widget class="QPushButton" name="buttonLStickLeft">
<property name="text">
<string/>
</property>
@@ -317,7 +454,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCircleRight">
+ <widget class="QPushButton" name="buttonLStickRight">
<property name="text">
<string/>
</property>
@@ -335,7 +472,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCircleUp">
+ <widget class="QPushButton" name="buttonLStickUp">
<property name="text">
<string/>
</property>
@@ -353,7 +490,7 @@
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCircleDown">
+ <widget class="QPushButton" name="buttonLStickDown">
<property name="text">
<string/>
</property>
@@ -361,32 +498,17 @@
</item>
</layout>
</item>
- </layout>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QGroupBox" name="faceButtons_5">
- <property name="title">
- <string>C-Stick</string>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- <property name="checkable">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_5">
- <item row="0" column="0">
- <layout class="QVBoxLayout" name="verticalLayout_21">
+ <item row="2" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_7" stretch="0,0">
<item>
- <widget class="QLabel" name="label_25">
+ <widget class="QLabel" name="label_6">
<property name="text">
- <string>Left:</string>
+ <string>Pressed:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCStickLeft">
+ <widget class="QPushButton" name="buttonLStick">
<property name="text">
<string/>
</property>
@@ -394,17 +516,17 @@
</item>
</layout>
</item>
- <item row="0" column="1">
- <layout class="QVBoxLayout" name="verticalLayout_22">
+ <item row="2" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_31">
<item>
- <widget class="QLabel" name="label_27">
+ <widget class="QLabel" name="label_9">
<property name="text">
- <string>Right:</string>
+ <string>Modifier:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCStickRight">
+ <widget class="QPushButton" name="buttonLStickMod">
<property name="text">
<string/>
</property>
@@ -412,17 +534,35 @@
</item>
</layout>
</item>
- <item row="1" column="0">
- <layout class="QVBoxLayout" name="verticalLayout_23">
+ </layout>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QGroupBox" name="faceButtons_5">
+ <property name="title">
+ <string>Right Stick</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="flat">
+ <bool>false</bool>
+ </property>
+ <property name="checkable">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="1" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_24">
<item>
- <widget class="QLabel" name="label_28">
+ <widget class="QLabel" name="label_26">
<property name="text">
- <string>Up:</string>
+ <string>Down:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCStickUp">
+ <widget class="QPushButton" name="buttonRStickDown">
<property name="text">
<string/>
</property>
@@ -430,17 +570,17 @@
</item>
</layout>
</item>
- <item row="1" column="1">
- <layout class="QVBoxLayout" name="verticalLayout_24">
+ <item row="0" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_22">
<item>
- <widget class="QLabel" name="label_26">
+ <widget class="QLabel" name="label_27">
<property name="text">
- <string>Down:</string>
+ <string>Right:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCStickDown">
+ <widget class="QPushButton" name="buttonRStickRight">
<property name="text">
<string/>
</property>
@@ -448,32 +588,17 @@
</item>
</layout>
</item>
- </layout>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QGroupBox" name="faceButtons_6">
- <property name="title">
- <string>Misc.</string>
- </property>
- <property name="flat">
- <bool>false</bool>
- </property>
- <property name="checkable">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_6">
- <item row="0" column="0">
- <layout class="QVBoxLayout" name="verticalLayout_25">
+ <item row="1" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_23">
<item>
- <widget class="QLabel" name="label_29">
+ <widget class="QLabel" name="label_28">
<property name="text">
- <string>Start:</string>
+ <string>Up:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonStart">
+ <widget class="QPushButton" name="buttonRStickUp">
<property name="text">
<string/>
</property>
@@ -481,17 +606,17 @@
</item>
</layout>
</item>
- <item row="0" column="1">
- <layout class="QVBoxLayout" name="verticalLayout_26">
+ <item row="0" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_21">
<item>
- <widget class="QLabel" name="label_30">
+ <widget class="QLabel" name="label_25">
<property name="text">
- <string>Select:</string>
+ <string>Left:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonSelect">
+ <widget class="QPushButton" name="buttonRStickLeft">
<property name="text">
<string/>
</property>
@@ -499,17 +624,17 @@
</item>
</layout>
</item>
- <item row="1" column="0">
- <layout class="QVBoxLayout" name="verticalLayout_27">
+ <item row="2" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_32">
<item>
- <widget class="QLabel" name="label_31">
+ <widget class="QLabel" name="label_10">
<property name="text">
- <string>Home:</string>
+ <string>Modifier:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonHome">
+ <widget class="QPushButton" name="buttonRStickMod">
<property name="text">
<string/>
</property>
@@ -517,17 +642,17 @@
</item>
</layout>
</item>
- <item row="1" column="1">
- <layout class="QVBoxLayout" name="verticalLayout_28">
+ <item row="2" column="0">
+ <layout class="QVBoxLayout" name="verticalLayout_6">
<item>
- <widget class="QLabel" name="label_36">
+ <widget class="QLabel" name="label_5">
<property name="text">
- <string>Circle Mod:</string>
+ <string>Pressed:</string>
</property>
</widget>
</item>
<item>
- <widget class="QPushButton" name="buttonCircleMod">
+ <widget class="QPushButton" name="buttonRStick">
<property name="text">
<string/>
</property>
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-04 14:29:15 +0000