Skip to content

Commit

Permalink
Merge pull request #1079 from 3nids/uioptionbase
Browse files Browse the repository at this point in the history 
UI: remove top labels, use collapsible groupboxes, and other small improvements
  • Loading branch information
@3nids
3nids committed Jan 16, 2014
2 parents 5310040 + 03a7125 commit 8b6d180
Show file tree
Hide file tree
Showing 9 changed files with 497 additions and 997 deletions.
14 changes: 0 additions & 14 deletions src/app/pluginmanager/qgspluginmanager.cpp
View file
Expand Up @@ -538,8 +538,6 @@ void QgsPluginManager::reloadModelData()
if ( hasAvailablePlugins() ) mModelPlugins->appendRow( createSpacerItem( tr( "Installable", "category: plugins that are available for installation" ), "not installedZ" ) );
}

updateTabTitle();

buttonUpgradeAll->setEnabled( hasUpgradeablePlugins() );

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

updateTabTitle();

// load tab description HTML to the detail browser
QString tabInfoHTML = "";
QMap<QString, QString>::iterator it = mTabDescriptions.find( tabTitle );
Expand Down Expand Up @@ -1340,13 +1336,3 @@ bool QgsPluginManager::hasInvalidPlugins( )

return false;
}



void QgsPluginManager::updateTabTitle()
{
lbStatusFilter->setText( QString( " %1 > %2 (%3)" ).arg( tr( "Plugins" ) )
.arg( mOptionsListWidget->currentItem()->text() )
.arg( mModelProxy->countWithCurrentStatus() ) );
}

3 changes: 0 additions & 3 deletions src/app/pluginmanager/qgspluginmanager.h
View file
Expand Up @@ -100,9 +100,6 @@ class QgsPluginManager : public QgsOptionsDialogBase, private Ui::QgsPluginManag
//! Set tab of the stacked widget (called from the vertical list item)
void setCurrentTab( int idx );

//! Update title of the current tab according to current filters
void updateTabTitle();

//! Handle plugin selection
void currentPluginChanged( const QModelIndex & theIndex );

Expand Down
126 changes: 8 additions & 118 deletions src/ui/qgsabout.ui
View file
Expand Up @@ -150,23 +150,13 @@
</sizepolicy>
</property>
<property name="currentIndex">
<number>5</number>
<number>0</number>
</property>
<widget class="QWidget" name="mOptsPage_01">
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label">
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>About</string>
</property>
</widget>
</item>
<item>
<layout class="QHBoxLayout">
<item>
Expand Down Expand Up @@ -201,8 +191,8 @@ p, li { white-space: pre-wrap; }
</layout>
</item>
<item>
<widget class="QWebView" name="txtVersion">
<property name="url">
<widget class="QWebView" name="txtVersion" native="true">
<property name="url" stdset="0">
<url>
<string>about:blank</string>
</url>
Expand Down Expand Up @@ -286,16 +276,6 @@ p, li { white-space: pre-wrap; }
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_4">
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>What's New</string>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="txtWhatsNew"/>
</item>
Expand All @@ -306,16 +286,6 @@ p, li { white-space: pre-wrap; }
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_5">
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>Providers</string>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="txtProviders"/>
</item>
Expand All @@ -326,23 +296,7 @@ p, li { white-space: pre-wrap; }
<property name="margin">
<number>0</number>
</property>
<item row="0" column="0" colspan="2">
<widget class="QLabel" name="label_6">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>Developers</string>
</property>
</widget>
</item>
<item row="1" column="0" rowspan="2">
<item row="0" column="0" rowspan="2">
<widget class="QListWidget" name="lstDevelopers">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
Expand All @@ -358,7 +312,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="1" column="1">
<item row="0" column="1">
<widget class="QLabel" name="label_7">
<property name="text">
<string/>
Expand All @@ -374,7 +328,7 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item row="2" column="1">
<item row="1" column="1">
<widget class="QLabel" name="label_8">
<property name="font">
<font>
Expand All @@ -396,22 +350,6 @@ p, li { white-space: pre-wrap; }
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_9">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>Contributors</string>
</property>
</widget>
</item>
<item>
<widget class="QListWidget" name="lstContributors">
<property name="alternatingRowColors">
Expand All @@ -427,24 +365,8 @@ p, li { white-space: pre-wrap; }
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_10">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>Translators</string>
</property>
</widget>
</item>
<item>
<widget class="QWebView" name="txtTranslators">
<property name="url">
<widget class="QWebView" name="txtTranslators" native="true">
<property name="url" stdset="0">
<url>
<string>about:blank</string>
</url>
Expand All @@ -458,22 +380,6 @@ p, li { white-space: pre-wrap; }
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_12">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>Donors</string>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="txtDonors">
<property name="openExternalLinks">
Expand All @@ -491,22 +397,6 @@ p, li { white-space: pre-wrap; }
<property name="margin">
<number>0</number>
</property>
<item>
<widget class="QLabel" name="label_13">
<property name="sizePolicy">
<sizepolicy hsizetype="Preferred" vsizetype="Maximum">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="styleSheet">
<string notr="true">font-weight:bold;</string>
</property>
<property name="text">
<string>License</string>
</property>
</widget>
</item>
<item>
<widget class="QTextBrowser" name="txtLicense"/>
</item>
Expand Down

0 comments on commit 8b6d180

Please sign in to comment.