pimhwang
/
qTox
mirror of https://github.com/qTox/qTox.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix(ui): move update elements in about 

In some languages the "up to date" text can get over the qTox version text, so
this commit moves "up to date" above. The commit also moves the "Update
available" button above and stretches it.
reviewable/pr6256/r1
powerjungle 6 years ago
parent
425e3f6518
commit
31de0eaf08
No known key found for this signature in database
GPG Key ID: 190C37B0F8665DA8
1 changed files with 49 additions and 51 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 100
      src/widget/form/settings/aboutsettings.ui

100
src/widget/form/settings/aboutsettings.ui
Unescape View File

@ -30,8 +30,8 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>494</width> <width>506</width>
<height>551</height> <height>550</height>
</rect> </rect>
</property> </property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1,0,0"> <layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1,0,0">
@ -53,8 +53,8 @@
<string>Version</string> <string>Version</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<item row="2" column="0"> <item row="1" column="0" colspan="2">
<widget class="QLabel" name="toxCoreVersion"> <widget class="QLabel" name="youAreUsing">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -66,18 +66,24 @@
<family>Sans Serif</family> <family>Sans Serif</family>
</font> </font>
</property> </property>
<property name="mouseTracking"> <property name="frameShape">
<bool>true</bool> <enum>QFrame::NoFrame</enum>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">{TOXCOREVERSION}</string> <string notr="true">{GIT_DESCRIBE}</string>
</property>
<property name="indent">
<number>-1</number>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <item row="3" column="1">
<widget class="QLabel" name="qtVersion"> <widget class="QLabel" name="qtVersion">
<property name="font"> <property name="font">
<font> <font>
@ -92,8 +98,8 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="0" colspan="2"> <item row="3" column="0">
<widget class="QLabel" name="gitVersion"> <widget class="QLabel" name="toxCoreVersion">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -109,18 +115,15 @@
<bool>true</bool> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">{GIT_VERSION}</string> <string notr="true">{TOXCOREVERSION}</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property> </property>
<property name="textInteractionFlags"> <property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set> <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="0" colspan="2"> <item row="2" column="0" colspan="2">
<widget class="QLabel" name="youAreUsing"> <widget class="QLabel" name="gitVersion">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding"> <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch> <horstretch>0</horstretch>
@ -132,14 +135,11 @@
<family>Sans Serif</family> <family>Sans Serif</family>
</font> </font>
</property> </property>
<property name="frameShape"> <property name="mouseTracking">
<enum>QFrame::NoFrame</enum> <bool>true</bool>
</property> </property>
<property name="text"> <property name="text">
<string notr="true">{GIT_DESCRIBE}</string> <string notr="true">{GIT_VERSION}</string>
</property>
<property name="indent">
<number>-1</number>
</property> </property>
<property name="openExternalLinks"> <property name="openExternalLinks">
<bool>true</bool> <bool>true</bool>
@ -149,30 +149,29 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="0" colspan="2">
<widget class="QStackedWidget" name="updateStack"> <widget class="QStackedWidget" name="updateStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex"> <property name="currentIndex">
<number>2</number> <number>1</number>
</property> </property>
<widget class="QWidget" name="updateAvailablePage"> <widget class="QWidget" name="updateAvailablePage">
<layout class="QHBoxLayout" name="horizontalLayout_6"> <layout class="QHBoxLayout" name="horizontalLayout_6">
<item> <item>
<layout class="QHBoxLayout" name="updateAvailableLayout"> <layout class="QHBoxLayout" name="updateAvailableLayout">
<item>
<spacer name="updateAvailableSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item> <item>
<widget class="QPushButton" name="updateAvailableButton"> <widget class="QPushButton" name="updateAvailableButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleDescription"> <property name="accessibleDescription">
<string>Open update download link</string> <string>Open update download link</string>
</property> </property>
@ -189,30 +188,23 @@
<layout class="QHBoxLayout" name="horizontalLayout_5"> <layout class="QHBoxLayout" name="horizontalLayout_5">
<item> <item>
<layout class="QHBoxLayout" name="upToDateLayout"> <layout class="QHBoxLayout" name="upToDateLayout">
<item>
<spacer name="upToDateSpacer">
<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>
<widget class="QLabel" name="upToDateLabel"> <widget class="QLabel" name="upToDateLabel">
<property name="sizePolicy"> <property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed"> <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch> <horstretch>0</horstretch>
<verstretch>0</verstretch> <verstretch>0</verstretch>
</sizepolicy> </sizepolicy>
</property> </property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text"> <property name="text">
<string>qTox is up to date ✓</string> <string>qTox is up to date ✓</string>
</property> </property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -226,6 +218,12 @@
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer> </spacer>
</item> </item>
</layout> </layout>

Write Preview
Loading…
Cancel
Save