[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] branch master updated: add birthplace
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] branch master updated: add birthplace |
|
Date: |
Sat, 20 Mar 2021 22:51:38 +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 390bb7d add birthplace
390bb7d is described below
commit 390bb7d7ec1a7094aa6dfb74ceb6f448b16eed2a
Author: Christian Grothoff <grothoff@gnunet.org>
AuthorDate: Sat Mar 20 22:51:32 2021 +0100
add birthplace
---
contrib/anastasis_gtk_main_window.glade | 98 ++++++++++++++++++++++++---------
src/anastasis/anastasis-gtk_action.c | 12 ++--
2 files changed, 81 insertions(+), 29 deletions(-)
diff --git a/contrib/anastasis_gtk_main_window.glade
b/contrib/anastasis_gtk_main_window.glade
index 61fa299..377d8d9 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -527,6 +527,49 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox"
id="anastasis_gtk_ia_full_name_box1">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <child>
+ <object class="GtkLabel"
id="anastasis_gtk_ia_birthplace_label">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="valign">center</property>
+ <property
name="margin-left">20</property>
+ <property
name="margin-start">20</property>
+ <property name="label"
translatable="yes">Birthplace:</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_ia_birthplace_entry">
+ <property
name="visible">True</property>
+ <property
name="can-focus">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="placeholder-text" translatable="yes">Earth</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>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">False</property>
+ <property
name="padding">5</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
<child>
<object class="GtkBox"
id="anastasis_gtk_ia_ahv_box">
<property
name="can-focus">False</property>
@@ -570,7 +613,7 @@ Author: Christian Grothoff, Dennis Neufeld
<packing>
<property
name="expand">False</property>
<property
name="fill">True</property>
- <property
name="position">2</property>
+ <property
name="position">3</property>
</packing>
</child>
<child>
@@ -616,7 +659,7 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="expand">False</property>
<property
name="fill">True</property>
<property
name="padding">5</property>
- <property
name="position">3</property>
+ <property
name="position">4</property>
</packing>
</child>
<child>
@@ -661,7 +704,7 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="expand">False</property>
<property
name="fill">True</property>
<property
name="padding">5</property>
- <property
name="position">4</property>
+ <property
name="position">5</property>
</packing>
</child>
</object>
@@ -1108,32 +1151,34 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="visible">True</property>
<property
name="can-focus">False</property>
<child>
- <object class="GtkBox"
id="anastasis_gtk_challenge_list_box">
+ <object
class="GtkScrolledWindow">
<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="can-focus">True</property>
+ <property
name="vscrollbar-policy">never</property>
+ <property
name="shadow-type">in</property>
<child>
- <placeholder/>
+ <object
class="GtkViewport">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <child>
+ <object
class="GtkBox" id="anastasis_gtk_challenge_list_box">
+ <property
name="visible">True</property>
+ <property
name="can-focus">False</property>
+ <property
name="margin-top">5</property>
+ <property
name="margin-bottom">5</property>
+ <child>
+ <placeholder/>
+ </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">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkSeparator">
- <property
name="visible">True</property>
- <property
name="can-focus">False</property>
- </object>
<packing>
<property
name="expand">True</property>
<property
name="fill">True</property>
<property
name="padding">5</property>
- <property
name="position">1</property>
+ <property
name="position">0</property>
</packing>
</child>
<child>
@@ -1184,6 +1229,7 @@ Author: Christian Grothoff, Dennis Neufeld
<object class="GtkEntry"
id="anastasis_gtk_provider_url_entry">
<property
name="visible">True</property>
<property
name="can-focus">True</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"/>
@@ -1198,12 +1244,13 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="expand">False</property>
<property
name="fill">True</property>
<property
name="padding">5</property>
+ <property
name="pack-type">end</property>
<property
name="position">4</property>
</packing>
</child>
</object>
<packing>
- <property
name="expand">False</property>
+ <property
name="expand">True</property>
<property
name="fill">True</property>
<property
name="position">0</property>
</packing>
@@ -1595,7 +1642,7 @@ Author: Christian Grothoff, Dennis Neufeld
<property
name="can-focus">False</property>
<child>
<object class="GtkBox">
- <property
name="visible">True</property>
+ <property
name="name">anastasis_gtk_backup_complete_box</property>
<property
name="can-focus">False</property>
<property
name="orientation">vertical</property>
<child>
@@ -1668,7 +1715,7 @@ Author: Christian Grothoff, Dennis Neufeld
</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">2</property>
@@ -1676,7 +1723,7 @@ Author: Christian Grothoff, Dennis Neufeld
</child>
</object>
<packing>
- <property
name="expand">False</property>
+ <property
name="expand">True</property>
<property
name="fill">True</property>
<property
name="position">0</property>
</packing>
@@ -1847,6 +1894,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">9</property>
</packing>
</child>
diff --git a/src/anastasis/anastasis-gtk_action.c
b/src/anastasis/anastasis-gtk_action.c
index 06d1926..e04ee6a 100644
--- a/src/anastasis/anastasis-gtk_action.c
+++ b/src/anastasis/anastasis-gtk_action.c
@@ -1226,6 +1226,7 @@ action_backup_finished (void)
-1);
}
AG_show ("anastasis_gtk_completed_frame");
+ AG_show ("anastasis_gtk_backup_complete_box");
AG_show ("anastasis_gtk_success_backup_label");
AG_hide ("anastasis_gtk_success_recovery_box");
AG_show ("anastasis_gtk_completed_image");
@@ -1495,8 +1496,7 @@ action_challenge_selecting (void)
challenges = json_object_get (rd,
"cs");
box = GTK_BOX (GCG_get_main_window_object (
- "anastasis_gtk_open_challenge_box"));
- AG_show ("anastasis_gtk_open_challenge_box");
+ "anastasis_gtk_challenge_list_box"));
GNUNET_assert (NULL != box);
gtk_container_foreach (GTK_CONTAINER (box),
&remove_child,
@@ -1564,9 +1564,13 @@ action_challenge_selecting (void)
challenge,
NULL);
gtk_widget_show (GTK_WIDGET (b));
- gtk_container_add (GTK_CONTAINER (box),
- b);
+ gtk_box_pack_start (box,
+ b, /* child */
+ false, /* expand */
+ false, /* fill */
+ 5 /* padding */);
}
+ AG_show ("anastasis_gtk_open_challenge_box");
AG_show ("anastasis_gtk_main_control_vbox");
AG_show ("anastasis_gtk_main_window_save_as_button");
AG_show ("anastasis_gtk_challenge_frame");
--
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: add birthplace,
gnunet <=