mirrors/shadPS4
1
0
Fork 0
mirror of https://github.com/shadps4-emu/shadPS4.git synced 2025-08-06 01:12:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change location of widget style selection button

Browse Source 
This should fix any conflicts with 433d9459e0
This commit is contained in:
tomboylover93 2024-12-22 13:01:51 -03:00
parent e2dbef12c7
commit e63fa963a3
4 changed files with 239 additions and 282 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/qt_gui/main_window.cpp
View File

@ -996,10 +996,10 @@ void MainWindow::SetLastUsedTheme() {
isSystemDarkMode = false; isSystemDarkMode = false;
} }
#endif #endif
if (isSystemDarkMode = true) { if (isSystemDarkMode == true) {
isIconBlack = false; isIconBlack = false;
SetUiIcons(false); SetUiIcons(false);
} else if (isSystemDarkMode = false) { } else if (isSystemDarkMode == false) {
isIconBlack = true; isIconBlack = true;
SetUiIcons(true); SetUiIcons(true);
} }
@ -1169,7 +1169,6 @@ bool MainWindow::eventFilter(QObject* obj, QEvent* event) {
} }
if (event->type() == QEvent::ApplicationPaletteChange) { if (event->type() == QEvent::ApplicationPaletteChange) {
if (ui->setThemeSystem->isChecked()) { if (ui->setThemeSystem->isChecked()) {
bool isSystemDarkMode; bool isSystemDarkMode;
#ifdef __linux__ #ifdef __linux__

6
src/qt_gui/settings_dialog.cpp
View File

@ -195,7 +195,7 @@ SettingsDialog::SettingsDialog(std::span<const QString> physical_devices, QWidge
ui->updaterGroupBox->installEventFilter(this); ui->updaterGroupBox->installEventFilter(this);
#endif #endif
ui->GUIgroupBox->installEventFilter(this); ui->GUIgroupBox->installEventFilter(this);
ui->widgetGroupBox->installEventFilter(this); ui->widgetComboBox->installEventFilter(this);
// Input // Input
ui->hideCursorGroupBox->installEventFilter(this); ui->hideCursorGroupBox->installEventFilter(this);
@ -401,8 +401,8 @@ void SettingsDialog::updateNoteTextEdit(const QString& elementName) {
#endif #endif
} else if (elementName == "GUIgroupBox") { } else if (elementName == "GUIgroupBox") {
text = tr("GUIgroupBox"); text = tr("GUIgroupBox");
} else if (elementName == "widgetGroupBox") { } else if (elementName == "widgetComboBox") {
text = tr("widgetGroupBox"); text = tr("widgetComboBox");
} }
// Input // Input

508
src/qt_gui/settings_dialog.ui
View File

@ -12,7 +12,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>854</width> <width>854</width>
<height>660</height> <height>834</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -59,9 +59,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>-97</y>
<width>822</width> <width>815</width>
<height>554</height> <height>618</height>
</rect> </rect>
</property> </property>
<property name="sizePolicy"> <property name="sizePolicy">
@ -296,152 +296,152 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>0</number> <number>0</number>
</property> </property>
</layout> <item alignment="Qt::AlignmentFlag::AlignTop">
</item> <widget class="QGroupBox" name="updaterGroupBox">
<item> <property name="sizePolicy">
<widget class="QGroupBox" name="updaterGroupBox"> <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
<property name="sizePolicy"> <horstretch>0</horstretch>
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> <verstretch>0</verstretch>
<horstretch>0</horstretch> </sizepolicy>
<verstretch>0</verstretch> </property>
</sizepolicy> <property name="minimumSize">
</property> <size>
<property name="minimumSize"> <width>275</width>
<size> <height>0</height>
<width>275</width> </size>
<height>0</height> </property>
</size> <property name="maximumSize">
</property> <size>
<property name="maximumSize"> <width>16777215</width>
<size> <height>16777215</height>
<width>16777215</width> </size>
<height>16777215</height> </property>
</size> <property name="title">
</property> <string>Update</string>
<property name="title"> </property>
<string>Update</string> <layout class="QVBoxLayout" name="UpdateLayout" stretch="0,0,0">
</property> <property name="spacing">
<layout class="QVBoxLayout" name="UpdateLayout" stretch="0,0,0"> <number>5</number>
<property name="spacing">
<number>5</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<item>
<widget class="QGroupBox" name="updaterComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="topMargin">
<size> <number>1</number>
<width>0</width>
<height>75</height>
</size>
</property> </property>
<property name="maximumSize"> <property name="rightMargin">
<size> <number>11</number>
<width>16777215</width>
<height>16777215</height>
</size>
</property> </property>
<property name="title"> <property name="bottomMargin">
<string>Update Channel</string> <number>11</number>
</property> </property>
<layout class="QVBoxLayout" name="UpdateChannelLayout"> <item>
<property name="spacing"> <widget class="QGroupBox" name="updaterComboBox">
<number>7</number> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<property name="leftMargin"> <horstretch>0</horstretch>
<number>11</number> <verstretch>0</verstretch>
</property> </sizepolicy>
<property name="topMargin"> </property>
<number>11</number> <property name="minimumSize">
</property> <size>
<property name="rightMargin"> <width>0</width>
<number>11</number> <height>75</height>
</property> </size>
<property name="bottomMargin"> </property>
<number>11</number> <property name="maximumSize">
</property> <size>
<item> <width>16777215</width>
<widget class="QComboBox" name="updateComboBox"> <height>16777215</height>
<property name="sizePolicy"> </size>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> </property>
<horstretch>0</horstretch> <property name="title">
<verstretch>0</verstretch> <string>Update Channel</string>
</sizepolicy> </property>
<layout class="QVBoxLayout" name="UpdateChannelLayout">
<property name="spacing">
<number>7</number>
</property>
<property name="leftMargin">
<number>11</number>
</property>
<property name="topMargin">
<number>11</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property> </property>
<item> <item>
<property name="text"> <widget class="QComboBox" name="updateComboBox">
<string>Release</string> <property name="sizePolicy">
</property> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<item>
<property name="text">
<string>Release</string>
</property>
</item>
<item>
<property name="text">
<string>Nightly</string>
</property>
</item>
</widget>
</item> </item>
<item> </layout>
<property name="text"> </widget>
<string>Nightly</string> </item>
</property> <item>
</item> <widget class="QPushButton" name="checkUpdateButton">
</widget> <property name="sizePolicy">
</item> <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
</layout> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item> </property>
<widget class="QPushButton" name="checkUpdateButton"> <property name="minimumSize">
<property name="sizePolicy"> <size>
<sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed"> <width>197</width>
<horstretch>0</horstretch> <height>28</height>
<verstretch>0</verstretch> </size>
</sizepolicy> </property>
</property> <property name="maximumSize">
<property name="minimumSize"> <size>
<size> <width>16777215</width>
<width>197</width> <height>16777215</height>
<height>28</height> </size>
</size> </property>
</property> <property name="text">
<property name="maximumSize"> <string>Check for Updates</string>
<size> </property>
<width>16777215</width> </widget>
<height>16777215</height> </item>
</size> <item>
</property> <widget class="QCheckBox" name="updateCheckBox">
<property name="text"> <property name="sizePolicy">
<string>Check for Updates</string> <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
</property> <horstretch>0</horstretch>
</widget> <verstretch>0</verstretch>
</item> </sizepolicy>
<item> </property>
<widget class="QCheckBox" name="updateCheckBox"> <property name="font">
<property name="sizePolicy"> <font>
<sizepolicy hsizetype="Preferred" vsizetype="Fixed"> <pointsize>11</pointsize>
<horstretch>0</horstretch> <bold>false</bold>
<verstretch>0</verstretch> </font>
</sizepolicy> </property>
</property> <property name="text">
<property name="font"> <string>Check for Updates at Startup</string>
<font> </property>
<pointsize>11</pointsize> </widget>
<bold>false</bold> </item>
</font> </layout>
</property> </widget>
<property name="text"> </item>
<string>Check for Updates at Startup</string> </layout>
</property>
</widget>
</item>
</layout>
</widget>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="GUITabLayoutMiddle" stretch="0"> <layout class="QVBoxLayout" name="GUITabLayoutMiddle" stretch="0">
@ -469,6 +469,81 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>11</number> <number>11</number>
</property> </property>
<item>
<widget class="QGroupBox" name="widgetComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>75</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="title">
<string>Current Widget Style</string>
</property>
<layout class="QVBoxLayout" name="currentwidgetLayout">
<item>
<widget class="QComboBox" name="currentwidgetComboBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>Fusion</string>
</property>
</item>
<item>
<property name="text">
<string>System</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QCheckBox" name="disableTrophycheckBox">
<property name="text">
<string>Disable Trophy Pop-ups</string>
</property>
</widget>
</item>
<item> <item>
<layout class="QVBoxLayout" name="GUIMusicLayout"> <layout class="QVBoxLayout" name="GUIMusicLayout">
<property name="topMargin"> <property name="topMargin">
@ -561,142 +636,25 @@
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QWidget" name="GUIwidgetSpacer" native="true">
<property name="minimumSize">
<size>
<width>0</width>
<height>61</height>
</size>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item> <item>
<layout class="QVBoxLayout" name="WidgetTabLayoutRight"> <layout class="QVBoxLayout" name="EmptyTabLayoutRight">
<item> <item>
<widget class="QGroupBox" name="widgetGroupBox"> <spacer name="emptyHorizontalSpacer">
<property name="sizePolicy"> <property name="orientation">
<sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding"> <enum>Qt::Orientation::Horizontal</enum>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="minimumSize"> <property name="sizeHint" stdset="0">
<size> <size>
<width>275</width> <width>40</width>
<height>0</height> <height>20</height>
</size> </size>
</property> </property>
<property name="maximumSize"> </spacer>
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="title">
<string>Widget Style</string>
</property>
<layout class="QVBoxLayout" name="widgetLayout" stretch="0,0">
<property name="spacing">
<number>5</number>
</property>
<property name="topMargin">
<number>1</number>
</property>
<property name="rightMargin">
<number>11</number>
</property>
<property name="bottomMargin">
<number>11</number>
</property>
<item>
<widget class="QGroupBox" name="widgetComboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>75</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="title">
<string>Current Widget Style</string>
</property>
<layout class="QVBoxLayout" name="currentwidgetLayout">
<item>
<widget class="QComboBox" name="currentwidgetComboBox">
<property name="enabled">
<bool>true</bool>
</property>
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="sizeIncrement">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<property name="baseSize">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
<item>
<property name="text">
<string>Fusion</string>
</property>
</item>
<item>
<property name="text">
<string>System</string>
</property>
</item>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item> </item>
</layout> </layout>
</item> </item>
@ -803,7 +761,7 @@
<property name="bottomMargin"> <property name="bottomMargin">
<number>5</number> <number>5</number>
</property> </property>
<item alignment="Qt::AlignmentFlag::AlignHCenter"> <item>
<widget class="QSpinBox" name="idleTimeoutSpinBox"> <widget class="QSpinBox" name="idleTimeoutSpinBox">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -1235,8 +1193,8 @@
<widget class="QListWidget" name="gameFoldersListWidget"> <widget class="QListWidget" name="gameFoldersListWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>6</x> <x>0</x>
<y>32</y> <y>20</y>
<width>401</width> <width>401</width>
<height>331</height> <height>331</height>
</rect> </rect>
@ -1246,9 +1204,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>100</x> <x>100</x>
<y>380</y> <y>360</y>
<width>91</width> <width>91</width>
<height>42</height> <height>24</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@ -1259,9 +1217,9 @@
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>199</x> <x>199</x>
<y>380</y> <y>360</y>
<width>91</width> <width>91</width>
<height>42</height> <height>24</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">

2
src/qt_gui/translations/en.ts
View File

@ -1203,7 +1203,7 @@
</message> </message>
<message> <message>
<location filename="../settings_dialog.cpp" line="307"/> <location filename="../settings_dialog.cpp" line="307"/>
<source>widgetGroupBox</source> <source>widgetComboBox</source>
<translation>Widget Styles:\nChoose the widget style to be applied at startup. Defaults to Fusion. "System" uses your system's widget style (Breeze, Oxygen, Kvantum etc). Requires an app restart to apply.</translation> <translation>Widget Styles:\nChoose the widget style to be applied at startup. Defaults to Fusion. "System" uses your system's widget style (Breeze, Oxygen, Kvantum etc). Requires an app restart to apply.</translation>
</message> </message>
<message> <message>