Lubuntu
/
calamares-settings-ubuntu-old
10
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix pkgselect UI centering bug

Browse Source
ubuntu/oracular
Aaron Rainbolt 3 months ago
parent e073dc915c
commit dcd969079c
2 changed files with 205 additions and 185 deletions
Show Stats Download Patch File Download Diff File

383
common/modules/pkgselect/pkgselect.ui
Unescape View File

@ -28,22 +28,6 @@ QLabel {
}</string> }</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="17" column="1">
<spacer name="verticalSpacer_11">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>3</height>
</size>
</property>
</spacer>
</item>
<item row="9" column="1"> <item row="9" column="1">
<widget class="QRadioButton" name="minimal_button"> <widget class="QRadioButton" name="minimal_button">
<property name="maximumSize"> <property name="maximumSize">
@ -62,70 +46,6 @@ QLabel {
</property> </property>
</widget> </widget>
</item> </item>
<item row="16" column="1">
<widget class="QLabel" name="extraparty_text">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">padding-left: 0px; padding-right: 0px;</string>
</property>
<property name="text">
<string>Install additional third-party packages</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QRadioButton" name="full_button">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>21</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Full Installation</string>
</property>
</widget>
</item>
<item row="10" column="1">
<widget class="QLabel" name="minimal_text">
<property name="font">
<font>
<pointsize>10</pointsize>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>Only the desktop environment</string>
</property>
</widget>
</item>
<item row="0" column="0">
<spacer name="left_spacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Minimum</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="2"> <item row="0" column="2">
<spacer name="right_spacer"> <spacer name="right_spacer">
<property name="orientation"> <property name="orientation">
@ -142,7 +62,7 @@ QLabel {
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="20" column="1"> <item row="21" column="1">
<spacer name="pushup"> <spacer name="pushup">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
@ -155,25 +75,26 @@ QLabel {
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="12" column="1"> <item row="20" column="0" colspan="3">
<widget class="QLabel" name="additional_label"> <widget class="QLabel" name="mandatory_warning_label">
<property name="font"> <property name="font">
<font> <font>
<pointsize>18</pointsize> <pointsize>11</pointsize>
<weight>50</weight> <weight>75</weight>
<bold>false</bold> <italic>false</italic>
<bold>true</bold>
</font> </font>
</property> </property>
<property name="styleSheet">
<string notr="true">padding-left: 0px; padding-right: 0px;</string>
</property>
<property name="text"> <property name="text">
<string>Additional Options</string> <string>Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="1"> <item row="14" column="1">
<widget class="QLabel" name="full_text"> <widget class="QLabel" name="updates_text">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -181,29 +102,10 @@ QLabel {
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>All applications in the Normal Installation, and all extra third-party packages listed below</string> <string>This saves time after installation, and keeps your system secure</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="8" column="1">
<spacer name="verticalSpacer_6">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>10</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1"> <item row="0" column="1">
<spacer name="verticalSpacer"> <spacer name="verticalSpacer">
<property name="orientation"> <property name="orientation">
@ -220,24 +122,8 @@ QLabel {
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="15" column="1"> <item row="2" column="1">
<spacer name="verticalSpacer_3"> <widget class="QRadioButton" name="full_button">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="13" column="1">
<widget class="QCheckBox" name="updates_button">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
@ -250,25 +136,28 @@ QLabel {
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Download and install updates following installation</string> <string>Full Installation</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="14" column="1"> <item row="0" column="0">
<widget class="QLabel" name="updates_text"> <spacer name="left_spacer">
<property name="font"> <property name="orientation">
<font> <enum>Qt::Horizontal</enum>
<pointsize>10</pointsize>
<italic>true</italic>
</font>
</property> </property>
<property name="text"> <property name="sizeType">
<string>This saves time after installation, and keeps your system secure</string> <enum>QSizePolicy::Minimum</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item> </item>
<item row="7" column="1"> <item row="3" column="1">
<widget class="QLabel" name="normal_text"> <widget class="QLabel" name="full_text">
<property name="font"> <property name="font">
<font> <font>
<pointsize>10</pointsize> <pointsize>10</pointsize>
@ -276,12 +165,15 @@ QLabel {
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Web browser, utilities, office software, games, and media players</string> <string>All applications in the Normal Installation, and all extra third-party packages listed below</string>
</property>
<property name="alignment">
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="11" column="1"> <item row="8" column="1">
<spacer name="verticalSpacer_2"> <spacer name="verticalSpacer_6">
<property name="orientation"> <property name="orientation">
<enum>Qt::Vertical</enum> <enum>Qt::Vertical</enum>
</property> </property>
@ -291,13 +183,13 @@ QLabel {
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>20</width> <width>20</width>
<height>20</height> <height>10</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="6" column="1"> <item row="13" column="1">
<widget class="QRadioButton" name="normal_button"> <widget class="QCheckBox" name="updates_button">
<property name="maximumSize"> <property name="maximumSize">
<size> <size>
<width>16777215</width> <width>16777215</width>
@ -310,49 +202,27 @@ QLabel {
</font> </font>
</property> </property>
<property name="text"> <property name="text">
<string>Normal Installation</string> <string>Download and install updates following installation</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="19" column="0" colspan="3">
<widget class="QLabel" name="mandatory_warning_label">
<property name="font">
<font>
<pointsize>11</pointsize>
<weight>75</weight>
<italic>false</italic>
<bold>true</bold>
</font>
</property>
<property name="text">
<string>Note: Ubuntu and flavors are NOT responsible for third-party software installed from this list.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <item row="18" column="1">
<widget class="QLabel" name="apps_label"> <spacer name="verticalSpacer_11">
<property name="font"> <property name="orientation">
<font> <enum>Qt::Vertical</enum>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property> </property>
<property name="styleSheet"> <property name="sizeType">
<string notr="true">padding-left: 0px; padding-right: 0px;</string> <enum>QSizePolicy::Fixed</enum>
</property> </property>
<property name="text"> <property name="sizeHint" stdset="0">
<string>Installation Mode</string> <size>
<width>20</width>
<height>3</height>
</size>
</property> </property>
</widget> </spacer>
</item> </item>
<item row="18" column="1"> <item row="19" column="1">
<widget class="QScrollArea" name="extraparty_scroll"> <widget class="QScrollArea" name="extraparty_scroll">
<property name="widgetResizable"> <property name="widgetResizable">
<bool>true</bool> <bool>true</bool>
@ -571,6 +441,136 @@ QLabel {
</widget> </widget>
</widget> </widget>
</item> </item>
<item row="10" column="1">
<widget class="QLabel" name="minimal_text">
<property name="font">
<font>
<pointsize>10</pointsize>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>Only the desktop environment</string>
</property>
</widget>
</item>
<item row="15" column="1">
<spacer name="verticalSpacer_3">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="1" column="1">
<widget class="QLabel" name="apps_label">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">padding-left: 0px; padding-right: 0px;</string>
</property>
<property name="text">
<string>Installation Mode</string>
</property>
</widget>
</item>
<item row="12" column="1">
<widget class="QLabel" name="additional_label">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">padding-left: 0px; padding-right: 0px;</string>
</property>
<property name="text">
<string>Additional Options</string>
</property>
</widget>
</item>
<item row="7" column="1">
<widget class="QLabel" name="normal_text">
<property name="font">
<font>
<pointsize>10</pointsize>
<italic>true</italic>
</font>
</property>
<property name="text">
<string>Web browser, utilities, office software, games, and media players</string>
</property>
</widget>
</item>
<item row="6" column="1">
<widget class="QRadioButton" name="normal_button">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>21</height>
</size>
</property>
<property name="font">
<font>
<pointsize>12</pointsize>
</font>
</property>
<property name="text">
<string>Normal Installation</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
<item row="16" column="1">
<widget class="QLabel" name="extraparty_text">
<property name="font">
<font>
<pointsize>18</pointsize>
<weight>50</weight>
<bold>false</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">padding-left: 0px; padding-right: 0px;</string>
</property>
<property name="text">
<string>Install additional third-party packages</string>
</property>
</widget>
</item>
<item row="11" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="1"> <item row="4" column="1">
<spacer name="verticalSpacer_5"> <spacer name="verticalSpacer_5">
<property name="orientation"> <property name="orientation">
@ -587,6 +587,19 @@ QLabel {
</property> </property>
</spacer> </spacer>
</item> </item>
<item row="17" column="1">
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>

7
debian/changelog vendored
Unescape View File

@ -1,3 +1,10 @@
calamares-settings-ubuntu (1:24.10.3) oracular; urgency=medium
* Fix pkgselect UI becoming centered when minimal install mode is selected.
(LP: #2076303)
-- Aaron Rainbolt <arraybolt3@ubuntu.com> Thu, 08 Aug 2024 14:25:24 -0500
calamares-settings-ubuntu (1:24.10.2) oracular; urgency=medium calamares-settings-ubuntu (1:24.10.2) oracular; urgency=medium
* kubuntu: Change donate URL to point to Kubuntu's donation page * kubuntu: Change donate URL to point to Kubuntu's donation page

Write Preview
Loading…
Cancel
Save