[seahorse/wip/nielsdg/pgp-key-properties: 5/6] pgp: KeyProperties: simplify UI files
- From: Niels De Graef <nielsdg src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [seahorse/wip/nielsdg/pgp-key-properties: 5/6] pgp: KeyProperties: simplify UI files
- Date: Fri, 11 Jan 2019 20:38:39 +0000 (UTC)
commit 1516d2e5acda9692f98efc38312c640119579993
Author: Niels De Graef <nielsdegraef gmail com>
Date: Thu Jan 10 21:15:55 2019 +0100
pgp: KeyProperties: simplify UI files
* Leave out unnecessary packing arguments
* Use `margin` instead of a `GtkAlignment`
* Remove some uses of GtkStock
pgp/seahorse-pgp-key-properties.c | 4 +-
pgp/seahorse-pgp-private-key-properties.ui | 927 ++++++++-------------------
pgp/seahorse-pgp-public-key-properties.ui | 995 +++++++----------------------
3 files changed, 527 insertions(+), 1399 deletions(-)
---
diff --git a/pgp/seahorse-pgp-key-properties.c b/pgp/seahorse-pgp-key-properties.c
index 1ec39fb9..770d6923 100644
--- a/pgp/seahorse-pgp-key-properties.c
+++ b/pgp/seahorse-pgp-key-properties.c
@@ -1737,7 +1737,7 @@ do_trust (SeahorseWidget *swidget)
/* Remote keys */
if (!SEAHORSE_IS_GPGME_KEY (object)) {
show_gtkbuilder_widget (swidget, "manual-trust-area", FALSE);
- show_gtkbuilder_widget (swidget, "manage-trust-area", TRUE);
+ show_gtkbuilder_widget (swidget, "trust-marginal-check", TRUE);
show_gtkbuilder_widget (swidget, "sign-area", FALSE);
show_gtkbuilder_widget (swidget, "revoke-area", FALSE);
sensitive_gtkbuilder_widget (swidget, "trust-marginal-check", FALSE);
@@ -1794,7 +1794,7 @@ do_trust (SeahorseWidget *swidget)
/* Managed and unmanaged areas */
show_gtkbuilder_widget (swidget, "manual-trust-area", !managed);
- show_gtkbuilder_widget (swidget, "manage-trust-area", managed);
+ show_gtkbuilder_widget (swidget, "trust-marginal-check", managed);
/* Managed check boxes */
if (managed) {
diff --git a/pgp/seahorse-pgp-private-key-properties.ui b/pgp/seahorse-pgp-private-key-properties.ui
index 21db4563..ef54cbe3 100644
--- a/pgp/seahorse-pgp-private-key-properties.ui
+++ b/pgp/seahorse-pgp-private-key-properties.ui
@@ -31,7 +31,7 @@
<property name="type_hint">dialog</property>
<signal name="delete_event" handler="on_widget_delete_event"/>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
@@ -40,7 +40,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkBox" id="vbox7">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="border_width">12</property>
@@ -50,23 +50,19 @@
<property name="spacing">12</property>
<property name="orientation">horizontal</property>
<child>
- <object class="GtkImage" id="image40">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-error</property>
+ <property name="icon-name">dialog-error</property>
<property name="icon-size">6</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox31">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label22225">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">This key has been revoked</property>
@@ -74,63 +70,37 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment43">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="label22226">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">The owner of the key revoked the
key. It can no longer be used.</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">The owner of the key revoked the key.
It can no longer be used.</property>
+ <property name="margin-start">12</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="expired-area">
+ <object class="GtkBox">
<property name="spacing">12</property>
<property name="orientation">horizontal</property>
<child>
- <object class="GtkImage" id="image41">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-error</property>
+ <property name="icon-name">dialog-error</property>
<property name="icon-size">6</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox32">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label22227">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">This key has expired</property>
@@ -138,29 +108,14 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment44">
+ <object class="GtkLabel" id="expired-message">
<property name="visible">True</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="expired-message">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="label">This key expired on: (placeholder)</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="margin-start">12</property>
+ <property name="label">This key expired on: (placeholder)</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
<packing>
@@ -168,18 +123,15 @@
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="hbox5">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
+ <property name="margin">18</property>
<child>
- <object class="GtkBox" id="hbox31">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<child>
@@ -188,10 +140,10 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<property name="margin">6</property>
- <property name="margin-top">6</property>
+ <property name="margin-top">0</property>
<signal name="drag_data_received" handler="on_pgp_owner_photo_drag_received"/>
<child>
- <object class="GtkEventBox" id="image_eventbox">
+ <object class="GtkEventBox">
<property name="visible">True</property>
<signal name="scroll_event" handler="on_pgp_owner_photoid_button"/>
<child>
@@ -204,12 +156,9 @@
</object>
</child>
</object>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="hbox61">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="spacing">6</property>
@@ -225,17 +174,12 @@
</child>
<signal name="clicked" handler="on_pgp_owner_photo_add_button"/>
<child>
- <object class="GtkImage" id="image46">
+ <object class="GtkImage">
<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">
@@ -249,17 +193,12 @@
</child>
<signal name="clicked" handler="on_pgp_owner_photo_delete_button"/>
<child>
- <object class="GtkImage" id="image45">
+ <object class="GtkImage">
<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">
@@ -273,25 +212,17 @@
</child>
<signal name="clicked" handler="on_pgp_owner_photo_primary_button"/>
<child>
- <object class="GtkImage" id="image47">
+ <object class="GtkImage">
<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">
+ <object class="GtkLabel">
<property name="visible">True</property>
</object>
- <packing>
- <property name="position">3</property>
- </packing>
</child>
<child>
<object class="GtkButton" id="owner-photo-previous-button">
@@ -306,17 +237,12 @@
</child>
<signal name="clicked" handler="on_pgp_owner_photoid_prev"/>
<child>
- <object class="GtkImage" id="image43">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="stock">gtk-go-back</property>
+ <property name="icon-name">go-previous</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">
@@ -330,70 +256,21 @@
</child>
<signal name="clicked" handler="on_pgp_owner_photoid_next"/>
<child>
- <object class="GtkAlignment" id="alignment46">
+ <object class="GtkImage">
<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="icon-name">go-next</property>
</object>
</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="position">0</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">12</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox36">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
@@ -538,98 +415,38 @@
</object>
</child>
<child>
- <object class="GtkAlignment" id="alignment51">
+ <object class="GtkButton" id="passphrase-button">
<property name="visible">True</property>
- <property name="xalign">1</property>
- <property name="yalign">1</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="passphrase-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_passphrase_button_clicked"/>
- <child>
- <object class="GtkAlignment" id="alignment9">
- <property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkBox" id="hbox20">
- <property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image11">
- <property name="visible">True</property>
- <property name="stock">gtk-edit</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="label47">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Change
_Passphrase</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>
- </object>
- </child>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Change _Passphrase</property>
+ <property name="use_underline">True</property>
+ <signal name="clicked" handler="on_pgp_owner_passphrase_button_clicked"/>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="padding">6</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="xpad">3</property>
+ <property name="margin-start">3</property>
+ <property name="margin-end">3</property>
<property name="label" translatable="yes">Owner</property>
</object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox10">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="border_width">12</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label22261">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Key Names and Signatures</property>
@@ -637,19 +454,15 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="hbox8">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="border_width">6</property>
+ <property name="margin">6</property>
<child>
- <object class="GtkBox" id="table5">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
@@ -660,38 +473,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_names_primary_clicked"/>
<child>
- <object class="GtkAlignment" id="alignment5">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox13">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image7">
- <property name="visible">True</property>
- <property name="stock">gtk-go-up</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="label36">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Primary</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>
+ <property name="stock">gtk-go-up</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Primary</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -706,38 +503,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_names_sign_clicked"/>
<child>
- <object class="GtkAlignment" id="alignment6">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox14">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image8">
- <property name="visible">True</property>
- <property name="stock">gtk-index</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="label37">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Sign</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>
+ <property name="stock">gtk-index</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Sign</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -752,38 +533,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_names_delete_clicked"/>
<child>
- <object class="GtkAlignment" id="alignment2">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox9">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image4">
- <property name="visible">True</property>
- <property name="stock">gtk-delete</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="label32">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Delete</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>
+ <property name="stock">gtk-delete</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Delete</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -798,38 +563,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_names_add_clicked"/>
<child>
- <object class="GtkAlignment" id="alignment53">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox66">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image50">
- <property name="visible">True</property>
- <property name="stock">gtk-add</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="label22262">
- <property name="visible">True</property>
- <property name="label" translatable="yes" comments="Add another name
to the PGP key.">_Add Name</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>
+ <property name="stock">gtk-add</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" comments="Add another name to
the PGP key.">_Add Name</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -843,28 +592,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_names_revoke_clicked"/>
<child>
- <object class="GtkAlignment" id="alignment13">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="halign">center</property>
+ <property name="orientation">horizontal</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox29">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image15">
- <property name="visible">True</property>
- <property name="stock">gtk-cancel</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label58">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Revoke</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ <property name="stock">gtk-cancel</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Revoke</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -874,7 +617,7 @@
</object>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="hexpand">True</property>
<property name="can_focus">True</property>
@@ -885,150 +628,131 @@
<object class="GtkTreeView" id="names-tree">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="margin">6</property>
</object>
</child>
</object>
- <packing>
- <property name="padding">6</property>
- <property name="position">1</property>
- <property name="expand">True</property>
- </packing>
</child>
</object>
- <packing>
- <property name="padding">6</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child type="tab">
<object class="GtkLabel" id="labelsig">
<property name="visible">True</property>
- <property name="xpad">3</property>
+ <property name="margin-start">3</property>
+ <property name="margin-end">3</property>
<property name="label" translatable="yes" comments="List of names and signatures on the PGP
key.">Names and Signatures</property>
</object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox8">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <object class="GtkBox" id="hbox63">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
- <object class="GtkBox" id="vbox34">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame9">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment47">
+ <object class="GtkGrid">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
+ <property name="column_spacing">12</property>
+ <property name="row_spacing">6</property>
+ <property name="margin-top">6</property>
+ <property name="margin-left">12</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Key ID:</property>
+ </object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">0</property>
+ </packing>
+ </child>
<child>
- <object class="GtkGrid">
+ <object class="GtkLabel" id="details-id-label">
<property name="visible">True</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">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Key ID:</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="left_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="details-id-label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="top_attach">0</property>
- <property name="left_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Type:</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="left_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="details-algo-label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="top_attach">1</property>
- <property name="left_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label" translatable="yes">Strength:</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="details-strength-label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="selectable">True</property>
- </object>
- <packing>
- <property name="top_attach">2</property>
- <property name="left_attach">1</property>
- </packing>
- </child>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="selectable">True</property>
</object>
+ <packing>
+ <property name="top_attach">0</property>
+ <property name="left_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Type:</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-algo-label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="left_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">Strength:</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="details-strength-label">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="selectable">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">2</property>
+ <property name="left_attach">1</property>
+ </packing>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label22248">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Technical Details</property>
<attributes>
@@ -1037,34 +761,26 @@
</object>
</child>
</object>
- <packing>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkFrame" id="frame10">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment" id="alignment48">
+ <object class="GtkLabel" id="details-fingerprint-label">
<property name="visible">True</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="details-fingerprint-label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- </child>
+ <property name="can_focus">True</property>
+ <property name="margin-top">6</property>
+ <property name="margin-left">12</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label22250">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Fingerprint</property>
<attributes>
@@ -1073,23 +789,16 @@
</object>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox35">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkFrame" id="frame11">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
@@ -1101,7 +810,7 @@
<property name="margin-top">6</property>
<property name="margin-start">12</property>
<child>
- <object class="GtkLabel" id="label22251">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
@@ -1125,7 +834,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label22252">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="yalign">0.25</property>
@@ -1137,7 +846,7 @@
</packing>
</child>
<child>
- <object class="GtkBox" id="hbox65">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="spacing">6</property>
@@ -1157,7 +866,7 @@
<property name="receives_default">False</property>
<signal name="clicked" handler="on_pgp_details_expires_button"/>
<child>
- <object class="GtkImage" id="image49">
+ <object class="GtkImage">
<property name="visible">True</property>
<property name="icon_name">x-office-calendar</property>
</object>
@@ -1173,7 +882,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label22255">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Dates</property>
<attributes>
@@ -1182,13 +891,9 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkFrame" id="frame12">
+ <object class="GtkFrame">
<property name="visible">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">none</property>
@@ -1216,7 +921,7 @@
<property name="model">model1</property>
<signal name="changed" handler="on_pgp_details_trust_changed"/>
<child>
- <object class="GtkCellRendererText" id="renderer1"/>
+ <object class="GtkCellRendererText"/>
<attributes>
<attribute name="text">0</attribute>
</attributes>
@@ -1228,7 +933,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="label22260">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Export Secret Key:</property>
@@ -1247,38 +952,22 @@
<property name="receives_default">False</property>
<signal name="clicked" handler="on_pgp_details_export_button"/>
<child>
- <object class="GtkAlignment" id="alignment8">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="stock">gtk-save</property>
+ </object>
+ </child>
<child>
- <object class="GtkBox" id="hbox19">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image10">
- <property name="visible">True</property>
- <property name="stock">gtk-save</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="label46">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Export</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>
+ <property name="label" translatable="yes">Export</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -1292,7 +981,7 @@
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label22257">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">Actions</property>
<attributes>
@@ -1301,31 +990,16 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkHSeparator" id="hseparator2">
+ <object class="GtkSeparator">
<property name="visible">True</property>
+ <property name="orientation">horizontal</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="position">1</property>
- </packing>
</child>
<child>
<object class="GtkExpander" id="subkey-expander">
@@ -1333,7 +1007,7 @@
<property name="can_focus">True</property>
<property name="expanded">True</property>
<child>
- <object class="GtkBox" id="hbox10">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<child>
@@ -1349,38 +1023,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_details_add_subkey_button"/>
<child>
- <object class="GtkAlignment" id="alignment3">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox11">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image5">
- <property name="visible">True</property>
- <property name="stock">gtk-add</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="label34">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Add</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>
+ <property name="stock">gtk-add</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Add</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -1395,38 +1053,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_details_expires_subkey"/>
<child>
- <object class="GtkAlignment" id="alignment18">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox48">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image30">
- <property name="visible">True</property>
- <property name="icon_name">x-office-calendar</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="label89">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Expire</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>
+ <property name="icon_name">x-office-calendar</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Expire</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -1441,28 +1083,22 @@
<property name="border_width">6</property>
<signal name="clicked" handler="on_pgp_details_revoke_subkey_button"/>
<child>
- <object class="GtkAlignment" id="alignment14">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
+ <property name="orientation">horizontal</property>
+ <property name="halign">center</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkBox" id="hbox30">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
- <property name="spacing">2</property>
- <child>
- <object class="GtkImage" id="image16">
- <property name="visible">True</property>
- <property name="stock">gtk-close</property>
- </object>
- </child>
- <child>
- <object class="GtkLabel" id="label59">
- <property name="visible">True</property>
- <property name="label" translatable="yes">Revoke</property>
- <property name="use_underline">True</property>
- </object>
- </child>
+ <property name="stock">gtk-close</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Revoke</property>
+ <property name="use_underline">True</property>
</object>
</child>
</object>
@@ -1483,7 +1119,7 @@
</object>
</child>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hscrollbar_policy">automatic</property>
@@ -1497,14 +1133,13 @@
</child>
</object>
<packing>
- <property name="position">1</property>
<property name="expand">True</property>
</packing>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label33">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="label" translatable="yes">_Subkeys</property>
<property name="use_underline">True</property>
@@ -1519,14 +1154,12 @@
</packing>
</child>
</object>
- <packing>
- <property name="position">2</property>
- </packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label2">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="xpad">3</property>
+ <property name="margin-start">3</property>
+ <property name="margin-end">3</property>
<property name="label" translatable="yes">Details</property>
</object>
<packing>
diff --git a/pgp/seahorse-pgp-public-key-properties.ui b/pgp/seahorse-pgp-public-key-properties.ui
index 5f7b11f3..7ddbbd6b 100644
--- a/pgp/seahorse-pgp-public-key-properties.ui
+++ b/pgp/seahorse-pgp-public-key-properties.ui
@@ -31,7 +31,7 @@
<property name="title" translatable="yes">Key Properties</property>
<property name="type_hint">dialog</property>
<child internal-child="vbox">
- <object class="GtkBox" id="dialog-vbox1">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">2</property>
@@ -40,7 +40,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkBox" id="vbox7">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
@@ -52,26 +52,21 @@
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<child>
- <object class="GtkImage" id="image36">
+ <object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-dialog-error</property>
+ <property name="icon-name">dialog-error</property>
<property name="icon_size">6</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox28">
+ <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="GtkLabel" id="label114">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -80,45 +75,19 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment39">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="label115">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">The owner of the key revoked the
key. It can no longer be used.</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="margin-start">12</property>
+ <property name="label" translatable="yes">The owner of the key revoked the key.
It can no longer be used.</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">True</property>
- <property name="fill">True</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>
<child>
<object class="GtkBox" id="expired-area">
@@ -126,26 +95,21 @@
<property name="orientation">horizontal</property>
<property name="spacing">12</property>
<child>
- <object class="GtkImage" id="image37">
+ <object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="stock">gtk-dialog-error</property>
+ <property name="icon-name">dialog-error</property>
<property name="icon_size">6</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox29">
+ <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="GtkLabel" id="label116">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -154,210 +118,109 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment40">
+ <object class="GtkLabel" id="expired-message">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="expired-message">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label">This key expired on: (placeholder)</property>
- </object>
- </child>
+ <property name="xalign">0</property>
+ <property name="margin-start">12</property>
+ <property name="label">This key expired on: (placeholder)</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">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="hbox5">
+ <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" id="hbox31">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="can_focus">False</property>
+ <property name="margin">12</property>
<child>
- <object class="GtkBox" id="vbox12">
+ <object class="GtkBox">
<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>
<child>
- <object class="GtkBox" id="vbox19">
+ <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">6</property>
+ <signal name="scroll-event" handler="on_pgp_owner_photoid_button"
swapped="no"/>
<child>
- <object class="GtkEventBox" id="image_eventbox">
+ <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>
+ <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>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</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="can_focus">False</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="GtkLabel" id="add-photo-help">
+ <object class="GtkBox">
<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"/>
- <child>
- <object class="GtkImage" id="image27">
- <property name="visible">True</property>
- <property name="can_focus">False</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">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"/>
+ <property name="spacing">2</property>
<child>
- <object class="GtkAlignment" id="alignment17">
+ <object class="GtkImage">
<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="icon-name">go-next</property>
</object>
</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>
</child>
</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="padding">12</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox38">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
@@ -507,44 +370,33 @@
</packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<object class="GtkExpander" id="uids-area">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkAlignment" id="alignment23">
+ <object class="GtkScrolledWindow" id="scrolledwindow1">
+ <property name="height_request">130</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">3</property>
+ <property name="can_focus">True</property>
+ <property name="hscrollbar_policy">never</property>
+ <property name="shadow_type">in</property>
+ <property name="margin-top">3</property>
<child>
- <object class="GtkScrolledWindow" id="scrolledwindow1">
- <property name="height_request">130</property>
+ <object class="GtkTreeView" id="owner-userid-tree">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="hscrollbar_policy">never</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="owner-userid-tree">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="headers_visible">False</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection1"/>
- </child>
- </object>
+ <property name="headers_visible">False</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection1"/>
</child>
</object>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label28">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes" comments="Names set on the PGP
key.">_Other Names:</property>
@@ -555,355 +407,170 @@
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label1">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">3</property>
+ <property name="margin-start">3</property>
+ <property name="margin-end">3</property>
<property name="label" translatable="yes">Owner</property>
</object>
- <packing>
- <property name="tab_fill">False</property>
- </packing>
</child>
<child>
<object class="GtkBox" id="trust-page">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
- <property name="border_width">12</property>
- <property name="spacing">12</property>
+ <property name="margin">12</property>
+ <property name="spacing">24</property>
<child>
- <object class="GtkBox" id="hbox59">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
+ <property name="orientation">vertical</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkImage" id="sign-image">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
- <property name="stock">gtk-dialog-info</property>
- <property name="icon_size">6</property>
+ <property name="label" translatable="yes">Your trust of this key</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox36">
+ <object class="GtkLabel" id="manual-trust-area">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="xalign">0</property>
+ <property name="margin-start">4</property>
+ <property name="margin-end">4</property>
+ <property name="label" translatable="yes">Your trust is manually specified on the
<i>Details</i> tab.</property>
+ <property name="use_markup">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="trust-marginal-check">
+ <property name="label" translatable="yes">I trust signatures from “%s” on other
keys</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ <signal name="toggled" handler="on_pgp_trust_marginal_toggled" swapped="no"/>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="sign-area">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
<child>
- <object class="GtkLabel" id="label22225">
+ <object class="GtkLabel" id="trust-sign-label">
+ <property name="width_request">270</property>
<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">Your trust of this key</property>
- <attributes>
- <attribute name="weight" value="bold"/>
- </attributes>
+ <property name="label" translatable="yes">If you believe that the person that
owns this key is “%s”, <i>sign</i> this key:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment43">
+ <object class="GtkButton" id="sign-button">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <signal name="clicked" handler="on_pgp_trust_sign" swapped="no"/>
<child>
- <object class="GtkBox" id="vbox37">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
+ <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">2</property>
<child>
- <object class="GtkLabel" id="manual-trust-area">
+ <object class="GtkImage">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="xpad">4</property>
- <property name="label" translatable="yes">Your trust is manually
specified on the <i>Details</i> tab.</property>
- <property name="use_markup">True</property>
+ <property name="stock">gtk-index</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="manage-trust-area">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
<property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkCheckButton" id="trust-marginal-check">
- <property name="label" translatable="yes">I trust signatures from
“%s” on other keys</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="xalign">0</property>
- <property name="draw_indicator">True</property>
- <signal name="toggled" handler="on_pgp_trust_marginal_toggled"
swapped="no"/>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">_Sign this Key</property>
+ <property name="use_underline">True</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object class="GtkBox" id="revoke-area">
+ <property name="visible">True</property>
+ <property name="orientation">horizontal</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="trust-revoke-label">
+ <property name="width_request">270</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">If you no longer trust that “%s” owns
this key, <i>revoke</i> your signature:</property>
+ <property name="use_markup">True</property>
+ <property name="wrap">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkButton" id="revoke-button">
+ <property name="visible">True</property>
+ <property name="sensitive">False</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <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="GtkBox" id="sign-area">
+ <object class="GtkImage">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="trust-sign-label">
- <property name="width_request">270</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">If you believe that the
person that owns this key is “%s”, <i>sign</i> this key:</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment45">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="sign-button">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <signal name="clicked" handler="on_pgp_trust_sign" swapped="no"/>
- <child>
- <object class="GtkAlignment" id="alignment22">
- <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="hbox49">
- <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="image30">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-index</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="label101">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Sign this
Key</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>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="stock">gtk-remove</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="revoke-area">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="trust-revoke-label">
- <property name="width_request">270</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">If you no longer trust
that “%s” owns this key, <i>revoke</i> your signature:</property>
- <property name="use_markup">True</property>
- <property name="wrap">True</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment" id="alignment44">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">1</property>
- <property name="yalign">0</property>
- <property name="xscale">0</property>
- <property name="yscale">0</property>
- <child>
- <object class="GtkButton" id="revoke-button">
- <property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <child>
- <object class="GtkAlignment" id="alignment25">
- <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="hbox51">
- <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="image32">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="stock">gtk-remove</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="label104">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">_Revoke
Signature</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>
- </object>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">_Revoke Signature</property>
+ <property name="use_underline">True</property>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">3</property>
- </packing>
</child>
</object>
</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">True</property>
- <property name="fill">True</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>
<child>
<object class="GtkBox" id="signatures-area">
@@ -911,7 +578,7 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkLabel" id="label99">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -921,122 +588,76 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment20">
+ <object class="GtkScrolledWindow" id="scrolledwindow4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkBox" id="vbox22">
+ <object class="GtkTreeView" id="signatures-tree">
<property name="visible">True</property>
- <property name="orientation">vertical</property>
- <property name="can_focus">False</property>
- <property name="spacing">6</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow4">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="signatures-tree">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <signal name="row-activated" handler="on_pgp_signature_row_activated"
swapped="no"/>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection2"/>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkCheckButton" id="signatures-toggle">
- <property name="label" translatable="yes">_Only display the signatures of
people I trust</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="receives_default">False</property>
- <property name="use_underline">True</property>
- <property name="xalign">0.5</property>
- <property name="draw_indicator">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
+ <property name="vexpand">True</property>
+ <property name="can_focus">True</property>
+ <signal name="row-activated" handler="on_pgp_signature_row_activated"
swapped="no"/>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection2"/>
</child>
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="signatures-toggle">
+ <property name="label" translatable="yes">_Only display the signatures of people I
trust</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0.5</property>
+ <property name="draw_indicator">True</property>
+ </object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="position">1</property>
- </packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label96">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">3</property>
+ <property name="margin-start">3</property>
+ <property name="margin-end">3</property>
<property name="label" translatable="yes">Trust</property>
</object>
- <packing>
- <property name="position">1</property>
- <property name="tab_fill">False</property>
- </packing>
</child>
<child>
- <object class="GtkBox" id="vbox8">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="border_width">12</property>
<property name="spacing">12</property>
<child>
- <object class="GtkBox" id="hbox53">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<property name="can_focus">False</property>
<property name="spacing">12</property>
<property name="homogeneous">True</property>
<child>
- <object class="GtkBox" id="vbox27">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="spacing">18</property>
<child>
- <object class="GtkBox" id="vbox32">
+ <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="GtkLabel" id="label108">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -1045,11 +666,6 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<object class="GtkGrid">
@@ -1137,27 +753,17 @@
</packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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>
<child>
- <object class="GtkBox" id="vbox33">
+ <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="GtkLabel" id="label113">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -1166,64 +772,38 @@
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment32">
+ <object class="GtkLabel" id="details-fingerprint-label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkLabel" id="details-fingerprint-label">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="xalign">0</property>
- <property name="yalign">0</property>
- <property name="label">PLAC EHOL DER0 9023 435F
+ <property name="can_focus">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label">PLAC EHOL DER0 9023 435F
B4C3 4349 0932 7854 3452</property>
- <property name="use_markup">True</property>
- <property name="selectable">True</property>
- </object>
- </child>
+ <property name="use_markup">True</property>
+ <property name="selectable">True</property>
+ <property name="margin-start">12</property>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</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>
<child>
- <object class="GtkBox" id="vbox26">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<property name="can_focus">False</property>
<property name="spacing">18</property>
<child>
- <object class="GtkBox" id="vbox34">
+ <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="GtkLabel" id="label110">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -1291,27 +871,17 @@ B4C3 4349 0932 7854 3452</property>
</packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</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>
<child>
- <object class="GtkBox" id="vbox35">
+ <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="GtkLabel" id="label111">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="xalign">0</property>
@@ -1320,129 +890,70 @@ B4C3 4349 0932 7854 3452</property>
<attribute name="weight" value="bold"/>
</attributes>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
- <object class="GtkAlignment" id="alignment31">
+ <object class="GtkBox">
<property name="visible">True</property>
+ <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="spacing">12</property>
+ <property name="margin-start">12</property>
<child>
- <object class="GtkBox" id="hbox54">
+ <object class="GtkLabel">
<property name="visible">True</property>
- <property name="orientation">horizontal</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
- <child>
- <object class="GtkLabel" id="label112">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">You _Trust the
Owner:</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
- </child>
+ <property name="label" translatable="yes">You _Trust the
Owner:</property>
+ <property name="use_underline">True</property>
+ </object>
+ </child>
+ <child>
+ <object class="GtkComboBox" id="details-trust-combobox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="model">model1</property>
+ <signal name="changed" handler="on_pgp_details_trust_changed"
swapped="no"/>
<child>
- <object class="GtkComboBox" id="details-trust-combobox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="model">model1</property>
- <signal name="changed" handler="on_pgp_details_trust_changed"
swapped="no"/>
- <child>
- <object class="GtkCellRendererText" id="renderer1"/>
- <attributes>
- <attribute name="text">0</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">1</property>
- </packing>
+ <object class="GtkCellRendererText"/>
+ <attributes>
+ <attribute name="text">0</attribute>
+ </attributes>
</child>
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">False</property>
- <property name="position">0</property>
- </packing>
</child>
<child>
<object class="GtkExpander" id="subkey-expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkBox" id="hbox10">
+ <object class="GtkScrolledWindow">
<property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="shadow_type">in</property>
<property name="vexpand">True</property>
- <property name="orientation">horizontal</property>
- <property name="can_focus">False</property>
+ <property name="margin-top">6</property>
+ <property name="margin-start">12</property>
<child>
- <object class="GtkAlignment" id="alignment28">
+ <object class="GtkTreeView" id="details-subkey-tree">
+ <property name="height_request">100</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="top_padding">6</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkScrolledWindow" id="scrolledwindow2">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView" id="details-subkey-tree">
- <property name="height_request">100</property>
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <child internal-child="selection">
- <object class="GtkTreeSelection" id="treeview-selection3"/>
- </child>
- </object>
- </child>
- </object>
+ <property name="can_focus">True</property>
+ <child internal-child="selection">
+ <object class="GtkTreeSelection" id="treeview-selection3"/>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
</child>
</object>
</child>
<child type="label">
- <object class="GtkLabel" id="label33">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Subkeys</property>
@@ -1453,35 +964,19 @@ B4C3 4349 0932 7854 3452</property>
</object>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
- <packing>
- <property name="position">2</property>
- </packing>
</child>
<child type="tab">
- <object class="GtkLabel" id="label22222">
+ <object class="GtkLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xpad">3</property>
+ <property name="margin-start">3</property>
+ <property name="margin-end">3</property>
<property name="label" translatable="yes">Details</property>
</object>
- <packing>
- <property name="position">2</property>
- <property name="tab_fill">False</property>
- </packing>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
