Skip to content

Commit

Permalink
Use a standardized size for authentication dialogs icons (#3824)
Browse files Browse the repository at this point in the history
  • Loading branch information
@DelazJ @nirvn
DelazJ authored and nirvn committed Dec 3, 2016
1 parent 37c43df commit 1560c7f
Show file tree
Hide file tree
Showing 18 changed files with 45 additions and 595 deletions.
113 changes: 1 addition & 112 deletions src/ui/auth/qgsauthauthoritieseditor.ui
View file
Expand Up @@ -14,16 +14,7 @@
<string>Certificate Authorities Editor</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>0</number>
</property>
<item>
Expand Down Expand Up @@ -82,49 +73,19 @@
</item>
<item>
<widget class="QToolButton" name="btnCaFileClear">
<property name="minimumSize">
<size>
<width>26</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>26</width>
<height>22</height>
</size>
</property>
<property name="text">
<string/>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mIconClose.svg</normaloff>:/images/themes/default/mIconClose.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>14</width>
<height>14</height>
</size>
</property>
</widget>
</item>
</layout>
</item>
<item>
<widget class="QToolButton" name="btnCaFile">
<property name="minimumSize">
<size>
<width>26</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>26</width>
<height>22</height>
</size>
</property>
<property name="text">
<string>...</string>
</property>
Expand All @@ -145,12 +106,6 @@
</property>
<item>
<widget class="QToolButton" name="btnAddCa">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="toolTip">
<string>Import certificate(s) to authentication database</string>
</property>
Expand All @@ -161,22 +116,10 @@
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnRemoveCa">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="toolTip">
<string>Remove certificate from authentication database</string>
</property>
Expand All @@ -187,22 +130,10 @@
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnInfoCa">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="toolTip">
<string>Show information for certificate</string>
</property>
Expand All @@ -213,12 +144,6 @@
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/metadata.svg</normaloff>:/images/themes/default/propertyicons/metadata.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
Expand All @@ -236,12 +161,6 @@
</item>
<item>
<widget class="QToolButton" name="btnGroupByOrg">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="toolTip">
<string>Group by organization</string>
</property>
Expand All @@ -252,12 +171,6 @@
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionFilter.svg</normaloff>:/images/themes/default/mActionFilter.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="checkable">
<bool>true</bool>
</property>
Expand All @@ -268,12 +181,6 @@
</item>
<item>
<widget class="QToolButton" name="btnViewRefresh">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="toolTip">
<string>Refresh certificate tree view</string>
</property>
Expand All @@ -284,35 +191,17 @@
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/mActionRefresh.png</normaloff>:/images/themes/default/mActionRefresh.png</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="btnUtilities">
<property name="minimumSize">
<size>
<width>32</width>
<height>32</height>
</size>
</property>
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../../images/images.qrc">
<normaloff>:/images/themes/default/propertyicons/settings.svg</normaloff>:/images/themes/default/propertyicons/settings.svg</iconset>
</property>
<property name="iconSize">
<size>
<width>20</width>
<height>20</height>
</size>
</property>
<property name="popupMode">
<enum>QToolButton::InstantPopup</enum>
</property>
Expand Down
33 changes: 3 additions & 30 deletions src/ui/auth/qgsauthcertificateinfo.ui
View file
Expand Up @@ -23,16 +23,7 @@
<property name="spacing">
<number>18</number>
</property>
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>6</number>
</property>
<item>
Expand All @@ -47,16 +38,7 @@
<string>Certificate Hierarchy</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_4">
<property name="leftMargin">
<number>3</number>
</property>
<property name="topMargin">
<number>3</number>
</property>
<property name="rightMargin">
<number>3</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>3</number>
</property>
<item>
Expand Down Expand Up @@ -171,16 +153,7 @@
<string/>
</property>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>6</number>
</property>
<item>
Expand Down
11 changes: 1 addition & 10 deletions src/ui/auth/qgsauthcertificatemanager.ui
View file
Expand Up @@ -14,16 +14,7 @@
<string>Authentication Certificate Editors</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout">
<property name="leftMargin">
<number>6</number>
</property>
<property name="topMargin">
<number>6</number>
</property>
<property name="rightMargin">
<number>6</number>
</property>
<property name="bottomMargin">
<property name="margin">
<number>6</number>
</property>
<item>
Expand Down

0 comments on commit 1560c7f

Please sign in to comment.