|
| From: | gnunet |
| Subject: | [taler-anastasis-gtk] 03/05: worked on illustrations and authentication frame |
| Date: | Wed, 23 Sep 2020 19:02:53 +0200 |
This is an automated email from the git hooks/post-receive script.
dennis-neufeld pushed a commit to branch master
in repository anastasis-gtk.
commit b989af03ce6ff56168f9e268da799e8520dd11fb
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Tue Sep 22 19:28:51 2020 +0200
worked on illustrations and authentication frame
---
contrib/anastasis_gtk_main_window.glade | 1021 ++++++++++++++++---------------
contrib/authentication_methods.png | Bin 64527 -> 82253 bytes
contrib/continent_selection.png | Bin 26332719 -> 364045 bytes
contrib/country_selection.png | Bin 23542533 -> 816074 bytes
contrib/user_attributes.png | Bin 34233 -> 29782 bytes
src/anastasis/anastasis-gtk.c | 6 +-
6 files changed, 528 insertions(+), 499 deletions(-)
diff --git a/contrib/anastasis_gtk_main_window.glade
b/contrib/anastasis_gtk_main_window.glade
index 121a639..e9290c2 100644
--- a/contrib/anastasis_gtk_main_window.glade
+++ b/contrib/anastasis_gtk_main_window.glade
@@ -1051,7 +1051,6 @@
<property name="window_position">center</property>
<property name="default_width">700</property>
<property name="default_height">500</property>
- <property name="icon_name">contact-new</property>
<signal name="delete-event" handler="anastasis_gtk_quit_cb" swapped="no"/>
<child>
<object class="GtkBox" id="anastasis_gtk_main_vbox">
@@ -1128,285 +1127,233 @@
</packing>
</child>
<child>
- <object class="GtkScrolledWindow" id="anastasis_gtk_scrolledwindow">
+ <object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="shadow_type">in</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkViewport" id="anastasis_gtk_viewport">
+ <object class="GtkScrolledWindow"
id="anastasis_gtk_scrolledwindow">
<property name="visible">True</property>
- <property name="can_focus">False</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
+ <property name="shadow_type">in</property>
<child>
- <object class="GtkBox">
+ <object class="GtkViewport" id="anastasis_gtk_viewport">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<child>
- <object class="GtkBox" id="anastasis_gtk_super_vbox">
+ <object class="GtkBox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="orientation">vertical</property>
<child>
- <object class="GtkFrame"
id="anastasis_gtk_start_frame">
+ <object class="GtkBox" id="anastasis_gtk_super_vbox">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="left_padding">12</property>
- <child>
- <object class="GtkBox"
id="anastasis_gtk_primary_action_hbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkButton">
- <property name="label"
translatable="yes">Backup</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="image">backup_image</property>
- <signal name="clicked"
handler="anastasis_gtk_backup_button_clicked" swapped="no"/>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkButton">
- <property name="label"
translatable="yes">Restore</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="image">restore_image</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">What
do you want to do?</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame"
id="anastasis_gtk_continent_frame">
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
+ <property name="orientation">vertical</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkFrame"
id="anastasis_gtk_start_frame">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkBox"
id="anastasis_gtk_continent_vbox">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkTreeView"
id="anastasis_gtk_continent_treeview">
+ <object class="GtkBox"
id="anastasis_gtk_primary_action_hbox">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="model">continent_liststore</property>
- <property
name="enable_search">False</property>
- <property
name="search_column">0</property>
- <property
name="activate_on_single_click">True</property>
- <signal name="row-activated"
handler="anastasis_gtk_continent_activated" swapped="no"/>
- <child internal-child="selection">
- <object class="GtkTreeSelection"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="continent_column">
- <property name="title"
translatable="yes">Continent</property>
- <child>
- <object
class="GtkCellRendererText" id="continent_name_cell_renderer"/>
- <attributes>
- <attribute
name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkTreeView"
id="anastasis_gtk_country_treeview">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="enable_search">False</property>
- <property
name="search_column">0</property>
- <property
name="activate_on_single_click">True</property>
- <signal name="row-activated"
handler="anastasis_gtk_country_activated" swapped="no"/>
- <child internal-child="selection">
- <object class="GtkTreeSelection"/>
- </child>
- <child>
- <object class="GtkTreeViewColumn"
id="country_column">
- <property name="title"
translatable="yes">Country</property>
- <child>
- <object
class="GtkCellRendererText" id="country_name_cell_renderer"/>
- <attributes>
- <attribute
name="text">0</attribute>
- </attributes>
- </child>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- </child>
- </object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Where do you live?</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame"
id="anastasis_gtk_identity_frame">
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
- <child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkBox"
id="anastasis_gtk_identity_vbox">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="orientation">vertical</property>
- <child>
- <object class="GtkBox"
id="anastasis_gtk_ia_full_name">
<property
name="can_focus">False</property>
- <property
name="homogeneous">True</property>
<child>
- <object class="GtkLabel"
id="anastasis_gtk_ia_full_name_label">
+ <object class="GtkButton">
+ <property name="label"
translatable="yes">Backup</property>
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property
name="valign">center</property>
- <property
name="margin_start">20</property>
- <property
name="hexpand">True</property>
- <property name="label"
translatable="yes">Full name:</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <property
name="image">backup_image</property>
+ <signal name="clicked"
handler="anastasis_gtk_backup_button_clicked" swapped="no"/>
</object>
<packing>
- <property
name="expand">False</property>
+ <property
name="expand">True</property>
<property
name="fill">True</property>
<property
name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry"
id="anastasis_gtk_ia_full_name_entry">
+ <object class="GtkButton">
+ <property name="label"
translatable="yes">Restore</property>
<property
name="visible">True</property>
<property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
- <property name="placeholder_text"
translatable="yes">Max Mustermann</property>
- <signal name="changed"
handler="anastasis_gtk_ia_full_name_entry_changed_cb" swapped="no"/>
+ <property
name="receives_default">True</property>
+ <property
name="image">restore_image</property>
</object>
<packing>
- <property
name="expand">False</property>
+ <property
name="expand">True</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="position">0</property>
- </packing>
</child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">What do you want to do?</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame"
id="anastasis_gtk_continent_frame">
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkBox"
id="anastasis_gtk_ia_ahv">
+ <object class="GtkBox"
id="anastasis_gtk_continent_vbox">
+ <property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="homogeneous">True</property>
<child>
- <object class="GtkLabel"
id="anastasis_gtk_ia_ahv_label">
+ <object class="GtkTreeView"
id="anastasis_gtk_continent_treeview">
<property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property
name="valign">center</property>
- <property
name="margin_start">20</property>
- <property
name="hexpand">True</property>
- <property name="label"
translatable="yes">AHV number:</property>
+ <property
name="can_focus">True</property>
+ <property
name="model">continent_liststore</property>
+ <property
name="enable_search">False</property>
+ <property
name="search_column">0</property>
+ <property
name="activate_on_single_click">True</property>
+ <signal name="row-activated"
handler="anastasis_gtk_continent_activated" swapped="no"/>
+ <child internal-child="selection">
+ <object
class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn" id="continent_column">
+ <property name="title"
translatable="yes">Continent</property>
+ <child>
+ <object
class="GtkCellRendererText" id="continent_name_cell_renderer"/>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
</object>
<packing>
- <property
name="expand">False</property>
+ <property
name="expand">True</property>
<property
name="fill">True</property>
<property
name="position">0</property>
</packing>
</child>
<child>
- <object class="GtkEntry"
id="anastasis_gtk_ia_ahv_entry">
+ <object class="GtkTreeView"
id="anastasis_gtk_country_treeview">
<property
name="visible">True</property>
<property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
- <property name="placeholder_text"
translatable="yes">123456789</property>
- <signal name="changed"
handler="anastasis_gtk_ia_ahv_entry_changed_cb" swapped="no"/>
+ <property
name="enable_search">False</property>
+ <property
name="search_column">0</property>
+ <property
name="activate_on_single_click">True</property>
+ <signal name="row-activated"
handler="anastasis_gtk_country_activated" swapped="no"/>
+ <child internal-child="selection">
+ <object
class="GtkTreeSelection"/>
+ </child>
+ <child>
+ <object
class="GtkTreeViewColumn" id="country_column">
+ <property name="title"
translatable="yes">Country</property>
+ <child>
+ <object
class="GtkCellRendererText" id="country_name_cell_renderer"/>
+ <attributes>
+ <attribute
name="text">0</attribute>
+ </attributes>
+ </child>
+ </object>
+ </child>
</object>
<packing>
- <property
name="expand">False</property>
+ <property
name="expand">True</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="position">1</property>
- </packing>
</child>
+ </object>
+ </child>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Where do you live?</property>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFrame"
id="anastasis_gtk_identity_frame">
+ <property name="can_focus">False</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
+ <child>
+ <object class="GtkAlignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
<child>
- <object class="GtkBox"
id="anastasis_gtk_ia_ssn">
+ <object class="GtkBox"
id="anastasis_gtk_identity_vbox">
+ <property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="homogeneous">True</property>
+ <property
name="orientation">vertical</property>
<child>
- <object class="GtkLabel"
id="anastasis_gtk_ia_ssn_label">
- <property
name="visible">True</property>
+ <object class="GtkBox"
id="anastasis_gtk_ia_full_name">
<property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property
name="valign">center</property>
- <property
name="margin_start">20</property>
- <property
name="hexpand">True</property>
- <property name="label"
translatable="yes">Social security number:</property>
+ <property
name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel"
id="anastasis_gtk_ia_full_name_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="hexpand">True</property>
+ <property name="label"
translatable="yes">Full name:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="anastasis_gtk_ia_full_name_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="placeholder_text" translatable="yes">Max Mustermann</property>
+ <signal name="changed"
handler="anastasis_gtk_ia_full_name_entry_changed_cb" swapped="no"/>
+ </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>
@@ -1415,12 +1362,40 @@
</packing>
</child>
<child>
- <object class="GtkEntry"
id="anastasis_gtk_ia_ssn_entry">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
- <property name="placeholder_text"
translatable="yes">123456789</property>
- <signal name="changed"
handler="anastasis_gtk_ia_ssn_entry_changed_cb" swapped="no"/>
+ <object class="GtkBox"
id="anastasis_gtk_ia_ahv">
+ <property
name="can_focus">False</property>
+ <property
name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel"
id="anastasis_gtk_ia_ahv_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="hexpand">True</property>
+ <property name="label"
translatable="yes">AHV number:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="anastasis_gtk_ia_ahv_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="placeholder_text" translatable="yes">123456789</property>
+ <signal name="changed"
handler="anastasis_gtk_ia_ahv_entry_changed_cb" swapped="no"/>
+ </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>
@@ -1428,99 +1403,156 @@
<property
name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox"
id="anastasis_gtk_ia_birthdate">
- <property
name="can_focus">False</property>
- <property
name="homogeneous">True</property>
<child>
- <object class="GtkLabel"
id="anastasis_gtk_ia_birthdate_label">
- <property
name="visible">True</property>
+ <object class="GtkBox"
id="anastasis_gtk_ia_ssn">
<property
name="can_focus">False</property>
- <property
name="halign">start</property>
- <property
name="margin_start">20</property>
- <property
name="hexpand">True</property>
- <property name="label"
translatable="yes">Birthdate:</property>
+ <property
name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel"
id="anastasis_gtk_ia_ssn_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="hexpand">True</property>
+ <property name="label"
translatable="yes">Social security number:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry"
id="anastasis_gtk_ia_ssn_entry">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="placeholder_text" translatable="yes">123456789</property>
+ <signal name="changed"
handler="anastasis_gtk_ia_ssn_entry_changed_cb" swapped="no"/>
+ </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="position">0</property>
+ <property
name="position">2</property>
</packing>
</child>
<child>
- <object class="GtkCalendar"
id="anastasis_gtk_ia_birthdate_cal">
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
- <property
name="year">2020</property>
- <property
name="show_day_names">False</property>
- <signal name="day-selected"
handler="anastasis_gtk_ia_birthdate_cal_day_selected_cb" swapped="no"/>
+ <object class="GtkBox"
id="anastasis_gtk_ia_birthdate">
+ <property
name="can_focus">False</property>
+ <property
name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel"
id="anastasis_gtk_ia_birthdate_label">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="halign">start</property>
+ <property
name="margin_left">20</property>
+ <property
name="margin_start">20</property>
+ <property
name="hexpand">True</property>
+ <property name="label"
translatable="yes">Birthdate:</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCalendar"
id="anastasis_gtk_ia_birthdate_cal">
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="year">2020</property>
+ <property
name="month">8</property>
+ <property
name="day">22</property>
+ <property
name="show_day_names">False</property>
+ <signal name="day-selected"
handler="anastasis_gtk_ia_birthdate_cal_day_selected_cb" swapped="no"/>
+ </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="position">1</property>
+ <property
name="position">3</property>
</packing>
</child>
</object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Who are you?</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">2</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes">Who
are you?</property>
- </object>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkFrame"
id="anastasis_gtk_b_authentication_frame">
- <property name="can_focus">False</property>
- <property name="label_xalign">0</property>
- <property name="shadow_type">none</property>
<child>
- <object class="GtkAlignment">
- <property name="visible">True</property>
+ <object class="GtkFrame"
id="anastasis_gtk_b_authentication_frame">
<property name="can_focus">False</property>
- <property name="left_padding">12</property>
+ <property name="label_xalign">0</property>
+ <property name="shadow_type">none</property>
<child>
- <object class="GtkBox"
id="anastasis_gtk_provider_vbox">
+ <object class="GtkAlignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property
name="orientation">vertical</property>
+ <property name="left_padding">12</property>
<child>
- <object class="GtkBox">
+ <object class="GtkBox"
id="anastasis_gtk_provider_vbox">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
<child>
- <object class="GtkTextView">
- <property
name="name">anastasis_gtk_b_authentication_methods_text</property>
+ <object class="GtkBox">
<property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="hexpand">True</property>
- <property
name="vexpand">True</property>
- <property
name="editable">False</property>
+ <property
name="can_focus">False</property>
+ <child>
+ <object class="GtkTextView">
+ <property
name="name">anastasis_gtk_b_authentication_methods_text</property>
+ <property
name="visible">True</property>
+ <property
name="can_focus">True</property>
+ <property
name="hexpand">True</property>
+ <property
name="vexpand">True</property>
+ <property
name="editable">False</property>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkScrollbar">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="orientation">vertical</property>
+ </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>
@@ -1529,10 +1561,9 @@
</packing>
</child>
<child>
- <object class="GtkScrollbar">
+ <object class="GtkSeparator">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="orientation">vertical</property>
</object>
<packing>
<property
name="expand">False</property>
@@ -1540,210 +1571,174 @@
<property
name="position">1</property>
</packing>
</child>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</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">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkAlignment">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
<child>
- <object class="GtkBox">
+ <object class="GtkAlignment">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
<child>
- <object class="GtkFrame">
+ <object class="GtkBox">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="margin_end">50</property>
- <property
name="hexpand">True</property>
- <property
name="label_xalign">0</property>
- <property
name="shadow_type">none</property>
<child>
- <object class="GtkBox">
+ <object class="GtkFrame">
<property
name="visible">True</property>
<property
name="can_focus">False</property>
- <property
name="spacing">8</property>
- <property
name="homogeneous">True</property>
- <child>
- <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_sms">
- <property name="label"
translatable="yes">SMS</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <signal name="clicked"
handler="anastasis_gtk_btn_add_auth_sms_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">0</property>
- </packing>
- </child>
+ <property
name="margin_right">50</property>
+ <property
name="margin_end">50</property>
+ <property
name="hexpand">True</property>
+ <property
name="label_xalign">0</property>
+ <property
name="shadow_type">none</property>
<child>
- <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_email">
- <property name="label"
translatable="yes">EMAIL</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <signal name="clicked"
handler="anastasis_gtk_btn_add_auth_email_clicked_cb" swapped="no"/>
+ <object class="GtkBox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="spacing">8</property>
+ <property
name="homogeneous">True</property>
+ <child>
+ <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_sms">
+ <property
name="label" translatable="yes">SMS</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <signal
name="clicked" handler="anastasis_gtk_btn_add_auth_sms_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_email">
+ <property
name="label" translatable="yes">EMAIL</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <signal
name="clicked" handler="anastasis_gtk_btn_add_auth_email_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_question">
+ <property
name="label" translatable="yes">SECURE
+QUESTION</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <signal
name="clicked" handler="anastasis_gtk_btn_add_auth_question_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_post">
+ <property
name="label" translatable="yes">POST</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <signal
name="clicked" handler="anastasis_gtk_btn_add_auth_post_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_video">
+ <property
name="label" translatable="yes">VIDEO AUTH</property>
+ <property
name="can_focus">True</property>
+ <property
name="receives_default">True</property>
+ <signal
name="clicked" handler="anastasis_gtk_btn_add_auth_video_clicked_cb"
swapped="no"/>
+ </object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">4</property>
+ </packing>
+ </child>
</object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">1</property>
- </packing>
</child>
- <child>
- <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_question">
- <property name="label"
translatable="yes">SECURE
-QUESTION</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <signal name="clicked"
handler="anastasis_gtk_btn_add_auth_question_clicked_cb" swapped="no"/>
+ <child type="label">
+ <object class="GtkLabel">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property name="label"
translatable="yes">Add Method</property>
</object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">2</property>
- </packing>
</child>
+ </object>
+ <packing>
+ <property
name="expand">True</property>
+ <property
name="fill">True</property>
+ <property
name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox">
+ <property
name="visible">True</property>
+ <property
name="can_focus">False</property>
+ <property
name="homogeneous">True</property>
<child>
- <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_post">
- <property name="label"
translatable="yes">POST</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <signal name="clicked"
handler="anastasis_gtk_btn_add_auth_post_clicked_cb" swapped="no"/>
- </object>
- <packing>
- <property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">3</property>
- </packing>
+ <placeholder/>
</child>
<child>
- <object
class="GtkButton" id="anastasis_gtk_btn_add_auth_video">
- <property name="label"
translatable="yes">VIDEO AUTH</property>
+ <object
class="GtkButton">
+ <property name="label"
translatable="yes">Edit
+Provider</property>
+ <property
name="visible">True</property>
<property
name="can_focus">True</property>
<property
name="receives_default">True</property>
- <signal name="clicked"
handler="anastasis_gtk_btn_add_auth_video_clicked_cb" swapped="no"/>
+ <property
name="halign">end</property>
</object>
<packing>
<property
name="expand">False</property>
- <property
name="fill">True</property>
- <property
name="position">4</property>
+ <property
name="fill">False</property>
+ <property
name="position">1</property>
</packing>
</child>
</object>
- </child>
- <child type="label">
- <object class="GtkLabel">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property name="label"
translatable="yes">Add Method</property>
- </object>
- </child>
- </object>
- <packing>
- <property
name="expand">True</property>
- <property
name="fill">True</property>
- <property
name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox">
- <property
name="visible">True</property>
- <property
name="can_focus">False</property>
- <property
name="homogeneous">True</property>
- <child>
- <placeholder/>
- </child>
- <child>
- <object class="GtkButton">
- <property name="label"
translatable="yes">Edit
-Provider</property>
- <property
name="visible">True</property>
- <property
name="can_focus">True</property>
- <property
name="receives_default">True</property>
- <property
name="halign">end</property>
- </object>
<packing>
<property
name="expand">False</property>
- <property
name="fill">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="position">1</property>
- </packing>
</child>
</object>
+ <packing>
+ <property
name="expand">False</property>
+ <property
name="fill">True</property>
+ <property
name="position">2</property>
+ </packing>
</child>
</object>
- <packing>
- <property
name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
</child>
</object>
</child>
+ <child type="label">
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">Authentication Methods</property>
+ </object>
+ </child>
</object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
</child>
- <child type="label">
- <object class="GtkLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">Authentication Methods</property>
- </object>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <placeholder/>
- </child>
- <child>
- <placeholder/>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkBox"
id="anastasis_gtk_illustration_vbox">
- <property name="can_focus">False</property>
- <property name="halign">baseline</property>
- <property name="valign">baseline</property>
- <property name="orientation">vertical</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkImage"
id="anastasis_gtk_user_attributes_image">
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- <property name="icon_size">6</property>
</object>
<packing>
<property name="expand">True</property>
@@ -1751,63 +1746,95 @@ Provider</property>
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkImage"
id="anastasis_gtk_country_selection_image">
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage"
id="anastasis_gtk_b_authentication_methods_image">
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage" id="anastasis_gtk_logo3">
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage"
id="anastasis_gtk_continent_selection_image">
- <property name="can_focus">False</property>
- <property name="stock">gtk-missing-image</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">4</property>
- </packing>
- </child>
<child>
<placeholder/>
</child>
</object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
</child>
</object>
</child>
</object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="anastasis_gtk_illustration_vbox">
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="orientation">vertical</property>
+ <child>
+ <object class="GtkImage"
id="anastasis_gtk_continent_selection_image">
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage"
id="anastasis_gtk_country_selection_image">
+ <property name="width_request">100</property>
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage"
id="anastasis_gtk_user_attributes_image">
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage"
id="anastasis_gtk_b_authentication_methods_image">
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="anastasis_gtk_logo3">
+ <property name="can_focus">False</property>
+ <property name="vexpand">True</property>
+ <property name="stock">gtk-missing-image</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">4</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
</child>
</object>
<packing>
diff --git a/contrib/authentication_methods.png
b/contrib/authentication_methods.png
index 883a161..c0906a7 100644
Binary files a/contrib/authentication_methods.png and
b/contrib/authentication_methods.png differ
diff --git a/contrib/continent_selection.png b/contrib/continent_selection.png
index 1111ae1..19003de 100644
Binary files a/contrib/continent_selection.png and
b/contrib/continent_selection.png differ
diff --git a/contrib/country_selection.png b/contrib/country_selection.png
index 967fbb0..3882cb6 100644
Binary files a/contrib/country_selection.png and
b/contrib/country_selection.png differ
diff --git a/contrib/user_attributes.png b/contrib/user_attributes.png
index ad25d18..edf5807 100644
Binary files a/contrib/user_attributes.png and b/contrib/user_attributes.png
differ
diff --git a/src/anastasis/anastasis-gtk.c b/src/anastasis/anastasis-gtk.c
index 851a295..85d252b 100644
--- a/src/anastasis/anastasis-gtk.c
+++ b/src/anastasis/anastasis-gtk.c
@@ -117,10 +117,10 @@ anastasis_gtk_animation_activate_cb (GtkMenuItem
*menuitem,
//authentication methods
char *auth_meth_path;
GNUNET_asprintf (&auth_meth_path,
- "%s/share/anastasis/continent_selection.png",
+ "%s/share/anastasis/authentication_methods.png",
path);
GObject *auth_meth_img = GCG_get_main_window_object (
-
"anastasis_gtk_authentication_methods_image");
+
"anastasis_gtk_b_authentication_methods_image");
gtk_image_set_from_file (GTK_IMAGE (auth_meth_img), auth_meth_path);
GNUNET_free (auth_meth_path);
@@ -382,6 +382,8 @@ anastasis_gtk_main_window_forward_clicked (GObject *object,
"anastasis_gtk_main_window_forward_button")), false);
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_continent_selection_image")));
+ gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_country_selection_image")));
gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_user_attributes_image")));
}
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
| [Prev in Thread] | Current Thread | [Next in Thread] |