[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: use combo box instead of Gt
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: use combo box instead of GtkEntry, fix configs |
|
Date: |
Sun, 28 Mar 2021 20:10:35 +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 883276d use combo box instead of GtkEntry, fix configs
883276d is described below
commit 883276d375c2e085f66e8f0b395e26f18af745a3
Author: Christian Grothoff <christian@grothoff.org>
AuthorDate: Sun Mar 28 20:10:32 2021 +0200
use combo box instead of GtkEntry, fix configs
---
contrib/anastasis_gtk_main_window.glade | 26 ++++++++++++++++++++------
src/anastasis/anastasis-gtk_action.c | 20 ++++++++++++++++++++
src/testing/test_anastasis_reducer_1.conf | 2 +-
src/testing/test_anastasis_reducer_2.conf | 4 ++--
src/testing/test_anastasis_reducer_3.conf | 2 +-
src/testing/test_anastasis_reducer_4.conf | 2 +-
6 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/contrib/anastasis_gtk_main_window.glade
b/contrib/anastasis_gtk_main_window.glade
index 1277a6a..a0948df 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -100,6 +100,9 @@ Author: Christian Grothoff, Dennis Neufeld
<property name="step-increment">1</property>
<property name="page-increment">10</property>
</object>
+ <object class="GtkEntryBuffer" id="provider_url_entrybuffer">
+ <property name="text" translatable="yes">https://</property>
+ </object>
<object class="GtkImage" id="restore_image">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -1246,14 +1249,25 @@ Author: Christian Grothoff, Dennis Neufeld
</packing>
</child>
<child>
- <object class="GtkEntry"
id="anastasis_gtk_provider_url_entry">
+ <object
class="GtkComboBoxText" id="anastasis_gtk_provider_url_combo_box_text">
<property
name="visible">True</property>
- <property
name="can-focus">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="margin-start">5</property>
<property
name="margin-end">5</property>
- <property
name="width-chars">40</property>
- <property
name="primary-icon-stock">gtk-network</property>
- <property
name="placeholder-text" translatable="yes">https://</property>
- <signal name="changed"
handler="anastasis_gtk_provider_url_entry_changed_cb" swapped="no"/>
+ <property
name="margin-top">5</property>
+ <property
name="margin-bottom">5</property>
+ <property
name="has-entry">True</property>
+ <child
internal-child="entry">
+ <object
class="GtkEntry" id="anastasis_gtk_provider_url_entry">
+ <property
name="can-focus">False</property>
+ <property
name="buffer">provider_url_entrybuffer</property>
+ <property
name="width-chars">32</property>
+ <property
name="primary-icon-stock">gtk-network</property>
+ <property
name="placeholder-text" translatable="yes">https://</property>
+ <property
name="input-purpose">url</property>
+ <signal
name="changed" handler="anastasis_gtk_provider_url_entry_changed_cb"
swapped="no"/>
+ </object>
+ </child>
</object>
<packing>
<property
name="left-attach">1</property>
diff --git a/src/anastasis/anastasis-gtk_action.c
b/src/anastasis/anastasis-gtk_action.c
index b14f9c3..55bd379 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1328,6 +1328,26 @@ action_challenge_selecting (void)
json_t *re;
AG_hide_all_frames ();
+ {
+ GtkComboBoxText *bt;
+ json_t *aps;
+ const json_t *ap;
+ const char *provider_url;
+
+ bt = GTK_COMBO_BOX_TEXT (GCG_get_main_window_object (
+ "anastasis_gtk_provider_url_combo_box_text"));
+ gtk_combo_box_text_remove_all (bt);
+ aps = json_object_get (redux_state,
+ "authentication_providers");
+ json_object_foreach (aps,
+ provider_url,
+ ap)
+ {
+ gtk_combo_box_text_insert_text (bt,
+ -1, /* append */
+ provider_url);
+ }
+ }
re = json_object_get (redux_state,
"recovery_error");
if (NULL != re)
diff --git a/src/testing/test_anastasis_reducer_1.conf
b/src/testing/test_anastasis_reducer_1.conf
index 6a9704d..25b001e 100644
--- a/src/testing/test_anastasis_reducer_1.conf
+++ b/src/testing/test_anastasis_reducer_1.conf
@@ -2,7 +2,7 @@
[anastasis]
PORT = 8086
-SERVER_SALT = AUfO1KGOKYIFlFQg
+SERVER_SALT = AUfO1KGOKYIFlFQ1
BUSINESS_NAME = "Data loss #1 Inc."
[stasis-postgres]
diff --git a/src/testing/test_anastasis_reducer_2.conf
b/src/testing/test_anastasis_reducer_2.conf
index 3dcfd27..48f7dd7 100644
--- a/src/testing/test_anastasis_reducer_2.conf
+++ b/src/testing/test_anastasis_reducer_2.conf
@@ -2,8 +2,8 @@
[anastasis]
PORT = 8087
-SERVER_SALT = BUfO1KGOKYIFlFQg
+SERVER_SALT = BUfO1KGOKYIFlFQ2
BUSINESS_NAME = "Data loss #2 Inc."
[stasis-postgres]
-CONFIG = postgres:///anastasischeck3
+CONFIG = postgres:///anastasischeck2
diff --git a/src/testing/test_anastasis_reducer_3.conf
b/src/testing/test_anastasis_reducer_3.conf
index 63c38ff..fdfbada 100644
--- a/src/testing/test_anastasis_reducer_3.conf
+++ b/src/testing/test_anastasis_reducer_3.conf
@@ -2,7 +2,7 @@
[anastasis]
PORT = 8088
-SERVER_SALT = CUfO1KGOKYIFlFQg
+SERVER_SALT = CUfO1KGOKYIFlFQ3
BUSINESS_NAME = "Data loss #3 Inc."
[stasis-postgres]
diff --git a/src/testing/test_anastasis_reducer_4.conf
b/src/testing/test_anastasis_reducer_4.conf
index 2897036..666b994 100644
--- a/src/testing/test_anastasis_reducer_4.conf
+++ b/src/testing/test_anastasis_reducer_4.conf
@@ -2,7 +2,7 @@
[anastasis]
PORT = 8089
-SERVER_SALT = DUfO1KGOKYIFlFQg
+SERVER_SALT = DUfO1KGOKYIFlFQ4
BUSINESS_NAME = "Data loss #4 Inc."
ANNUAL_FEE = TESTKUDOS:0.01
--
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: use combo box instead of GtkEntry, fix configs,
gnunet <=