[seahorse/wip/nielsdg/pgp-key-properties: 6/6] pgp: KeyProperties: cleanup Owner tab
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/wip/nielsdg/pgp-key-properties: 6/6] pgp: KeyProperties: cleanup Owner tab
- Date: Fri, 11 Jan 2019 20:38:44 +0000 (UTC)
commit 966c4e64f344b1d917a7d60243667c53c450b76d
Author: Niels De Graef <nielsdegraef gmail com>
Date: Fri Jan 11 21:37:12 2019 +0100
pgp: KeyProperties: cleanup Owner tab
pgp/seahorse-pgp-private-key-properties.ui | 53 +++++------
pgp/seahorse-pgp-public-key-properties.ui | 136 ++++++++++++-----------------
2 files changed, 76 insertions(+), 113 deletions(-)
---
diff --git a/pgp/seahorse-pgp-private-key-properties.ui b/pgp/seahorse-pgp-private-key-properties.ui
index ef54cbe3..af4e53b0 100644
--- a/pgp/seahorse-pgp-private-key-properties.ui
+++ b/pgp/seahorse-pgp-private-key-properties.ui
@@ -280,41 +280,30 @@
<property name="border_width">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" context="name-of-key"
comments="Name of key, usually a persons name">Name:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="left_attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkLabel" id="owner-name-label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="selectable">True</property>
+ <attributes>
+ <attribute name="scale" value="1.75"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">1</property>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Email:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label" translatable="yes">Email</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">2</property>
@@ -337,10 +326,10 @@
<object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Comment:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label" translatable="yes">Comment</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">3</property>
@@ -364,10 +353,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Type:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label" translatable="yes">Type</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">4</property>
@@ -390,10 +379,10 @@
<property name="visible">True</property>
<property name="xalign">1</property>
<property name="yalign">0</property>
- <property name="label" translatable="yes">Key ID:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label" translatable="yes">Key ID</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">5</property>
diff --git a/pgp/seahorse-pgp-public-key-properties.ui b/pgp/seahorse-pgp-public-key-properties.ui
index 7ddbbd6b..99128e75 100644
--- a/pgp/seahorse-pgp-public-key-properties.ui
+++ b/pgp/seahorse-pgp-public-key-properties.ui
@@ -136,79 +136,66 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
- <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="can_focus">False</property>
- <property name="margin">12</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox">
+ <object class="GtkEventBox">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <property name="margin">6</property>
- <property name="margin-top">0</property>
+ <signal name="scroll-event" handler="on_pgp_owner_photoid_button" swapped="no"/>
<child>
- <object class="GtkEventBox">
+ <object class="GtkImage" id="photoid">
+ <property name="width_request">150</property>
+ <property name="height_request">160</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
- <signal name="scroll-event" handler="on_pgp_owner_photoid_button"
swapped="no"/>
+ <property name="icon-name">avatar-default-symbolic</property>
+ <property name="icon-size">6</property>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="key-controls">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkButton" id="owner-photo-previous-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="focus_on_click">False</property>
+ <signal name="clicked" handler="on_pgp_owner_photoid_prev" swapped="no"/>
<child>
- <object class="GtkImage" id="photoid">
- <property name="width_request">150</property>
- <property name="height_request">160</property>
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon-name">avatar-default-symbolic</property>
- <property name="icon-size">6</property>
+ <property name="icon-name">go-previous</property>
</object>
</child>
</object>
</child>
<child>
- <object class="GtkBox" id="key-controls">
+ <object class="GtkButton" id="owner-photo-next-button">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="halign">center</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="on_pgp_owner_photoid_next" swapped="no"/>
<child>
- <object class="GtkButton" id="owner-photo-previous-button">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="focus_on_click">False</property>
- <property name="focus_on_click">False</property>
- <signal name="clicked" handler="on_pgp_owner_photoid_prev" swapped="no"/>
+ <property name="orientation">horizontal</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">2</property>
<child>
<object class="GtkImage">
<property name="visible">True</property>
- <property name="icon-name">go-previous</property>
- </object>
- </child>
- </object>
- </child>
- <child>
- <object class="GtkButton" id="owner-photo-next-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="on_pgp_owner_photoid_next" swapped="no"/>
- <child>
- <object class="GtkBox">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="can_focus">False</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="icon-name">go-next</property>
- </object>
- </child>
+ <property name="icon-name">go-next</property>
</object>
</child>
</object>
@@ -223,7 +210,6 @@
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
- <property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkGrid">
@@ -232,32 +218,20 @@
<property name="border_width">3</property>
<property name="column_spacing">12</property>
<property name="row_spacing">6</property>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" context="name-of-key"
comments="Name of key, usually a persons name">Name:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="left_attach">0</property>
- </packing>
- </child>
<child>
<object class="GtkLabel" id="owner-name-label">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">0</property>
<property name="selectable">True</property>
+ <attributes>
+ <attribute name="scale" value="1.75"/>
+ </attributes>
</object>
<packing>
<property name="top_attach">0</property>
- <property name="left_attach">1</property>
+ <property name="left_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -265,10 +239,10 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">1</property>
- <property name="label" translatable="yes">Email:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label" translatable="yes">Email</property>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">1</property>
@@ -293,9 +267,9 @@
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Comment:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">2</property>
@@ -320,9 +294,9 @@
<property name="can_focus">False</property>
<property name="xalign">1</property>
<property name="label" translatable="yes">Type:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">3</property>
@@ -348,9 +322,9 @@
<property name="xalign">1</property>
<property name="yalign">0</property>
<property name="label" translatable="yes">Key ID:</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <style>
+ <class name="dim-label"/>
+ </style>
</object>
<packing>
<property name="top_attach">4</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
