Skip to content

Commit

Permalink
Sort grid items properly
Browse files Browse the repository at this point in the history 
Supersedes #21856.
  • Loading branch information
@Chocobo1
Chocobo1 committed Dec 14, 2024
1 parent 9b80819 commit 6e576dc
Show file tree
Hide file tree
Showing 12 changed files with 695 additions and 970 deletions.
152 changes: 76 additions & 76 deletions src/gui/aboutdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,23 +90,17 @@
<string>Current maintainer</string>
</property>
<layout class="QGridLayout" name="gridLayout_4">
<item row="1" column="1">
<widget class="QLabel" name="label_18">
<item row="0" column="0">
<widget class="QLabel" name="label_14">
<property name="text">
<string>Greece</string>
<string>Name:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_19">
<item row="0" column="1">
<widget class="QLabel" name="label_17">
<property name="text">
<string notr="true">&lt;a href=&quot;mailto:sledgehammer999@qbittorrent.org&quot;&gt;sledgehammer999@qbittorrent.org&lt;/a&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
<string notr="true">Sledgehammer999</string>
</property>
</widget>
</item>
Expand All @@ -117,24 +111,30 @@
</property>
</widget>
</item>
<item row="2" column="0">
<widget class="QLabel" name="label_16">
<item row="1" column="1">
<widget class="QLabel" name="label_18">
<property name="text">
<string>E-mail:</string>
<string>Greece</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_14">
<item row="2" column="0">
<widget class="QLabel" name="label_16">
<property name="text">
<string>Name:</string>
<string>E-mail:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_17">
<item row="2" column="1">
<widget class="QLabel" name="label_19">
<property name="text">
<string notr="true">Sledgehammer999</string>
<string notr="true">&lt;a href=&quot;mailto:sledgehammer999@qbittorrent.org&quot;&gt;sledgehammer999@qbittorrent.org&lt;/a&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
Expand All @@ -160,10 +160,10 @@
<string>Original author</string>
</property>
<layout class="QGridLayout" name="gridLayout_5">
<item row="1" column="1">
<widget class="QLabel" name="label_7">
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<property name="text">
<string>France</string>
<string>Name:</string>
</property>
</widget>
</item>
Expand All @@ -174,23 +174,17 @@
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="label_6">
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<property name="text">
<string notr="true">&lt;a href=&quot;mailto:chris@qbittorrent.org&quot;&gt;chris@qbittorrent.org&lt;/a&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
<string>Nationality:</string>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="label_3">
<item row="1" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string>Name:</string>
<string>France</string>
</property>
</widget>
</item>
Expand All @@ -201,10 +195,16 @@
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="label_4">
<item row="2" column="1">
<widget class="QLabel" name="label_6">
<property name="text">
<string>Nationality:</string>
<string notr="true">&lt;a href=&quot;mailto:chris@qbittorrent.org&quot;&gt;chris@qbittorrent.org&lt;/a&gt;</string>
</property>
<property name="openExternalLinks">
<bool>true</bool>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
Expand Down Expand Up @@ -365,15 +365,28 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
<item row="2" column="2">
<widget class="QLabel" name="labelBoostVer">
<item row="0" column="1">
<widget class="QLabel" name="labelQt">
<property name="text">
<string notr="true">Qt:</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="3">
<spacer name="horizontalSpacer_3">
<item row="0" column="2">
<widget class="QLabel" name="labelQtVer">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
Expand All @@ -385,10 +398,10 @@
</property>
</spacer>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelQt">
<item row="1" column="1">
<widget class="QLabel" name="labelLibt">
<property name="text">
<string notr="true">Qt:</string>
<string notr="true">Libtorrent:</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
Expand All @@ -398,19 +411,26 @@
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelLibt">
<property name="text">
<string notr="true">Libtorrent:</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
</property>
<item row="1" column="2">
<widget class="QLabel" name="labelLibtVer">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="3">
<spacer name="horizontalSpacer_3">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelBoost">
<property name="text">
Expand All @@ -424,33 +444,13 @@
</property>
</widget>
</item>
<item row="0" column="2">
<widget class="QLabel" name="labelQtVer">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QLabel" name="labelLibtVer">
<item row="2" column="2">
<widget class="QLabel" name="labelBoostVer">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="0">
<spacer name="horizontalSpacer_4">
<property name="orientation">
<enum>Qt::Orientation::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>0</width>
<height>0</height>
</size>
</property>
</spacer>
</item>
<item row="3" column="1">
<widget class="QLabel" name="labelOpenssl">
<property name="text">
Expand Down
96 changes: 48 additions & 48 deletions src/gui/addnewtorrentdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -378,19 +378,64 @@
<string>Torrent information</string>
</property>
<layout class="QGridLayout" name="gridLayout_2">
<item row="2" column="0">
<widget class="QLabel" name="labelInfohash1">
<item row="0" column="0">
<widget class="QLabel" name="labelSize">
<property name="text">
<string>Info hash v1:</string>
<string>Size:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="labelSizeData"/>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelDate">
<property name="text">
<string>Date:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<widget class="QLabel" name="labelDateData"/>
</item>
<item row="2" column="0">
<widget class="QLabel" name="labelInfohash1">
<property name="text">
<string>Info hash v1:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelInfohash1Data">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelInfohash2">
<property name="text">
<string>Info hash v2:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="labelInfohash2Data">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelComment">
<property name="text">
<string>Comment:</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
</widget>
</item>
<item row="4" column="1">
<widget class="QScrollArea" name="scrollArea">
<property name="frameShape">
Expand Down Expand Up @@ -447,51 +492,6 @@
</widget>
</widget>
</item>
<item row="4" column="0">
<widget class="QLabel" name="labelComment">
<property name="text">
<string>Comment:</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
</property>
</widget>
</item>
<item row="0" column="0">
<widget class="QLabel" name="labelSize">
<property name="text">
<string>Size:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<widget class="QLabel" name="labelInfohash1Data">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
<item row="1" column="0">
<widget class="QLabel" name="labelDate">
<property name="text">
<string>Date:</string>
</property>
</widget>
</item>
<item row="3" column="0">
<widget class="QLabel" name="labelInfohash2">
<property name="text">
<string>Info hash v2:</string>
</property>
</widget>
</item>
<item row="3" column="1">
<widget class="QLabel" name="labelInfohash2Data">
<property name="textInteractionFlags">
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
</property>
</widget>
</item>
</layout>
</widget>
</item>
Expand Down
6 changes: 0 additions & 6 deletions src/gui/banlistoptionsdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,6 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>bannedIPList</tabstop>
<tabstop>txtIP</tabstop>
<tabstop>buttonBanIP</tabstop>
<tabstop>buttonDeleteIP</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
6 changes: 0 additions & 6 deletions src/gui/ipsubnetwhitelistoptionsdialog.ui
View file
Original file line number Diff line number Diff line change
Expand Up @@ -86,12 +86,6 @@
</item>
</layout>
</widget>
<tabstops>
<tabstop>whitelistedIPSubnetList</tabstop>
<tabstop>txtIPSubnet</tabstop>
<tabstop>buttonWhitelistIPSubnet</tabstop>
<tabstop>buttonDeleteIPSubnet</tabstop>
</tabstops>
<resources/>
<connections/>
</ui>
Loading

0 comments on commit 6e576dc

Please sign in to comment.