|
| From: | gnunet |
| Subject: | [taler-anastasis-gtk] branch master updated: adapt provide secret layout to Belen's recommendations |
| Date: | Fri, 09 Jul 2021 13:52:53 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis-gtk.
The following commit(s) were added to refs/heads/master by this push:
new 5b73269 adapt provide secret layout to Belen's recommendations
5b73269 is described below
commit 5b73269bc7c51b616f2d478e26356878d345c913
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Fri Jul 9 13:52:50 2021 +0200
adapt provide secret layout to Belen's recommendations
---
contrib/anastasis_gtk_main_window.glade | 362 +++++++++++++++++++++++++++-----
1 file changed, 305 insertions(+), 57 deletions(-)
diff --git a/contrib/anastasis_gtk_main_window.glade
b/contrib/anastasis_gtk_main_window.glade
index 65d82af..30552c8 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -229,6 +229,11 @@ Author: Christian Grothoff, Dennis Neufeld
<property name="can-focus">False</property>
<property name="stock">gtk-missing-image</property>
</object>
+ <object class="GtkAdjustment" id="expiration_year_adjustment">
+ <property name="upper">9999</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
+ </object>
<object class="GtkImage" id="image1">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -239,6 +244,11 @@ Author: Christian Grothoff, Dennis Neufeld
<property name="can-focus">False</property>
<property name="stock">gtk-dialog-question</property>
</object>
+ <object class="GtkImage" id="open_file_image">
+ <property name="visible">True</property>
+ <property name="can-focus">False</property>
+ <property name="stock">gtk-open</property>
+ </object>
<object class="GtkImage" id="open_image">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -296,6 +306,16 @@ Author: Christian Grothoff, Dennis Neufeld
<property name="margin-right">4</property>
<property name="stock">gtk-go-down</property>
</object>
+ <object class="GtkAdjustment" id="secret_box_adjustmenth">
+ <property name="upper">100</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
+ </object>
+ <object class="GtkAdjustment" id="secret_box_adjustmentv">
+ <property name="upper">100</property>
+ <property name="step-increment">1</property>
+ <property name="page-increment">10</property>
+ </object>
<object class="GtkListStore" id="unpaid_qrcodes_liststore">
<columns>
<!-- column-name qr -->
@@ -2639,105 +2659,332 @@ with funding from the European Commission.</property>
<property name="label-xalign">0</property>
<property name="shadow-type">none</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkScrolledWindow"
id="secret_frame_scrolled_window">
<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="vexpand">True</property>
+ <property
name="hadjustment">secret_box_adjustmenth</property>
+ <property
name="vadjustment">secret_box_adjustmentv</property>
+ <property name="shadow-type">in</property>
+ <property
name="min-content-height">800</property>
+ <property
name="propagate-natural-width">True</property>
+ <property
name="propagate-natural-height">True</property>
<child>
- <object class="GtkBox">
+ <object class="GtkViewport"
id="secret_frame_viewport">
<property
name="visible">True</property>
<property
name="can-focus">False</property>
- <property
name="margin-top">5</property>
- <property
name="margin-bottom">5</property>
- <property
name="orientation">vertical</property>
+ <property
name="hexpand">True</property>
+ <property
name="hadjustment">secret_box_adjustmenth</property>
+ <property
name="vadjustment">secret_box_adjustmentv</property>
<child>
- <object class="GtkBox">
- <property
name="name">anastasis_gtk_enter_secret_as_text_box</property>
+ <object class="GtkBox"
id="secret_frame_main_vbox">
<property
name="visible">True</property>
<property
name="can-focus">False</property>
+ <property
name="valign">start</property>
+ <property
name="margin-start">10</property>
+ <property
name="margin-end">10</property>
+ <property
name="margin-top">5</property>
+ <property
name="margin-bottom">5</property>
+ <property
name="orientation">vertical</property>
+ <property
name="spacing">5</property>
+ <property
name="baseline-position">top</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox"
id="secret_name_vbox">
<property
name="visible">True</property>
<property
name="can-focus">False</property>
- <property name="label"
translatable="yes">Enter as text:</property>
+ <property
name="orientation">vertical</property>
+ <property
name="spacing">5</property>
+ <child>
+ <object class="GtkLabel">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="valign">start</property>
+ <property name="label"
translatable="yes">Secret's name</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="secret_name_entry">
+ <property
name="visible">True</property>
+ <property
name="can-focus">True</property>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="secret_name_explanation_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes">Names should be unique, so that you can easily
+identify your secret later.</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="padding">5</property>
+ <property
name="padding">20</property>
<property
name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry"
id="anastasis_gtk_enter_secret_entry">
+ <object class="GtkBox"
id="secret_entry_vbox">
<property
name="visible">True</property>
- <property
name="can-focus">True</property>
- <property
name="has-focus">True</property>
- <property
name="is-focus">True</property>
- <property
name="primary-icon-stock">gtk-dialog-authentication</property>
- <property
name="input-purpose">password</property>
- <signal name="changed"
handler="anastasis_gtk_enter_secret_entry_changed_cb" swapped="no"/>
+ <property
name="can-focus">False</property>
+ <property
name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel"
id="secret_text_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes">Provide secret as text:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ <property
name="padding">5</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="anastasis_gtk_enter_secret_entry">
+ <property
name="visible">True</property>
+ <property
name="can-focus">True</property>
+ <property
name="valign">start</property>
+ <property
name="margin-left">5</property>
+ <property
name="margin-right">5</property>
+ <property
name="margin-start">5</property>
+ <property
name="margin-end">5</property>
+ <property
name="hexpand">True</property>
+ <property
name="primary-icon-stock">gtk-dialog-authentication</property>
+ <property
name="placeholder-text" translatable="yes">Type or paste your secret
here</property>
+ <property
name="input-purpose">password</property>
+ <signal name="changed"
handler="anastasis_gtk_enter_secret_entry_changed_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property
name="name">anastasis_gtk_enter_secret_file_box</property>
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="margin-top">5</property>
+ <property
name="margin-bottom">5</property>
+ <child>
+ <object class="GtkLabel"
id="secret_by_file_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property name="label"
translatable="yes">Or provide secret as a file:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkButton" id="anastasis_gtk_enter_secret_open_button">
+ <property
name="label">Choose file</property>
+ <property
name="visible">True</property>
+ <property
name="can-focus">True</property>
+ <property
name="can-default">True</property>
+ <property
name="receives-default">True</property>
+ <property
name="image">open_file_image</property>
+ <property
name="always-show-image">True</property>
+ <signal name="clicked"
handler="anastasis_gtk_enter_secret_open_button_clicked_cb" swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
- <property
name="padding">5</property>
+ <property
name="padding">20</property>
<property
name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="padding">5</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox">
- <property
name="name">anastasis_gtk_enter_secret_file_box</property>
- <property
name="visible">True</property>
- <property
name="can-focus">False</property>
- <property
name="margin-top">5</property>
- <property
name="margin-bottom">5</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkBox"
id="expiration_vbox">
<property
name="visible">True</property>
<property
name="can-focus">False</property>
- <property name="label"
translatable="yes">Use file input:</property>
+ <property
name="halign">start</property>
+ <property
name="orientation">vertical</property>
+ <property
name="spacing">5</property>
+ <property
name="baseline-position">top</property>
+ <child>
+ <object class="GtkLabel"
id="recovery_expiration_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property name="label"
translatable="yes">Your secret's recovery data expires on:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox"
id="expiration_hbox">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="expiration_date_without_year">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="label">DYNAMICALLY SET</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="GtkSpinButton" id="expiration_year_spin_button">
+ <property
name="visible">True</property>
+ <property
name="can-focus">True</property>
+ <property
name="max-length">4</property>
+ <property
name="width-chars">4</property>
+ <property
name="max-width-chars">4</property>
+ <property
name="input-purpose">digits</property>
+ <property
name="adjustment">expiration_year_adjustment</property>
+ <property
name="value">9999</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</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="padding">5</property>
- <property
name="position">0</property>
+ <property
name="fill">False</property>
+ <property
name="padding">20</property>
+ <property
name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkButton"
id="anastasis_gtk_enter_secret_open_button">
- <property
name="label">gtk-open</property>
+ <object class="GtkBox"
id="payment_info_vbox">
<property
name="visible">True</property>
- <property
name="can-focus">True</property>
- <property
name="can-default">True</property>
- <property
name="receives-default">True</property>
- <property
name="use-stock">True</property>
- <property
name="always-show-image">True</property>
- <signal name="clicked"
handler="anastasis_gtk_enter_secret_open_button_clicked_cb" swapped="no"/>
+ <property
name="can-focus">False</property>
+ <property
name="orientation">vertical</property>
+ <property
name="spacing">10</property>
+ <child>
+ <object class="GtkBox"
id="backup_free_hbox">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="spacing">10</property>
+ <child>
+ <object class="GtkLabel"
id="backup_fee_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property name="label"
translatable="yes">Backup fee:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="backup_fee_value_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="label">DYNAMICALLY SET</property>
+ <attributes>
+ <attribute
name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel"
id="backup_fee_explainer_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes">You pay this fee to back up your secret.
+The fee may increase with the expiration
+date for the recovery policy.</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
</object>
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="padding">5</property>
- <property
name="position">1</property>
+ <property
name="padding">20</property>
+ <property
name="position">3</property>
</packing>
</child>
</object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="padding">5</property>
- <property
name="position">1</property>
- </packing>
</child>
</object>
</child>
@@ -2759,8 +3006,9 @@ with funding from the European Commission.</property>
</child>
</object>
<packing>
- <property name="expand">False</property>
+ <property name="expand">True</property>
<property name="fill">True</property>
+ <property name="padding">5</property>
<property name="position">7</property>
</packing>
</child>
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] | Current Thread | [Next in Thread] |