Merge branch 'develop' of https://github.com/PrismLauncher/PrismLauncher into skin_selector

This commit is contained in:
Trial97
2024-05-18 11:38:18 +03:00
170 changed files with 1801 additions and 1015 deletions

View File

@@ -206,7 +206,7 @@
</property>
</widget>
</item>
<item>
<item>
<widget class="QCheckBox" name="dependenciesDisableBtn">
<property name="toolTip">
<string>Disable the automatic detection, installation, and updating of mod dependencies.</string>
@@ -257,7 +257,7 @@
</widget>
</item>
<item>
<spacer name="verticalSpacer_2">
<spacer name="verticalSpacer_FeaturesTab">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
@@ -271,7 +271,7 @@
</item>
</layout>
</widget>
<widget class="QWidget" name="generalTab">
<widget class="QWidget" name="userInterfaceTab">
<attribute name="title">
<string>User Interface</string>
</attribute>
@@ -320,6 +320,54 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="catBox">
<property name="title">
<string>Cat</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="0" column="0">
<widget class="QLabel" name="catOpacityLabel">
<property name="toolTip">
<string>Set the cat's opacity. 0% is fully transparent and 100% is fully opaque.</string>
</property>
<property name="text">
<string>Opacity</string>
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QSpinBox" name="catOpacitySpinBox">
<property name="specialValueText">
<string/>
</property>
<property name="suffix">
<string>%</string>
</property>
<property name="maximum">
<number>100</number>
</property>
<property name="value">
<number>0</number>
</property>
</widget>
</item>
<item row="0" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="toolsBox">
<property name="sizePolicy">
@@ -346,7 +394,7 @@
</widget>
</item>
<item>
<spacer name="generalTabSpacer">
<spacer name="verticalSpacer_UserInterfaceTab">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>