[welcome] Add standard language-chooser icon

- After discussion with Red Hat UI advice, switch to standard icon
 - Tooltip as well
main
Adriaan de Groot 6 years ago
parent f04d084548
commit 7f8411c3b7

@ -32,6 +32,8 @@ calamares_add_plugin( welcome
WelcomePage.cpp WelcomePage.cpp
UI UI
WelcomePage.ui WelcomePage.ui
RESOURCES
welcome.qrc
LINK_PRIVATE_LIBRARIES LINK_PRIVATE_LIBRARIES
calamaresui calamaresui
${CHECKER_LINK_LIBRARIES} ${CHECKER_LINK_LIBRARIES}

@ -13,6 +13,9 @@
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<property name="toolTip">
<string>Select language</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout"> <layout class="QHBoxLayout" name="horizontalLayout">
<item> <item>
<layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0"> <layout class="QVBoxLayout" name="verticalLayout" stretch="0,0,0,0,0">
@ -46,7 +49,7 @@
</widget> </widget>
</item> </item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,1,2,1,0"> <layout class="QHBoxLayout" name="horizontalLayout_3" stretch="0,0,2,0">
<item> <item>
<spacer name="horizontalSpacer_3"> <spacer name="horizontalSpacer_3">
<property name="orientation"> <property name="orientation">
@ -64,21 +67,15 @@
</spacer> </spacer>
</item> </item>
<item> <item>
<widget class="QLabel" name="label"> <widget class="QLabel" name="label_2">
<property name="sizePolicy"> <property name="toolTip">
<sizepolicy hsizetype="Preferred" vsizetype="Preferred"> <string>Select language</string>
<horstretch>1</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property> </property>
<property name="text"> <property name="text">
<string>&amp;Language:</string> <string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
<property name="buddy"> <property name="pixmap">
<cstring>languageWidget</cstring> <pixmap resource="welcome.qrc">:/welcome/language-icon-48px.png</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -92,19 +89,6 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<spacer name="horizontalSpacer_5">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<spacer name="horizontalSpacer_4"> <spacer name="horizontalSpacer_4">
<property name="orientation"> <property name="orientation">
@ -217,6 +201,8 @@
</item> </item>
</layout> </layout>
</widget> </widget>
<resources/> <resources>
<include location="welcome.qrc"/>
</resources>
<connections/> <connections/>
</ui> </ui>

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.3 KiB

@ -0,0 +1,6 @@
<RCC>
<qresource prefix="welcome">
<file>language-icon-128px.png</file>
<file>language-icon-48px.png</file>
</qresource>
</RCC>
Loading…
Cancel
Save