diff --git a/pcsx2-qt/MainWindow.ui b/pcsx2-qt/MainWindow.ui
index 17b0cad86b..17c9972af8 100644
--- a/pcsx2-qt/MainWindow.ui
+++ b/pcsx2-qt/MainWindow.ui
@@ -6,8 +6,8 @@
0
0
- 800
- 700
+ 950
+ 640
@@ -32,7 +32,7 @@
0
0
- 800
+ 950
22
diff --git a/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui b/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui
index 549f274a19..7c2088c426 100644
--- a/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui
+++ b/pcsx2-qt/Settings/ControllerGlobalSettingsWidget.ui
@@ -6,8 +6,8 @@
0
0
- 880
- 712
+ 900
+ 500
diff --git a/pcsx2-qt/Settings/EmulationSettingsWidget.cpp b/pcsx2-qt/Settings/EmulationSettingsWidget.cpp
index 5a09f20d0f..ccad521570 100644
--- a/pcsx2-qt/Settings/EmulationSettingsWidget.cpp
+++ b/pcsx2-qt/Settings/EmulationSettingsWidget.cpp
@@ -27,10 +27,12 @@ static constexpr u32 DEFAULT_FRAME_LATENCY = 2;
static void FillComboBoxWithEmulationSpeeds(QComboBox* cb)
{
+// cb->addItem(qApp->translate("GeneralSettingsWidget", "Custom"),;// TODO: Make use of getInteger to get manual overrides from users
+ // for speed choice along with dropdown presets.
cb->addItem(qApp->translate("GeneralSettingsWidget", "Unlimited"), QVariant(0.0f));
- static const int speeds[] = {10, 20, 30, 40, 50, 60, 70, 80, 90, 100, 125, 150, 175,
- 200, 250, 300, 350, 400, 450, 500, 600, 700, 800, 900, 1000};
+ static const int speeds[] = {1, 10, 25, 50, 75, 90, 100, 110,
+ 120, 150, 175, 200, 300, 400, 500, 1000};
for (const int speed : speeds)
{
cb->addItem(qApp->translate("EmulationSettingsWidget", "%1% [%2 FPS (NTSC) / %3 FPS (PAL)]")
diff --git a/pcsx2-qt/Settings/EmulationSettingsWidget.ui b/pcsx2-qt/Settings/EmulationSettingsWidget.ui
index ae530145e3..844873e8a0 100644
--- a/pcsx2-qt/Settings/EmulationSettingsWidget.ui
+++ b/pcsx2-qt/Settings/EmulationSettingsWidget.ui
@@ -75,7 +75,7 @@
-
- Frame Pacing/Latency Control
+ Frame Pacing / Latency Control
-
diff --git a/pcsx2-qt/Settings/InterfaceSettingsWidget.ui b/pcsx2-qt/Settings/InterfaceSettingsWidget.ui
index 2620a71ad2..2e79617188 100644
--- a/pcsx2-qt/Settings/InterfaceSettingsWidget.ui
+++ b/pcsx2-qt/Settings/InterfaceSettingsWidget.ui
@@ -70,7 +70,7 @@
-
- Save/Load State On Exit/Resume
+ Save Or Load State On Exit / Resume
diff --git a/pcsx2-qt/Settings/SettingsDialog.ui b/pcsx2-qt/Settings/SettingsDialog.ui
index 0aa6849191..29b4fc3225 100644
--- a/pcsx2-qt/Settings/SettingsDialog.ui
+++ b/pcsx2-qt/Settings/SettingsDialog.ui
@@ -9,12 +9,12 @@
0
0
- 780
- 650
+ 800
+ 500
-
+
0
0
@@ -26,7 +26,7 @@
-
-
+
0
0
@@ -151,7 +151,7 @@
0
- 120
+ 100
diff --git a/pcsx2-qt/Settings/SystemSettingsWidget.ui b/pcsx2-qt/Settings/SystemSettingsWidget.ui
index 4e33de1ac8..070425355b 100644
--- a/pcsx2-qt/Settings/SystemSettingsWidget.ui
+++ b/pcsx2-qt/Settings/SystemSettingsWidget.ui
@@ -135,7 +135,7 @@
-
- Chop/Zero (Default)
+ Chop / Zero (Default)
@@ -206,7 +206,7 @@
-
- Chop/Zero (Default)
+ Chop / Zero (Default)
diff --git a/pcsx2/VMManager.cpp b/pcsx2/VMManager.cpp
index 399eaa4c15..cac9494be9 100644
--- a/pcsx2/VMManager.cpp
+++ b/pcsx2/VMManager.cpp
@@ -431,11 +431,11 @@ static void LoadPatches(const std::string& crc_string, bool show_messages, bool
if (cheat_count > 0 || ws_patch_count > 0)
{
message.Write(" are active.");
- Host::AddKeyedOSDMessage("LoadPatches", message.GetString().ToStdString(), 10.0f);
+ Host::AddKeyedOSDMessage("LoadPatches", message.GetString().ToStdString(), 5.0f);
}
else if (show_messages_when_disabled)
{
- Host::AddKeyedOSDMessage("LoadPatches", "No cheats or widescreen patches are found/enabled.", 10.0f);
+ Host::AddKeyedOSDMessage("LoadPatches", "No cheats or patches (widescreen, compatibility or others) are found / enabled.", 8.0f);
}
}
}
@@ -831,11 +831,11 @@ bool VMManager::LoadStateFromSlot(s32 slot)
const std::string filename(GetCurrentSaveStateFileName(slot));
if (filename.empty())
{
- Host::AddKeyedFormattedOSDMessage("LoadStateFromSlot", 10.0f, "There is no save state in slot %d.", slot);
+ Host::AddKeyedFormattedOSDMessage("LoadStateFromSlot", 5.0f, "There is no save state in slot %d.", slot);
return false;
}
- Host::AddKeyedFormattedOSDMessage("LoadStateFromSlot", 10.0f, "Loading state from slot %d...", slot);
+ Host::AddKeyedFormattedOSDMessage("LoadStateFromSlot", 5.0f, "Loading state from slot %d...", slot);
return DoLoadState(filename.c_str());
}
@@ -883,7 +883,7 @@ bool VMManager::ChangeDisc(std::string path)
const bool result = DoCDVDopen();
if (result)
{
- Host::AddFormattedOSDMessage(10.0f, "Disc changed to '%s'.", display_name.c_str());
+ Host::AddFormattedOSDMessage(5.0f, "Disc changed to '%s'.", display_name.c_str());
}
else
{
@@ -1158,7 +1158,7 @@ static void HotkeyAdjustTargetSpeed(double delta)
VMManager::SetLimiterMode(LimiterModeType::Nominal);
gsUpdateFrequency(EmuConfig);
GetMTGS().SetVSync(EmuConfig.GetEffectiveVsyncMode());
- Host::AddKeyedFormattedOSDMessage("SpeedChanged", 10.0f, "Target speed set to %.0f%%.", std::round(EmuConfig.Framerate.NominalScalar * 100.0));
+ Host::AddKeyedFormattedOSDMessage("SpeedChanged", 5.0f, "Target speed set to %.0f%%.", std::round(EmuConfig.Framerate.NominalScalar * 100.0));
}
static constexpr s32 CYCLE_SAVE_STATE_SLOTS = 10;
@@ -1188,11 +1188,11 @@ static void HotkeyCycleSaveSlot(s32 delta)
if (len > 0 && date_buf[len - 1] == '\n')
date_buf[len - 1] = 0;
- Host::AddKeyedFormattedOSDMessage("CycleSaveSlot", 10.0f, "Save slot %d selected (last save: %s).", s_current_save_slot, date_buf);
+ Host::AddKeyedFormattedOSDMessage("CycleSaveSlot", 5.0f, "Save slot %d selected (last save: %s).", s_current_save_slot, date_buf);
}
else
{
- Host::AddKeyedFormattedOSDMessage("CycleSaveSlot", 10.0f, "Save slot %d selected (no save yet).", s_current_save_slot);
+ Host::AddKeyedFormattedOSDMessage("CycleSaveSlot", 5.0f, "Save slot %d selected (no save yet).", s_current_save_slot);
}
}