Qt-GUI: Cleaning the option menu (#443)
This commit is contained in:
¥IGA
GitHub
parent
d45563f92c
commit
0b1d7839a3
|
|
@ -39,13 +39,28 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
|
||||||
ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
|
ui->buttonBox->button(QDialogButtonBox::StandardButton::Close)->setFocus();
|
||||||
});
|
});
|
||||||
|
|
||||||
// EMULATOR TAB
|
// GENERAL TAB
|
||||||
{
|
{
|
||||||
|
connect(ui->userNameLineEdit, &QLineEdit::textChanged, this,
|
||||||
|
[](const QString& text) { Config::setUserName(text.toStdString()); });
|
||||||
|
|
||||||
connect(ui->consoleLanguageComboBox, &QComboBox::currentIndexChanged, this,
|
connect(ui->consoleLanguageComboBox, &QComboBox::currentIndexChanged, this,
|
||||||
[](int index) { Config::setLanguage(index); });
|
[](int index) { Config::setLanguage(index); });
|
||||||
|
|
||||||
connect(ui->userNameLineEdit, &QLineEdit::textChanged, this,
|
connect(ui->fullscreenCheckBox, &QCheckBox::stateChanged, this,
|
||||||
[](const QString& text) { Config::setUserName(text.toStdString()); });
|
[](int val) { Config::setFullscreenMode(val); });
|
||||||
|
|
||||||
|
connect(ui->showSplashCheckBox, &QCheckBox::stateChanged, this,
|
||||||
|
[](int val) { Config::setShowSplash(val); });
|
||||||
|
|
||||||
|
connect(ui->ps4proCheckBox, &QCheckBox::stateChanged, this,
|
||||||
|
[](int val) { Config::setNeoMode(val); });
|
||||||
|
|
||||||
|
connect(ui->logTypeComboBox, &QComboBox::currentTextChanged, this,
|
||||||
|
[](const QString& text) { Config::setLogType(text.toStdString()); });
|
||||||
|
|
||||||
|
connect(ui->logFilterLineEdit, &QLineEdit::textChanged, this,
|
||||||
|
[](const QString& text) { Config::setLogFilter(text.toStdString()); });
|
||||||
}
|
}
|
||||||
|
|
||||||
// GPU TAB
|
// GPU TAB
|
||||||
|
|
@ -74,24 +89,6 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
|
||||||
[](int val) { Config::setDumpPM4(val); });
|
[](int val) { Config::setDumpPM4(val); });
|
||||||
}
|
}
|
||||||
|
|
||||||
// GENERAL TAB
|
|
||||||
{
|
|
||||||
connect(ui->fullscreenCheckBox, &QCheckBox::stateChanged, this,
|
|
||||||
[](int val) { Config::setFullscreenMode(val); });
|
|
||||||
|
|
||||||
connect(ui->showSplashCheckBox, &QCheckBox::stateChanged, this,
|
|
||||||
[](int val) { Config::setShowSplash(val); });
|
|
||||||
|
|
||||||
connect(ui->ps4proCheckBox, &QCheckBox::stateChanged, this,
|
|
||||||
[](int val) { Config::setNeoMode(val); });
|
|
||||||
|
|
||||||
connect(ui->logTypeComboBox, &QComboBox::currentTextChanged, this,
|
|
||||||
[](const QString& text) { Config::setLogType(text.toStdString()); });
|
|
||||||
|
|
||||||
connect(ui->logFilterLineEdit, &QLineEdit::textChanged, this,
|
|
||||||
[](const QString& text) { Config::setLogFilter(text.toStdString()); });
|
|
||||||
}
|
|
||||||
|
|
||||||
// DEBUG TAB
|
// DEBUG TAB
|
||||||
{
|
{
|
||||||
connect(ui->debugDump, &QCheckBox::stateChanged, this,
|
connect(ui->debugDump, &QCheckBox::stateChanged, this,
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<!-- SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
<!-- SPDX-FileCopyrightText: Copyright 2024 shadPS4 Emulator Project
|
||||||
SPDX-License-Identifier: GPL-2.0-or-later -->
|
SPDX-License-Identifier: GPL-2.0-or-later -->
|
||||||
|
|
||||||
<ui version="4.0">
|
<ui version="4.0">
|
||||||
<class>SettingsDialog</class>
|
<class>SettingsDialog</class>
|
||||||
<widget class="QDialog" name="SettingsDialog">
|
<widget class="QDialog" name="SettingsDialog">
|
||||||
|
|
@ -46,8 +45,8 @@
|
||||||
<rect>
|
<rect>
|
||||||
<x>0</x>
|
<x>0</x>
|
||||||
<y>0</y>
|
<y>0</y>
|
||||||
<width>1006</width>
|
<width>1002</width>
|
||||||
<height>720</height>
|
<height>710</height>
|
||||||
</rect>
|
</rect>
|
||||||
</property>
|
</property>
|
||||||
<property name="sizePolicy">
|
<property name="sizePolicy">
|
||||||
|
|
@ -59,15 +58,47 @@
|
||||||
<property name="currentIndex">
|
<property name="currentIndex">
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<widget class="QWidget" name="emulatorTab">
|
<widget class="QWidget" name="generalTab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Emulator</string>
|
<string>General</string>
|
||||||
</attribute>
|
</attribute>
|
||||||
<layout class="QVBoxLayout" name="emulatorTabVLayout" stretch="0,0">
|
<layout class="QVBoxLayout" name="generalTabVLayout" stretch="0,1,0,0,0,0,0">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="emulatorTabHLayout" stretch="1,1,1">
|
<layout class="QHBoxLayout" name="generalTabHLayout" stretch="1,1,1">
|
||||||
<item>
|
<item>
|
||||||
<layout class="QVBoxLayout" name="emulatorTabLayoutLeft">
|
<layout class="QVBoxLayout" name="generalTabLayoutLeft">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="emuSettings">
|
||||||
|
<property name="title">
|
||||||
|
<string>Emulator Settings</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="emuSettingsLayout">
|
||||||
|
<item>
|
||||||
|
<layout class="QVBoxLayout" name="vLayoutUserName">
|
||||||
|
<property name="spacing">
|
||||||
|
<number>6</number>
|
||||||
|
</property>
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<layout class="QHBoxLayout" name="hLayoutUserName">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="userName">
|
||||||
|
<property name="title">
|
||||||
|
<string>Username</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="userNameLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QLineEdit" name="userNameLineEdit"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="consoleLanguageGroupBox">
|
<widget class="QGroupBox" name="consoleLanguageGroupBox">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
|
|
@ -232,7 +263,98 @@
|
||||||
</widget>
|
</widget>
|
||||||
</item>
|
</item>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QVBoxLayout" name="vLayoutUserName">
|
<widget class="QCheckBox" name="fullscreenCheckBox">
|
||||||
|
<property name="text">
|
||||||
|
<string>Enable Fullscreen</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="showSplashCheckBox">
|
||||||
|
<property name="text">
|
||||||
|
<string>Show Splash</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<widget class="QCheckBox" name="ps4proCheckBox">
|
||||||
|
<property name="text">
|
||||||
|
<string>Is PS4 Pro</string>
|
||||||
|
</property>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<spacer name="emulatorTabSpacerLeft">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QVBoxLayout" name="emulatorTabLayoutMiddle">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="loggerGroupBox">
|
||||||
|
<property name="title">
|
||||||
|
<string>Logger Settings</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="loggerLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QWidget" name="LogTypeWidget" native="true">
|
||||||
|
<layout class="QVBoxLayout" name="LogTypeLayout">
|
||||||
|
<property name="leftMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="topMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="rightMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<property name="bottomMargin">
|
||||||
|
<number>0</number>
|
||||||
|
</property>
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="logTypeGroupBox">
|
||||||
|
<property name="title">
|
||||||
|
<string>Log Type</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="logTypeBoxLayout">
|
||||||
|
<item>
|
||||||
|
<widget class="QComboBox" name="logTypeComboBox">
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>async</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<property name="text">
|
||||||
|
<string>sync</string>
|
||||||
|
</property>
|
||||||
|
</item>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QVBoxLayout" name="vLayoutLogFilter">
|
||||||
<property name="spacing">
|
<property name="spacing">
|
||||||
<number>6</number>
|
<number>6</number>
|
||||||
</property>
|
</property>
|
||||||
|
|
@ -240,15 +362,51 @@
|
||||||
<number>0</number>
|
<number>0</number>
|
||||||
</property>
|
</property>
|
||||||
<item>
|
<item>
|
||||||
<layout class="QHBoxLayout" name="hLayoutUserName">
|
<layout class="QHBoxLayout" name="hLayoutLogFilter">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QGroupBox" name="userName">
|
<widget class="QGroupBox" name="logFilter">
|
||||||
<property name="title">
|
<property name="title">
|
||||||
<string>Username</string>
|
<string>Log Filter</string>
|
||||||
</property>
|
</property>
|
||||||
<layout class="QVBoxLayout" name="userNameLayout">
|
<layout class="QVBoxLayout" name="logFilterLayout">
|
||||||
<item>
|
<item>
|
||||||
<widget class="QLineEdit" name="userNameLineEdit"/>
|
<widget class="QLineEdit" name="logFilterLineEdit"/>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</widget>
|
||||||
|
</item>
|
||||||
|
</layout>
|
||||||
|
</item>
|
||||||
|
<item>
|
||||||
|
<layout class="QVBoxLayout" name="generalTabLayoutRight">
|
||||||
|
<item>
|
||||||
|
<widget class="QGroupBox" name="additionalSettings">
|
||||||
|
<property name="title">
|
||||||
|
<string>Additional Settings</string>
|
||||||
|
</property>
|
||||||
|
<layout class="QVBoxLayout" name="additionalSettingsVLayout">
|
||||||
|
<item>
|
||||||
|
<spacer name="emulatorTabSpacerRight">
|
||||||
|
<property name="orientation">
|
||||||
|
<enum>Qt::Orientation::Vertical</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeType">
|
||||||
|
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
|
||||||
|
</property>
|
||||||
|
<property name="sizeHint" stdset="0">
|
||||||
|
<size>
|
||||||
|
<width>0</width>
|
||||||
|
<height>0</height>
|
||||||
|
</size>
|
||||||
|
</property>
|
||||||
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
|
|
@ -309,8 +467,6 @@
|
||||||
</property>
|
</property>
|
||||||
</spacer>
|
</spacer>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<layout class="QVBoxLayout" name="emulatorTabLayoutMiddle_2"/>
|
<layout class="QVBoxLayout" name="emulatorTabLayoutMiddle_2"/>
|
||||||
</item>
|
</item>
|
||||||
|
|
@ -324,8 +480,6 @@
|
||||||
</property>
|
</property>
|
||||||
</layout>
|
</layout>
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
<item>
|
||||||
<spacer name="emulatorTabSpacer_2">
|
<spacer name="emulatorTabSpacer_2">
|
||||||
<property name="orientation">
|
<property name="orientation">
|
||||||
|
|
@ -645,192 +799,6 @@
|
||||||
</item>
|
</item>
|
||||||
</layout>
|
</layout>
|
||||||
</widget>
|
</widget>
|
||||||
<widget class="QWidget" name="generalTab">
|
|
||||||
<attribute name="title">
|
|
||||||
<string>General</string>
|
|
||||||
</attribute>
|
|
||||||
<layout class="QVBoxLayout" name="generalTabVLayout" stretch="0,1">
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="generalTabHLayout" stretch="1,1,1">
|
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="generalTabLayoutLeft">
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="emuSettings">
|
|
||||||
<property name="title">
|
|
||||||
<string>Emulator Settings</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="emuSettingsLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="fullscreenCheckBox">
|
|
||||||
<property name="text">
|
|
||||||
<string>Enable Fullscreen</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="showSplashCheckBox">
|
|
||||||
<property name="text">
|
|
||||||
<string>Show Splash</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<widget class="QCheckBox" name="ps4proCheckBox">
|
|
||||||
<property name="text">
|
|
||||||
<string>Is PS4 Pro</string>
|
|
||||||
</property>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="emulatorTabSpacerLeft">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Orientation::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeType">
|
|
||||||
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="emulatorTabLayoutMiddle">
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="loggerGroupBox">
|
|
||||||
<property name="title">
|
|
||||||
<string>Logger Settings</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="loggerLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QWidget" name="LogTypeWidget" native="true">
|
|
||||||
<layout class="QVBoxLayout" name="LogTypeLayout">
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="topMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="rightMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<property name="bottomMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="logTypeGroupBox">
|
|
||||||
<property name="title">
|
|
||||||
<string>Log Type</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="logTypeBoxLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QComboBox" name="logTypeComboBox">
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>async</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<property name="text">
|
|
||||||
<string>sync</string>
|
|
||||||
</property>
|
|
||||||
</item>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="vLayoutLogFilter">
|
|
||||||
<property name="spacing">
|
|
||||||
<number>6</number>
|
|
||||||
</property>
|
|
||||||
<property name="leftMargin">
|
|
||||||
<number>0</number>
|
|
||||||
</property>
|
|
||||||
<item>
|
|
||||||
<layout class="QHBoxLayout" name="hLayoutLogFilter">
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="logFilter">
|
|
||||||
<property name="title">
|
|
||||||
<string>Log Filter</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="logFilterLayout">
|
|
||||||
<item>
|
|
||||||
<widget class="QLineEdit" name="logFilterLineEdit"/>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<layout class="QVBoxLayout" name="generalTabLayoutRight">
|
|
||||||
<item>
|
|
||||||
<widget class="QGroupBox" name="additionalSettings">
|
|
||||||
<property name="title">
|
|
||||||
<string>Additional Settings</string>
|
|
||||||
</property>
|
|
||||||
<layout class="QVBoxLayout" name="additionalSettingsVLayout">
|
|
||||||
<item>
|
|
||||||
<spacer name="emulatorTabSpacerRight">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Orientation::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeType">
|
|
||||||
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</item>
|
|
||||||
<item>
|
|
||||||
<spacer name="emulatorTabSpacer">
|
|
||||||
<property name="orientation">
|
|
||||||
<enum>Qt::Orientation::Vertical</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeType">
|
|
||||||
<enum>QSizePolicy::Policy::MinimumExpanding</enum>
|
|
||||||
</property>
|
|
||||||
<property name="sizeHint" stdset="0">
|
|
||||||
<size>
|
|
||||||
<width>0</width>
|
|
||||||
<height>0</height>
|
|
||||||
</size>
|
|
||||||
</property>
|
|
||||||
</spacer>
|
|
||||||
</item>
|
|
||||||
</layout>
|
|
||||||
</widget>
|
|
||||||
<widget class="QWidget" name="debugTab">
|
<widget class="QWidget" name="debugTab">
|
||||||
<attribute name="title">
|
<attribute name="title">
|
||||||
<string>Debug</string>
|
<string>Debug</string>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue