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

Merge pull request #6256 

powerjungle (1):
      fix(ui): move update elements in about
reviewable/pr6264/r1
sudden6 5 years ago
parent
ff1ab07a21 31de0eaf08
commit
9c4ebaa238
No known key found for this signature in database
GPG Key ID: 279509B499E032B9
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
Split 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 @@ @@ -30,8 +30,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>494</width>
<height>551</height>
<width>506</width>
<height>550</height>
</rect>
</property>
<layout class="QVBoxLayout" name="verticalLayout_2" stretch="0,1,0,0">
@ -53,8 +53,8 @@ @@ -53,8 +53,8 @@
<string>Version</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="0">
<widget class="QLabel" name="toxCoreVersion">
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="youAreUsing">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -66,18 +66,24 @@ @@ -66,18 +66,24 @@
<family>Sans Serif</family>
</font>
</property>
<property name="mouseTracking">
<bool>true</bool>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
</property>
<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 name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="2" column="1">
<item row="3" column="1">
<widget class="QLabel" name="qtVersion">
<property name="font">
<font>
@ -92,8 +98,8 @@ @@ -92,8 +98,8 @@
</property>
</widget>
</item>
<item row="1" column="0" colspan="2">
<widget class="QLabel" name="gitVersion">
<item row="3" column="0">
<widget class="QLabel" name="toxCoreVersion">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -109,18 +115,15 @@ @@ -109,18 +115,15 @@
<bool>true</bool>
</property>
<property name="text">
<string notr="true">{GIT_VERSION}</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
<string notr="true">{TOXCOREVERSION}</string>
</property>
<property name="textInteractionFlags">
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="youAreUsing">
<item row="2" column="0" colspan="2">
<widget class="QLabel" name="gitVersion">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
@ -132,14 +135,11 @@ @@ -132,14 +135,11 @@
<family>Sans Serif</family>
</font>
</property>
<property name="frameShape">
<enum>QFrame::NoFrame</enum>
<property name="mouseTracking">
<bool>true</bool>
</property>
<property name="text">
<string notr="true">{GIT_DESCRIBE}</string>
</property>
<property name="indent">
<number>-1</number>
<string notr="true">{GIT_VERSION}</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
@ -149,30 +149,29 @@ @@ -149,30 +149,29 @@
</property>
</widget>
</item>
<item row="0" column="1">
<item row="0" column="0" colspan="2">
<widget class="QStackedWidget" name="updateStack">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="currentIndex">
<number>2</number>
<number>1</number>
</property>
<widget class="QWidget" name="updateAvailablePage">
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<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>
<widget class="QPushButton" name="updateAvailableButton">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="accessibleDescription">
<string>Open update download link</string>
</property>
@ -189,30 +188,23 @@ @@ -189,30 +188,23 @@
<layout class="QHBoxLayout" name="horizontalLayout_5">
<item>
<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>
<widget class="QLabel" name="upToDateLabel">
<property name="sizePolicy">
<sizepolicy hsizetype="Minimum" vsizetype="Fixed">
<sizepolicy hsizetype="Expanding" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="autoFillBackground">
<bool>true</bool>
</property>
<property name="text">
<string>qTox is up to date ✓</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>
</property>
</widget>
</item>
</layout>
@ -226,6 +218,12 @@ @@ -226,6 +218,12 @@
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
</layout>

Write Preview
Loading…
Cancel
Save