diff --git a/dist/qt_themes/suyu_assets/Suyu_Logo.png b/dist/qt_themes/suyu_assets/Suyu_Logo.png new file mode 100755 index 0000000000..db47afa9bd Binary files /dev/null and b/dist/qt_themes/suyu_assets/Suyu_Logo.png differ diff --git a/dist/qt_themes/suyu_assets/Suyu_Name.png b/dist/qt_themes/suyu_assets/Suyu_Name.png new file mode 100755 index 0000000000..c794f2480c Binary files /dev/null and b/dist/qt_themes/suyu_assets/Suyu_Name.png differ diff --git a/src/suyu/loading_screen.ui b/src/suyu/loading_screen.ui index 2422c63b1c..c5d5526f58 100644 --- a/src/suyu/loading_screen.ui +++ b/src/suyu/loading_screen.ui @@ -47,7 +47,7 @@ <property name="bottomMargin"> <number>0</number> </property> - <item alignment="Qt::AlignLeft|Qt::AlignTop"> + <item> <widget class="QLabel" name="logo"> <property name="enabled"> <bool>false</bool> @@ -64,14 +64,51 @@ </widget> </item> <item> - <layout class="QVBoxLayout" name="verticalLayout" stretch="1,0,0,1"> + <layout class="QVBoxLayout" name="verticalLayout" stretch="0,1,0,1"> <property name="spacing"> <number>15</number> </property> <property name="sizeConstraint"> <enum>QLayout::SetNoConstraint</enum> </property> - <item alignment="Qt::AlignHCenter|Qt::AlignBottom"> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QLabel" name="label"> + <property name="enabled"> + <bool>true</bool> + </property> + <property name="sizePolicy"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> + <horstretch>0</horstretch> + <verstretch>0</verstretch> + </sizepolicy> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>65</height> + </size> + </property> + <property name="text"> + <string/> + </property> + <property name="pixmap"> + <pixmap>../../dist/qt_themes/suyu_assets/Suyu_Name.png</pixmap> + </property> + <property name="scaledContents"> + <bool>true</bool> + </property> + <property name="alignment"> + <set>Qt::AlignCenter</set> + </property> + <property name="margin"> + <number>0</number> + </property> + <property name="indent"> + <number>-1</number> + </property> + </widget> + </item> + <item alignment="Qt::AlignHCenter"> <widget class="QLabel" name="stage"> <property name="sizePolicy"> <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> @@ -79,6 +116,12 @@ <verstretch>0</verstretch> </sizepolicy> </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>50</height> + </size> + </property> <property name="styleSheet"> <string notr="true">background-color: black; color: white; font: 500 20pt "Ubuntu";</string> @@ -88,7 +131,7 @@ font: 500 20pt "Ubuntu";</string> </property> </widget> </item> - <item alignment="Qt::AlignHCenter|Qt::AlignTop"> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> <widget class="QProgressBar" name="progress_bar"> <property name="sizePolicy"> <sizepolicy hsizetype="Expanding" vsizetype="Preferred"> @@ -99,7 +142,13 @@ font: 500 20pt "Ubuntu";</string> <property name="minimumSize"> <size> <width>500</width> - <height>20</height> + <height>30</height> + </size> + </property> + <property name="maximumSize"> + <size> + <width>16777215</width> + <height>30</height> </size> </property> <property name="styleSheet"> @@ -126,45 +175,20 @@ border-radius: 6px; </property> </widget> </item> - <item alignment="Qt::AlignHCenter"> - <widget class="QLabel" name="label"> - <property name="enabled"> - <bool>true</bool> - </property> + <item alignment="Qt::AlignHCenter|Qt::AlignVCenter"> + <widget class="QLabel" name="value"> <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Preferred"> + <sizepolicy hsizetype="Preferred" vsizetype="Minimum"> <horstretch>0</horstretch> <verstretch>0</verstretch> </sizepolicy> </property> <property name="maximumSize"> <size> - <width>56</width> - <height>56</height> + <width>16777215</width> + <height>40</height> </size> </property> - <property name="text"> - <string/> - </property> - <property name="pixmap"> - <pixmap>../../dist/qt_themes/default/icons/256x256/suyu.png</pixmap> - </property> - <property name="scaledContents"> - <bool>true</bool> - </property> - <property name="alignment"> - <set>Qt::AlignCenter</set> - </property> - <property name="margin"> - <number>0</number> - </property> - <property name="indent"> - <number>-1</number> - </property> - </widget> - </item> - <item alignment="Qt::AlignHCenter|Qt::AlignTop"> - <widget class="QLabel" name="value"> <property name="toolTip"> <string notr="true"/> </property> @@ -179,7 +203,7 @@ font: 500 15pt "Ubuntu";</string> </item> </layout> </item> - <item alignment="Qt::AlignRight|Qt::AlignBottom"> + <item> <widget class="QLabel" name="banner"> <property name="enabled"> <bool>false</bool>