commit 5598b50fcc27fef3a8ac60ddc713beefaac7f26c
Author: Niels De Graef <nielsdegraef gmail com>
Date: Thu Jan 10 19:17:12 2019 +0100
pgp: KeyProperties: Remove frame/label for photo
pgp/seahorse-pgp-private-key-properties.ui | 356 ++++++++++++++---------------
pgp/seahorse-pgp-public-key-properties.ui | 214 ++++++++---------
2 files changed, 257 insertions(+), 313 deletions(-)
---
diff --git a/pgp/seahorse-pgp-private-key-properties.ui b/pgp/seahorse-pgp-private-key-properties.ui
index cfceb6f7..5177842b 100644
--- a/pgp/seahorse-pgp-private-key-properties.ui
+++ b/pgp/seahorse-pgp-private-key-properties.ui
@@ -183,225 +183,201 @@
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<child>
- <object class="GtkFrame" id="owner-photo-frame">
+ <object class="GtkBox" id="owner-photo-frame">
<property name="visible">True</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="margin">6</property>
+ <property name="margin-top">6</property>
<signal name="drag_data_received" handler="on_pgp_owner_photo_drag_received"/>
<child>
- <object class="GtkAlignment" id="alignment45">
+ <object class="GtkEventBox" id="image_eventbox">
+ <property name="visible">True</property>
+ <signal name="scroll_event" handler="on_pgp_owner_photoid_button"/>
+ <child>
+ <object class="GtkImage" id="photoid">
+ <property name="width_request">150</property>
+ <property name="height_request">160</property>
+ <property name="visible">True</property>
+ <property name="icon-name">avatar-default-symbolic</property>
+ <property name="icon-size">6</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox61">
<property name="visible">True</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="vbox33">
+ <object class="GtkButton" id="owner-photo-add-button">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="spacing">6</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="owner-photo-add-button-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Add a photo to this key</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_pgp_owner_photo_add_button"/>
<child>
- <object class="GtkEventBox" id="image_eventbox">
+ <object class="GtkImage" id="image46">
<property name="visible">True</property>
- <signal name="scroll_event" handler="on_pgp_owner_photoid_button"/>
- <child>
- <object class="GtkImage" id="photoid">
- <property name="width_request">150</property>
- <property name="height_request">160</property>
- <property name="visible">True</property>
- <property name="icon-name">avatar-default-symbolic</property>
- <property name="icon-size">6</property>
- </object>
- </child>
+ <property name="stock">gtk-add</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="owner-photo-delete-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="owner-photo-delete-button-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Remove this photo from this key</property>
</object>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
+ <signal name="clicked" handler="on_pgp_owner_photo_delete_button"/>
<child>
- <object class="GtkBox" id="hbox61">
+ <object class="GtkImage" id="image45">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkButton" id="owner-photo-add-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="owner-photo-add-button-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes">Add a photo to this key</property>
- </object>
- </child>
- <signal name="clicked" handler="on_pgp_owner_photo_add_button"/>
- <child>
- <object class="GtkImage" id="image46">
- <property name="visible">True</property>
- <property name="stock">gtk-add</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="owner-photo-delete-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="owner-photo-delete-button-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes">Remove this photo from this key</property>
- </object>
- </child>
- <signal name="clicked"
handler="on_pgp_owner_photo_delete_button"/>
- <child>
- <object class="GtkImage" id="image45">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton" id="owner-photo-primary-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="owner-photo-primary-button-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes">Make this photo the primary photo</property>
- </object>
- </child>
- <signal name="clicked"
handler="on_pgp_owner_photo_primary_button"/>
- <child>
- <object class="GtkImage" id="image47">
- <property name="visible">True</property>
- <property name="stock">gtk-go-up</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label22232">
- <property name="visible">True</property>
- </object>
- <packing>
- <property name="position">3</property>
- </packing>
- </child>
+ <property name="stock">gtk-delete</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="owner-photo-primary-button">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="owner-photo-primary-button-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Make this photo the primary photo</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_pgp_owner_photo_primary_button"/>
+ <child>
+ <object class="GtkImage" id="image47">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-up</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label22232">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <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>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="owner-photo-previous-button-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Go to previous photo</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_pgp_owner_photoid_prev"/>
+ <child>
+ <object class="GtkImage" id="image43">
+ <property name="visible">True</property>
+ <property name="stock">gtk-go-back</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </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>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="owner-photo-next-button-atkobject">
+ <property name="AtkObject::accessible-description"
translatable="yes">Go to next photo</property>
+ </object>
+ </child>
+ <signal name="clicked" handler="on_pgp_owner_photoid_next"/>
+ <child>
+ <object class="GtkAlignment" id="alignment46">
+ <property name="visible">True</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkButton" id="owner-photo-previous-button">
+ <object class="GtkBox" id="hbox62">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="focus_on_click">False</property>
- <child internal-child="accessible">
- <object class="AtkObject"
id="owner-photo-previous-button-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes">Go to previous photo</property>
- </object>
- </child>
- <signal name="clicked" handler="on_pgp_owner_photoid_prev"/>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image43">
+ <object class="GtkImage" id="image48">
<property name="visible">True</property>
- <property name="stock">gtk-go-back</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">4</property>
- </packing>
- </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>
- <child internal-child="accessible">
- <object class="AtkObject"
id="owner-photo-next-button-atkobject">
- <property name="AtkObject::accessible-description"
translatable="yes">Go to next photo</property>
+ <property name="stock">gtk-go-forward</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- <signal name="clicked" handler="on_pgp_owner_photoid_next"/>
<child>
- <object class="GtkAlignment" id="alignment46">
+ <object class="GtkLabel" id="label22233">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkBox" id="hbox62">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image48">
- <property name="visible">True</property>
- <property name="stock">gtk-go-forward</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label22233">
- <property name="visible">True</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">5</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">5</property>
+ </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label22231">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="A photograph">Photo
</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/pgp/seahorse-pgp-public-key-properties.ui b/pgp/seahorse-pgp-public-key-properties.ui
index 468f1ddb..631be3e6 100644
--- a/pgp/seahorse-pgp-public-key-properties.ui
+++ b/pgp/seahorse-pgp-public-key-properties.ui
@@ -211,167 +211,135 @@
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkFrame" id="photo-id">
+ <object class="GtkBox" id="vbox19">
<property name="visible">True</property>
+ <property name="orientation">vertical</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="spacing">6</property>
+ <property name="margin">6</property>
+ <property name="margin-top">6</property>
+ <child>
+ <object class="GtkEventBox" id="image_eventbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <signal name="scroll-event" handler="on_pgp_owner_photoid_button"
swapped="no"/>
+ <child>
+ <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>
+ <property name="icon-name">avatar-default-symbolic</property>
+ <property name="icon-size">6</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkAlignment" id="alignment18">
+ <object class="GtkBox" id="key-controls">
<property name="visible">True</property>
+ <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="bottom_padding">6</property>
- <property name="left_padding">6</property>
- <property name="right_padding">6</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="vbox19">
+ <object class="GtkLabel" id="add-photo-help">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="xalign">1</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <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="GtkEventBox" id="image_eventbox">
+ <object class="GtkImage" id="image27">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <signal name="scroll-event"
handler="on_pgp_owner_photoid_button" swapped="no"/>
- <child>
- <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>
- <property name="icon-name">avatar-default-symbolic</property>
- <property name="icon-size">6</property>
- </object>
- </child>
+ <property name="stock">gtk-go-back</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </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" id="key-controls">
+ <object class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="xscale">0</property>
+ <property name="yscale">0</property>
<child>
- <object class="GtkLabel" id="add-photo-help">
+ <object class="GtkBox" id="hbox44">
<property name="visible">True</property>
+ <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="xalign">1</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <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"/>
+ <property name="spacing">2</property>
<child>
- <object class="GtkImage" id="image27">
+ <object class="GtkImage" id="image24">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-go-back</property>
+ <property name="stock">gtk-go-forward</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </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="GtkAlignment" id="alignment17">
+ <object class="GtkLabel" id="label85">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkBox" id="hbox44">
- <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" id="image24">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-go-forward</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label85">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
+ <property name="use_underline">True</property>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel" id="label89">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes" comments="A photograph">Photo
</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
- </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
<packing>