[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: note
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: note |
|
Date: |
Thu, 11 Mar 2021 22:22:27 +0100 |
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 bdeab2e note
bdeab2e is described below
commit bdeab2e797e37fa80245674eb1f0a8868064d791
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Thu Mar 11 22:22:21 2021 +0100
note
---
contrib/anastasis_gtk_main_window.glade | 35 ++++++++++++++++++++++++++++++---
src/anastasis/anastasis-gtk_action.c | 3 +--
src/anastasis/anastasis-gtk_io.c | 4 ++++
src/testing/test_reducer.conf | 5 +++--
4 files changed, 40 insertions(+), 7 deletions(-)
diff --git a/contrib/anastasis_gtk_main_window.glade
b/contrib/anastasis_gtk_main_window.glade
index ca4857c..6c3c363 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -1166,6 +1166,8 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkBox">
<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>
<child>
<object class="GtkBox">
@@ -1204,6 +1206,7 @@ Author: Christian Grothoff, Dennis Neufeld
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
+ <property
name="padding">5</property>
<property
name="position">0</property>
</packing>
</child>
@@ -1211,6 +1214,8 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkBox">
<property
name="name">anastasis_gtk_enter_secret_file_box</property>
<property
name="can-focus">False</property>
+ <property
name="margin-top">5</property>
+ <property
name="margin-bottom">5</property>
<child>
<object class="GtkLabel">
<property
name="visible">True</property>
@@ -1244,6 +1249,7 @@ Author: Christian Grothoff, Dennis Neufeld
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
+ <property
name="padding">5</property>
<property
name="position">1</property>
</packing>
</child>
@@ -1255,6 +1261,8 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-top">10</property>
+ <property
name="margin-bottom">10</property>
<property name="label"
translatable="yes">Provide secret to backup:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -1277,6 +1285,7 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-top">5</property>
<property name="left-padding">12</property>
<child>
<object class="GtkBox">
@@ -1305,7 +1314,7 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="visible">True</property>
<property
name="can-focus">True</property>
<property
name="vscrollbar-policy">never</property>
- <property
name="shadow-type">in</property>
+ <property
name="shadow-type">etched-out</property>
<child>
<object class="GtkViewport">
<property
name="visible">True</property>
@@ -1342,6 +1351,7 @@ Author: Christian Grothoff, Dennis Neufeld
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
+ <property
name="padding">5</property>
<property
name="position">1</property>
</packing>
</child>
@@ -1349,6 +1359,7 @@ Author: Christian Grothoff, Dennis Neufeld
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
+ <property
name="padding">5</property>
<property
name="position">0</property>
</packing>
</child>
@@ -1396,6 +1407,12 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="visible">True</property>
<property
name="sensitive">False</property>
<property
name="can-focus">False</property>
+ <property name="tooltip-text"
translatable="yes">Scan this QR code with your Taler wallet to pay.</property>
+ <property
name="halign">center</property>
+ <property
name="margin-start">10</property>
+ <property
name="margin-end">10</property>
+ <property
name="margin-top">10</property>
+ <property
name="margin-bottom">10</property>
<property
name="stock">gtk-missing-image</property>
</object>
<packing>
@@ -1409,6 +1426,7 @@ Author: Christian Grothoff, Dennis Neufeld
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
+ <property
name="padding">5</property>
<property
name="position">1</property>
</packing>
</child>
@@ -1435,7 +1453,7 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="visible">True</property>
<property
name="can-focus">True</property>
<property
name="vscrollbar-policy">never</property>
- <property
name="shadow-type">in</property>
+ <property
name="shadow-type">etched-out</property>
<child>
<object class="GtkViewport">
<property
name="visible">True</property>
@@ -1480,6 +1498,7 @@ Author: Christian Grothoff, Dennis Neufeld
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
+ <property
name="padding">5</property>
<property
name="position">2</property>
</packing>
</child>
@@ -1491,6 +1510,8 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkLabel">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-top">10</property>
+ <property name="margin-bottom">5</property>
<property name="label"
translatable="yes">Payment required:</property>
<attributes>
<attribute name="weight" value="bold"/>
@@ -1513,6 +1534,10 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkAlignment">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-start">10</property>
+ <property name="margin-end">10</property>
+ <property name="margin-top">10</property>
+ <property
name="margin-bottom">10</property>
<property name="left-padding">12</property>
<child>
<object class="GtkBox"
id="anastasis_gtk_success_box">
@@ -1633,9 +1658,13 @@ Author: Christian Grothoff, Dennis Neufeld
</object>
</child>
<child type="label">
- <object class="GtkLabel">
+ <object class="GtkLabel"
id="anastasis_gtk_backup_success_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
+ <property name="margin-start">10</property>
+ <property name="margin-end">10</property>
+ <property name="margin-top">10</property>
+ <property
name="margin-bottom">10</property>
<property name="label"
translatable="yes">Success!</property>
<attributes>
<attribute name="weight" value="bold"/>
diff --git a/src/anastasis/anastasis-gtk_action.c
b/src/anastasis/anastasis-gtk_action.c
index 21410fb..41f1993 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -648,11 +648,10 @@ action_secret_editing (void)
const char *secret;
AG_hide_all_frames ();
- GNUNET_break (0);
entry = GTK_ENTRY (GCG_get_main_window_object (
"anastasis_gtk_enter_secret_entry"));
secret = json_string_value (json_object_get (redux_state,
- "core_secret")); // FIXME:
right field name?
+ "core_secret"));
if ( (NULL != secret) &&
(0 < strlen (secret)) )
{
diff --git a/src/anastasis/anastasis-gtk_io.c b/src/anastasis/anastasis-gtk_io.c
index 05ffc0e..bf73b32 100644
--- a/src/anastasis/anastasis-gtk_io.c
+++ b/src/anastasis/anastasis-gtk_io.c
@@ -113,6 +113,10 @@ save_directory_dialog_response_cb (GtkDialog *dialog,
g_object_unref (G_OBJECT (builder));
return;
}
+ // FIXME: serialize state of currently shown frame!?
+ // Right now, user attributes entered on the current
+ // screen as well as the core secret are LOST if
+ // the user changed them and then clicks 'save as'
filename =
GNUNET_GTK_filechooser_get_filename_utf8 (GTK_FILE_CHOOSER (dialog));
gtk_widget_destroy (GTK_WIDGET (dialog));
diff --git a/src/testing/test_reducer.conf b/src/testing/test_reducer.conf
index 154fe00..eba6f7a 100644
--- a/src/testing/test_reducer.conf
+++ b/src/testing/test_reducer.conf
@@ -12,8 +12,9 @@ CURRENCY_ROUND_UNIT = TESTKUDOS:0.01
[anastasis]
DB = postgres
PAYMENT_BACKEND_URL = http://localhost:9966/
-ANNUAL_FEE = TESTKUDOS:4.99
-TRUTH_UPLOAD_FEE = TESTKUDOS:0.01
+ANNUAL_FEE = TESTKUDOS:0
+# 4.99
+TRUTH_UPLOAD_FEE = TESTKUDOS:0.0
UPLOAD_LIMIT_MB = 1
INSURANCE = TESTKUDOS:1.0
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [taler-anastasis-gtk] branch master updated: note,
gnunet <=