|
| From: | gnunet |
| Subject: | [taler-anastasis-gtk] 02/05: only suggest date for backup expiration as suggested by Belen |
| Date: | Sat, 24 Jul 2021 12:28:02 +0200 |
This is an automated email from the git hooks/post-receive script.
grothoff pushed a commit to branch master
in repository anastasis-gtk.
commit dc0b46ca81cd79ee990205c688cf5f34ce6c96e1
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sat Jul 24 10:41:07 2021 +0200
only suggest date for backup expiration as suggested by Belen
---
contrib/anastasis_gtk_main_window.glade | 168 +++++++++++++++++---------------
src/anastasis/anastasis-gtk_action.c | 22 ++++-
2 files changed, 112 insertions(+), 78 deletions(-)
diff --git a/contrib/anastasis_gtk_main_window.glade
b/contrib/anastasis_gtk_main_window.glade
index a42ea10..67955c9 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -3161,6 +3161,7 @@ date of your secret's recovery data.</property>
<child>
<object class="GtkLabel"
id="anastasis_gtk_success_backup_label">
<property
name="can_focus">False</property>
+ <property
name="halign">start</property>
<property name="label"
translatable="yes">Your backup is complete.</property>
<property
name="justify">center</property>
<attributes>
@@ -3174,80 +3175,6 @@ date of your secret's recovery data.</property>
<property
name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel"
id="anastasis_gtk_success_backup_version_label">
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Backups were made at the following providers:</property>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="padding">10</property>
- <property
name="position">1</property>
- </packing>
- </child>
- <child>
- <object
class="GtkScrolledWindow">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="shadow_type">in</property>
- <child>
- <object class="GtkTreeView"
id="anastasis_gtk_backup_complete_treeview">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="model">backup_provider_liststore</property>
- <child
internal-child="selection">
- <object
class="GtkTreeSelection"/>
- </child>
- <child>
- <object
class="GtkTreeViewColumn">
- <property
name="sizing">autosize</property>
- <property name="title"
translatable="yes">Provider</property>
- <child>
- <object
class="GtkCellRendererText" id="provider_url"/>
- <attributes>
- <attribute
name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object
class="GtkTreeViewColumn">
- <property
name="spacing">5</property>
- <property
name="sizing">autosize</property>
- <property name="title"
translatable="yes">Version</property>
- <child>
- <object
class="GtkCellRendererText" id="policy_version"/>
- <attributes>
- <attribute
name="visible">3</attribute>
- <attribute
name="text">1</attribute>
- </attributes>
- </child>
- </object>
- </child>
- <child>
- <object
class="GtkTreeViewColumn">
- <property
name="visible">False</property>
- <property name="title"
translatable="yes">Expiration time</property>
- <child>
- <object
class="GtkCellRendererText" id="expiration"/>
- <attributes>
- <attribute
name="visible">3</attribute>
- <attribute
name="text">2</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- </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>
<child>
<object class="GtkBox"
id="recovery_expiration_box">
<property
name="visible">True</property>
@@ -3285,9 +3212,98 @@ date of your secret's recovery data.</property>
</child>
</object>
<packing>
- <property
name="expand">True</property>
+ <property
name="expand">False</property>
<property
name="fill">True</property>
<property
name="padding">20</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
+ <child>
+ <object class="GtkLabel"
id="anastasis_gtk_success_backup_version_label">
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property name="label"
translatable="yes">Backups were made at the following providers:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="padding">10</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkScrolledWindow">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="shadow_type">in</property>
+ <child>
+ <object
class="GtkTreeView" id="anastasis_gtk_backup_complete_treeview">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="model">backup_provider_liststore</property>
+ <property
name="search_column">0</property>
+ <child
internal-child="selection">
+ <object
class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn">
+ <property
name="sizing">autosize</property>
+ <property
name="title" translatable="yes">Provider</property>
+ <child>
+ <object
class="GtkCellRendererText" id="provider_url"/>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn">
+ <property
name="spacing">5</property>
+ <property
name="sizing">autosize</property>
+ <property
name="title" translatable="yes">Version</property>
+ <child>
+ <object
class="GtkCellRendererText" id="policy_version"/>
+ <attributes>
+ <attribute
name="visible">3</attribute>
+ <attribute
name="text">1</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn">
+ <property
name="visible">False</property>
+ <property
name="title" translatable="yes">Expiration time</property>
+ <child>
+ <object
class="GtkCellRendererText" id="expiration"/>
+ <attributes>
+ <attribute
name="visible">3</attribute>
+ <attribute
name="text">2</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="padding">5</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="padding">10</property>
<property
name="position">3</property>
</packing>
</child>
@@ -3308,7 +3324,7 @@ date of your secret's recovery data.</property>
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<property
name="halign">start</property>
- <property name="label"
translatable="yes">Your secret was recovered</property>
+ <property name="label"
translatable="yes">Your secret was recovered.</property>
<attributes>
<attribute name="weight"
value="bold"/>
</attributes>
diff --git a/src/anastasis/anastasis-gtk_action.c
b/src/anastasis/anastasis-gtk_action.c
index 06b8de7..754b993 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1666,8 +1666,26 @@ action_backup_finished (void)
true,
-1);
}
- update_label ("backup_expiration_date_label",
- GNUNET_STRINGS_absolute_time_to_string (mexp));
+ {
+ struct tm tv;
+ char estr[128];
+ time_t t;
+
+ /* be more conservative in what we show */
+ mexp = GNUNET_TIME_absolute_subtract (mexp,
+ GNUNET_TIME_UNIT_DAYS);
+ t = mexp.abs_value_us / GNUNET_TIME_UNIT_SECONDS.rel_value_us;
+ GNUNET_assert (NULL !=
+ localtime_r (&t,
+ &tv));
+ GNUNET_assert (sizeof (estr) >
+ strftime (estr,
+ sizeof (estr),
+ "%d %B %Y",
+ &tv));
+ update_label ("backup_expiration_date_label",
+ GNUNET_STRINGS_absolute_time_to_string (mexp));
+ }
AG_hide ("anastasis_gtk_progress_vbox");
AG_hide ("anastasis_gtk_backup_progress_scrolled_window");
AG_show ("anastasis_gtk_completed_frame");
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] | Current Thread | [Next in Thread] |