Skip to content

Commit 6e576dc

Browse files
Chocobo1Chocobo1
committed
Sort grid items properly
Supersedes #21856.
1 parent 9b80819 commit 6e576dc

12 files changed

+695
-970
lines changed

‎src/gui/aboutdialog.ui

Lines changed: 76 additions & 76 deletions
Original file line numberDiff line numberDiff line change
@@ -90,23 +90,17 @@
9090
<string>Current maintainer</string>
9191
</property>
9292
<layout class="QGridLayout" name="gridLayout_4">
93-
<item row="1" column="1">
94-
<widget class="QLabel" name="label_18">
93+
<item row="0" column="0">
94+
<widget class="QLabel" name="label_14">
9595
<property name="text">
96-
<string>Greece</string>
96+
<string>Name:</string>
9797
</property>
9898
</widget>
9999
</item>
100-
<item row="2" column="1">
101-
<widget class="QLabel" name="label_19">
100+
<item row="0" column="1">
101+
<widget class="QLabel" name="label_17">
102102
<property name="text">
103-
<string notr="true">&lt;a href=&quot;mailto:sledgehammer999@qbittorrent.org&quot;&gt;sledgehammer999@qbittorrent.org&lt;/a&gt;</string>
104-
</property>
105-
<property name="openExternalLinks">
106-
<bool>true</bool>
107-
</property>
108-
<property name="textInteractionFlags">
109-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
103+
<string notr="true">Sledgehammer999</string>
110104
</property>
111105
</widget>
112106
</item>
@@ -117,24 +111,30 @@
117111
</property>
118112
</widget>
119113
</item>
120-
<item row="2" column="0">
121-
<widget class="QLabel" name="label_16">
114+
<item row="1" column="1">
115+
<widget class="QLabel" name="label_18">
122116
<property name="text">
123-
<string>E-mail:</string>
117+
<string>Greece</string>
124118
</property>
125119
</widget>
126120
</item>
127-
<item row="0" column="0">
128-
<widget class="QLabel" name="label_14">
121+
<item row="2" column="0">
122+
<widget class="QLabel" name="label_16">
129123
<property name="text">
130-
<string>Name:</string>
124+
<string>E-mail:</string>
131125
</property>
132126
</widget>
133127
</item>
134-
<item row="0" column="1">
135-
<widget class="QLabel" name="label_17">
128+
<item row="2" column="1">
129+
<widget class="QLabel" name="label_19">
136130
<property name="text">
137-
<string notr="true">Sledgehammer999</string>
131+
<string notr="true">&lt;a href=&quot;mailto:sledgehammer999@qbittorrent.org&quot;&gt;sledgehammer999@qbittorrent.org&lt;/a&gt;</string>
132+
</property>
133+
<property name="openExternalLinks">
134+
<bool>true</bool>
135+
</property>
136+
<property name="textInteractionFlags">
137+
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
138138
</property>
139139
</widget>
140140
</item>
@@ -160,10 +160,10 @@
160160
<string>Original author</string>
161161
</property>
162162
<layout class="QGridLayout" name="gridLayout_5">
163-
<item row="1" column="1">
164-
<widget class="QLabel" name="label_7">
163+
<item row="0" column="0">
164+
<widget class="QLabel" name="label_3">
165165
<property name="text">
166-
<string>France</string>
166+
<string>Name:</string>
167167
</property>
168168
</widget>
169169
</item>
@@ -174,23 +174,17 @@
174174
</property>
175175
</widget>
176176
</item>
177-
<item row="2" column="1">
178-
<widget class="QLabel" name="label_6">
177+
<item row="1" column="0">
178+
<widget class="QLabel" name="label_4">
179179
<property name="text">
180-
<string notr="true">&lt;a href=&quot;mailto:chris@qbittorrent.org&quot;&gt;chris@qbittorrent.org&lt;/a&gt;</string>
181-
</property>
182-
<property name="openExternalLinks">
183-
<bool>true</bool>
184-
</property>
185-
<property name="textInteractionFlags">
186-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
180+
<string>Nationality:</string>
187181
</property>
188182
</widget>
189183
</item>
190-
<item row="0" column="0">
191-
<widget class="QLabel" name="label_3">
184+
<item row="1" column="1">
185+
<widget class="QLabel" name="label_7">
192186
<property name="text">
193-
<string>Name:</string>
187+
<string>France</string>
194188
</property>
195189
</widget>
196190
</item>
@@ -201,10 +195,16 @@
201195
</property>
202196
</widget>
203197
</item>
204-
<item row="1" column="0">
205-
<widget class="QLabel" name="label_4">
198+
<item row="2" column="1">
199+
<widget class="QLabel" name="label_6">
206200
<property name="text">
207-
<string>Nationality:</string>
201+
<string notr="true">&lt;a href=&quot;mailto:chris@qbittorrent.org&quot;&gt;chris@qbittorrent.org&lt;/a&gt;</string>
202+
</property>
203+
<property name="openExternalLinks">
204+
<bool>true</bool>
205+
</property>
206+
<property name="textInteractionFlags">
207+
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
208208
</property>
209209
</widget>
210210
</item>
@@ -365,15 +365,28 @@
365365
</item>
366366
<item>
367367
<layout class="QGridLayout" name="gridLayout">
368-
<item row="2" column="2">
369-
<widget class="QLabel" name="labelBoostVer">
368+
<item row="0" column="1">
369+
<widget class="QLabel" name="labelQt">
370+
<property name="text">
371+
<string notr="true">Qt:</string>
372+
</property>
373+
<property name="alignment">
374+
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
375+
</property>
370376
<property name="textInteractionFlags">
371377
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
372378
</property>
373379
</widget>
374380
</item>
375-
<item row="1" column="3">
376-
<spacer name="horizontalSpacer_3">
381+
<item row="0" column="2">
382+
<widget class="QLabel" name="labelQtVer">
383+
<property name="textInteractionFlags">
384+
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
385+
</property>
386+
</widget>
387+
</item>
388+
<item row="1" column="0">
389+
<spacer name="horizontalSpacer_4">
377390
<property name="orientation">
378391
<enum>Qt::Orientation::Horizontal</enum>
379392
</property>
@@ -385,10 +398,10 @@
385398
</property>
386399
</spacer>
387400
</item>
388-
<item row="0" column="1">
389-
<widget class="QLabel" name="labelQt">
401+
<item row="1" column="1">
402+
<widget class="QLabel" name="labelLibt">
390403
<property name="text">
391-
<string notr="true">Qt:</string>
404+
<string notr="true">Libtorrent:</string>
392405
</property>
393406
<property name="alignment">
394407
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
@@ -398,19 +411,26 @@
398411
</property>
399412
</widget>
400413
</item>
401-
<item row="1" column="1">
402-
<widget class="QLabel" name="labelLibt">
403-
<property name="text">
404-
<string notr="true">Libtorrent:</string>
405-
</property>
406-
<property name="alignment">
407-
<set>Qt::AlignmentFlag::AlignRight|Qt::AlignmentFlag::AlignTrailing|Qt::AlignmentFlag::AlignVCenter</set>
408-
</property>
414+
<item row="1" column="2">
415+
<widget class="QLabel" name="labelLibtVer">
409416
<property name="textInteractionFlags">
410417
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
411418
</property>
412419
</widget>
413420
</item>
421+
<item row="1" column="3">
422+
<spacer name="horizontalSpacer_3">
423+
<property name="orientation">
424+
<enum>Qt::Orientation::Horizontal</enum>
425+
</property>
426+
<property name="sizeHint" stdset="0">
427+
<size>
428+
<width>0</width>
429+
<height>0</height>
430+
</size>
431+
</property>
432+
</spacer>
433+
</item>
414434
<item row="2" column="1">
415435
<widget class="QLabel" name="labelBoost">
416436
<property name="text">
@@ -424,33 +444,13 @@
424444
</property>
425445
</widget>
426446
</item>
427-
<item row="0" column="2">
428-
<widget class="QLabel" name="labelQtVer">
429-
<property name="textInteractionFlags">
430-
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
431-
</property>
432-
</widget>
433-
</item>
434-
<item row="1" column="2">
435-
<widget class="QLabel" name="labelLibtVer">
447+
<item row="2" column="2">
448+
<widget class="QLabel" name="labelBoostVer">
436449
<property name="textInteractionFlags">
437450
<set>Qt::TextInteractionFlag::LinksAccessibleByMouse|Qt::TextInteractionFlag::TextSelectableByMouse</set>
438451
</property>
439452
</widget>
440453
</item>
441-
<item row="1" column="0">
442-
<spacer name="horizontalSpacer_4">
443-
<property name="orientation">
444-
<enum>Qt::Orientation::Horizontal</enum>
445-
</property>
446-
<property name="sizeHint" stdset="0">
447-
<size>
448-
<width>0</width>
449-
<height>0</height>
450-
</size>
451-
</property>
452-
</spacer>
453-
</item>
454454
<item row="3" column="1">
455455
<widget class="QLabel" name="labelOpenssl">
456456
<property name="text">

‎src/gui/addnewtorrentdialog.ui

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -378,19 +378,64 @@
378378
<string>Torrent information</string>
379379
</property>
380380
<layout class="QGridLayout" name="gridLayout_2">
381-
<item row="2" column="0">
382-
<widget class="QLabel" name="labelInfohash1">
381+
<item row="0" column="0">
382+
<widget class="QLabel" name="labelSize">
383383
<property name="text">
384-
<string>Info hash v1:</string>
384+
<string>Size:</string>
385385
</property>
386386
</widget>
387387
</item>
388388
<item row="0" column="1">
389389
<widget class="QLabel" name="labelSizeData"/>
390390
</item>
391+
<item row="1" column="0">
392+
<widget class="QLabel" name="labelDate">
393+
<property name="text">
394+
<string>Date:</string>
395+
</property>
396+
</widget>
397+
</item>
391398
<item row="1" column="1">
392399
<widget class="QLabel" name="labelDateData"/>
393400
</item>
401+
<item row="2" column="0">
402+
<widget class="QLabel" name="labelInfohash1">
403+
<property name="text">
404+
<string>Info hash v1:</string>
405+
</property>
406+
</widget>
407+
</item>
408+
<item row="2" column="1">
409+
<widget class="QLabel" name="labelInfohash1Data">
410+
<property name="textInteractionFlags">
411+
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
412+
</property>
413+
</widget>
414+
</item>
415+
<item row="3" column="0">
416+
<widget class="QLabel" name="labelInfohash2">
417+
<property name="text">
418+
<string>Info hash v2:</string>
419+
</property>
420+
</widget>
421+
</item>
422+
<item row="3" column="1">
423+
<widget class="QLabel" name="labelInfohash2Data">
424+
<property name="textInteractionFlags">
425+
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
426+
</property>
427+
</widget>
428+
</item>
429+
<item row="4" column="0">
430+
<widget class="QLabel" name="labelComment">
431+
<property name="text">
432+
<string>Comment:</string>
433+
</property>
434+
<property name="alignment">
435+
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
436+
</property>
437+
</widget>
438+
</item>
394439
<item row="4" column="1">
395440
<widget class="QScrollArea" name="scrollArea">
396441
<property name="frameShape">
@@ -447,51 +492,6 @@
447492
</widget>
448493
</widget>
449494
</item>
450-
<item row="4" column="0">
451-
<widget class="QLabel" name="labelComment">
452-
<property name="text">
453-
<string>Comment:</string>
454-
</property>
455-
<property name="alignment">
456-
<set>Qt::AlignmentFlag::AlignLeading|Qt::AlignmentFlag::AlignLeft|Qt::AlignmentFlag::AlignTop</set>
457-
</property>
458-
</widget>
459-
</item>
460-
<item row="0" column="0">
461-
<widget class="QLabel" name="labelSize">
462-
<property name="text">
463-
<string>Size:</string>
464-
</property>
465-
</widget>
466-
</item>
467-
<item row="2" column="1">
468-
<widget class="QLabel" name="labelInfohash1Data">
469-
<property name="textInteractionFlags">
470-
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
471-
</property>
472-
</widget>
473-
</item>
474-
<item row="1" column="0">
475-
<widget class="QLabel" name="labelDate">
476-
<property name="text">
477-
<string>Date:</string>
478-
</property>
479-
</widget>
480-
</item>
481-
<item row="3" column="0">
482-
<widget class="QLabel" name="labelInfohash2">
483-
<property name="text">
484-
<string>Info hash v2:</string>
485-
</property>
486-
</widget>
487-
</item>
488-
<item row="3" column="1">
489-
<widget class="QLabel" name="labelInfohash2Data">
490-
<property name="textInteractionFlags">
491-
<set>Qt::TextInteractionFlag::TextSelectableByMouse</set>
492-
</property>
493-
</widget>
494-
</item>
495495
</layout>
496496
</widget>
497497
</item>

‎src/gui/banlistoptionsdialog.ui

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -102,12 +102,6 @@
102102
</item>
103103
</layout>
104104
</widget>
105-
<tabstops>
106-
<tabstop>bannedIPList</tabstop>
107-
<tabstop>txtIP</tabstop>
108-
<tabstop>buttonBanIP</tabstop>
109-
<tabstop>buttonDeleteIP</tabstop>
110-
</tabstops>
111105
<resources/>
112106
<connections/>
113107
</ui>

‎src/gui/ipsubnetwhitelistoptionsdialog.ui

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@
8686
</item>
8787
</layout>
8888
</widget>
89-
<tabstops>
90-
<tabstop>whitelistedIPSubnetList</tabstop>
91-
<tabstop>txtIPSubnet</tabstop>
92-
<tabstop>buttonWhitelistIPSubnet</tabstop>
93-
<tabstop>buttonDeleteIPSubnet</tabstop>
94-
</tabstops>
9589
<resources/>
9690
<connections/>
9791
</ui>

0 commit comments

Comments
 (0)