Skip to content

Commit 03a7125

Browse files
3nids3nids
committed
UI: remove top labels, use collapsible groupboxes, and other small improvements
1 parent 0ca7316 commit 03a7125

9 files changed

+497
-997
lines changed

‎src/app/pluginmanager/qgspluginmanager.cpp

-14
Original file line numberDiff line numberDiff line change
@@ -538,8 +538,6 @@ void QgsPluginManager::reloadModelData()
538538
if ( hasAvailablePlugins() ) mModelPlugins->appendRow( createSpacerItem( tr( "Installable", "category: plugins that are available for installation" ), "not installedZ" ) );
539539
}
540540

541-
updateTabTitle();
542-
543541
buttonUpgradeAll->setEnabled( hasUpgradeablePlugins() );
544542

545543
// Disable tabs that are empty because of no suitable plugins in the model.
@@ -990,8 +988,6 @@ void QgsPluginManager::setCurrentTab( int idx )
990988
}
991989
mModelProxy->setAcceptedStatuses( acceptedStatuses );
992990

993-
updateTabTitle();
994-
995991
// load tab description HTML to the detail browser
996992
QString tabInfoHTML = "";
997993
QMap<QString, QString>::iterator it = mTabDescriptions.find( tabTitle );
@@ -1340,13 +1336,3 @@ bool QgsPluginManager::hasInvalidPlugins( )
13401336

13411337
return false;
13421338
}
1343-
1344-
1345-
1346-
void QgsPluginManager::updateTabTitle()
1347-
{
1348-
lbStatusFilter->setText( QString( " %1 > %2 (%3)" ).arg( tr( "Plugins" ) )
1349-
.arg( mOptionsListWidget->currentItem()->text() )
1350-
.arg( mModelProxy->countWithCurrentStatus() ) );
1351-
}
1352-

‎src/app/pluginmanager/qgspluginmanager.h

-3
Original file line numberDiff line numberDiff line change
@@ -100,9 +100,6 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
100100
//! Set tab of the stacked widget (called from the vertical list item)
101101
void setCurrentTab( int idx );
102102

103-
//! Update title of the current tab according to current filters
104-
void updateTabTitle();
105-
106103
//! Handle plugin selection
107104
void currentPluginChanged( const QModelIndex & theIndex );
108105

‎src/ui/qgsabout.ui

+8-118
Original file line numberDiff line numberDiff line change
@@ -150,23 +150,13 @@
150150
</sizepolicy>
151151
</property>
152152
<property name="currentIndex">
153-
<number>5</number>
153+
<number>0</number>
154154
</property>
155155
<widget class="QWidget" name="mOptsPage_01">
156156
<layout class="QVBoxLayout" name="verticalLayout_4">
157157
<property name="margin">
158158
<number>0</number>
159159
</property>
160-
<item>
161-
<widget class="QLabel" name="label">
162-
<property name="styleSheet">
163-
<string notr="true">font-weight:bold;</string>
164-
</property>
165-
<property name="text">
166-
<string>About</string>
167-
</property>
168-
</widget>
169-
</item>
170160
<item>
171161
<layout class="QHBoxLayout">
172162
<item>
@@ -201,8 +191,8 @@ p, li { white-space: pre-wrap; }
201191
</layout>
202192
</item>
203193
<item>
204-
<widget class="QWebView" name="txtVersion">
205-
<property name="url">
194+
<widget class="QWebView" name="txtVersion" native="true">
195+
<property name="url" stdset="0">
206196
<url>
207197
<string>about:blank</string>
208198
</url>
@@ -286,16 +276,6 @@ p, li { white-space: pre-wrap; }
286276
<property name="margin">
287277
<number>0</number>
288278
</property>
289-
<item>
290-
<widget class="QLabel" name="label_4">
291-
<property name="styleSheet">
292-
<string notr="true">font-weight:bold;</string>
293-
</property>
294-
<property name="text">
295-
<string>What's New</string>
296-
</property>
297-
</widget>
298-
</item>
299279
<item>
300280
<widget class="QTextBrowser" name="txtWhatsNew"/>
301281
</item>
@@ -306,16 +286,6 @@ p, li { white-space: pre-wrap; }
306286
<property name="margin">
307287
<number>0</number>
308288
</property>
309-
<item>
310-
<widget class="QLabel" name="label_5">
311-
<property name="styleSheet">
312-
<string notr="true">font-weight:bold;</string>
313-
</property>
314-
<property name="text">
315-
<string>Providers</string>
316-
</property>
317-
</widget>
318-
</item>
319289
<item>
320290
<widget class="QTextBrowser" name="txtProviders"/>
321291
</item>
@@ -326,23 +296,7 @@ p, li { white-space: pre-wrap; }
326296
<property name="margin">
327297
<number>0</number>
328298
</property>
329-
<item row="0" column="0" colspan="2">
330-
<widget class="QLabel" name="label_6">
331-
<property name="sizePolicy">
332-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
333-
<horstretch>0</horstretch>
334-
<verstretch>0</verstretch>
335-
</sizepolicy>
336-
</property>
337-
<property name="styleSheet">
338-
<string notr="true">font-weight:bold;</string>
339-
</property>
340-
<property name="text">
341-
<string>Developers</string>
342-
</property>
343-
</widget>
344-
</item>
345-
<item row="1" column="0" rowspan="2">
299+
<item row="0" column="0" rowspan="2">
346300
<widget class="QListWidget" name="lstDevelopers">
347301
<property name="sizePolicy">
348302
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -358,7 +312,7 @@ p, li { white-space: pre-wrap; }
358312
</property>
359313
</widget>
360314
</item>
361-
<item row="1" column="1">
315+
<item row="0" column="1">
362316
<widget class="QLabel" name="label_7">
363317
<property name="text">
364318
<string/>
@@ -374,7 +328,7 @@ p, li { white-space: pre-wrap; }
374328
</property>
375329
</widget>
376330
</item>
377-
<item row="2" column="1">
331+
<item row="1" column="1">
378332
<widget class="QLabel" name="label_8">
379333
<property name="font">
380334
<font>
@@ -396,22 +350,6 @@ p, li { white-space: pre-wrap; }
396350
<property name="margin">
397351
<number>0</number>
398352
</property>
399-
<item>
400-
<widget class="QLabel" name="label_9">
401-
<property name="sizePolicy">
402-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
403-
<horstretch>0</horstretch>
404-
<verstretch>0</verstretch>
405-
</sizepolicy>
406-
</property>
407-
<property name="styleSheet">
408-
<string notr="true">font-weight:bold;</string>
409-
</property>
410-
<property name="text">
411-
<string>Contributors</string>
412-
</property>
413-
</widget>
414-
</item>
415353
<item>
416354
<widget class="QListWidget" name="lstContributors">
417355
<property name="alternatingRowColors">
@@ -427,24 +365,8 @@ p, li { white-space: pre-wrap; }
427365
<number>0</number>
428366
</property>
429367
<item>
430-
<widget class="QLabel" name="label_10">
431-
<property name="sizePolicy">
432-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
433-
<horstretch>0</horstretch>
434-
<verstretch>0</verstretch>
435-
</sizepolicy>
436-
</property>
437-
<property name="styleSheet">
438-
<string notr="true">font-weight:bold;</string>
439-
</property>
440-
<property name="text">
441-
<string>Translators</string>
442-
</property>
443-
</widget>
444-
</item>
445-
<item>
446-
<widget class="QWebView" name="txtTranslators">
447-
<property name="url">
368+
<widget class="QWebView" name="txtTranslators" native="true">
369+
<property name="url" stdset="0">
448370
<url>
449371
<string>about:blank</string>
450372
</url>
@@ -458,22 +380,6 @@ p, li { white-space: pre-wrap; }
458380
<property name="margin">
459381
<number>0</number>
460382
</property>
461-
<item>
462-
<widget class="QLabel" name="label_12">
463-
<property name="sizePolicy">
464-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
465-
<horstretch>0</horstretch>
466-
<verstretch>0</verstretch>
467-
</sizepolicy>
468-
</property>
469-
<property name="styleSheet">
470-
<string notr="true">font-weight:bold;</string>
471-
</property>
472-
<property name="text">
473-
<string>Donors</string>
474-
</property>
475-
</widget>
476-
</item>
477383
<item>
478384
<widget class="QTextBrowser" name="txtDonors">
479385
<property name="openExternalLinks">
@@ -491,22 +397,6 @@ p, li { white-space: pre-wrap; }
491397
<property name="margin">
492398
<number>0</number>
493399
</property>
494-
<item>
495-
<widget class="QLabel" name="label_13">
496-
<property name="sizePolicy">
497-
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
498-
<horstretch>0</horstretch>
499-
<verstretch>0</verstretch>
500-
</sizepolicy>
501-
</property>
502-
<property name="styleSheet">
503-
<string notr="true">font-weight:bold;</string>
504-
</property>
505-
<property name="text">
506-
<string>License</string>
507-
</property>
508-
</widget>
509-
</item>
510400
<item>
511401
<widget class="QTextBrowser" name="txtLicense"/>
512402
</item>

0 commit comments

Comments
 (0)