[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-anastasis-gtk] 02/02: worked on authentication frames forward but
|
From: |
gnunet |
|
Subject: |
[taler-anastasis-gtk] 02/02: worked on authentication frames forward button |
|
Date: |
Fri, 25 Sep 2020 19:22:22 +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 84b85a3d8ae1ecd5abad33f5ba1712db770fc5da
Author: Dennis Neufeld <dennis.neufeld@students.bfh.ch>
AuthorDate: Fri Sep 25 19:21:14 2020 +0200
worked on authentication frames forward button
---
src/anastasis/anastasis-gtk.c | 13 ++++++++-----
src/anastasis/anastasis-gtk_backup.c | 35 +++++++++++++++++++----------------
src/anastasis/anastasis-gtk_helper.c | 11 +++++++++--
3 files changed, 36 insertions(+), 23 deletions(-)
diff --git a/src/anastasis/anastasis-gtk.c b/src/anastasis/anastasis-gtk.c
index 41a89c7..470d557 100644
--- a/src/anastasis/anastasis-gtk.c
+++ b/src/anastasis/anastasis-gtk.c
@@ -388,7 +388,7 @@ anastasis_gtk_main_window_forward_clicked (GObject *object,
"anastasis_gtk_user_attributes_image")));
}
- //show provider frame, hide identity frame
+ //show backup authentication methods frame, hide identity frame
if (gtk_widget_is_visible (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_identity_frame"))) &&
check_attributes_fullfilled ())
@@ -467,14 +467,17 @@ anastasis_gtk_main_window_forward_clicked (GObject
*object,
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_identity_frame")));
- gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
-
"anastasis_gtk_b_authentication_frame")));
gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_main_window_forward_button")), false);
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_user_attributes_image")));
- gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
-
"anastasis_gtk_b_authentication_methods_image")));
+ }
+
+ //show backup policy frame, hide backup authentication methods frame
+ if (gtk_widget_is_visible (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_b_authentication_frame")))
+ {
+
}
}
diff --git a/src/anastasis/anastasis-gtk_backup.c
b/src/anastasis/anastasis-gtk_backup.c
index ad5f3b4..364e55c 100644
--- a/src/anastasis/anastasis-gtk_backup.c
+++ b/src/anastasis/anastasis-gtk_backup.c
@@ -100,7 +100,7 @@ guint g_signal_email;
guint g_signal_post;
guint g_signal_video;
-
+
/**
* Callback invoked if the the "authentication methods edit"-button is clicked.
*
@@ -151,7 +151,15 @@ void
anastasis_gtk_b_auth_method_btn_delete_clicked_cb (GObject *object,
gpointer user_data)
{
+ GList *children;
gtk_widget_destroy (GTK_WIDGET (user_data));
+
+ children = gtk_container_get_children (GTK_CONTAINER
(GCG_get_main_window_object (
+
"anastasis_gtk_b_authentication_vbox")));
+ if (! children)
+ gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_main_window_forward_button")), false);
+ g_list_free (children);
}
@@ -167,7 +175,6 @@ anastasis_gtk_b_question_dialog_btn_ok_clicked_cb (GObject
*object,
{
GtkBox *vbox = GTK_BOX (GCG_get_main_window_object
("anastasis_gtk_b_authentication_vbox"));
GtkHBox *hbox;
- GtkSeparator *separator = (GtkSeparator *) gtk_separator_new
(GTK_ORIENTATION_HORIZONTAL);
bool is_box = GTK_IS_BOX (user_data);
if (is_box)
@@ -212,7 +219,6 @@ anastasis_gtk_b_question_dialog_btn_ok_clicked_cb (GObject
*object,
if (! is_box)
{
gtk_box_pack_start (vbox, hbox, 0, 0, 0);
- gtk_box_pack_start (vbox, separator, 0, 0, 0);
}
gtk_widget_show (GTK_WIDGET (hbox));
@@ -222,7 +228,6 @@ anastasis_gtk_b_question_dialog_btn_ok_clicked_cb (GObject
*object,
gtk_widget_show (GTK_WIDGET (buttons));
gtk_widget_show (GTK_WIDGET (edit_btn));
gtk_widget_show (GTK_WIDGET (delete_btn));
- gtk_widget_show (GTK_WIDGET (separator));
gtk_entry_set_text ( GTK_ENTRY (
GCG_get_main_window_object
("anastasis_gtk_b_question_dialog_question_entry")), "");
@@ -230,6 +235,8 @@ anastasis_gtk_b_question_dialog_btn_ok_clicked_cb (GObject
*object,
GCG_get_main_window_object
("anastasis_gtk_b_question_dialog_answer_entry")), "");
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_b_question_dialog")));
+ gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_main_window_forward_button")), true);
}
@@ -287,7 +294,6 @@ anastasis_gtk_b_post_dialog_btn_ok_clicked_cb (GObject
*object,
{
GtkHBox *hbox;
GtkBox *vbox = GTK_BOX (GCG_get_main_window_object
("anastasis_gtk_b_authentication_vbox"));
- GtkSeparator *separator = (GtkSeparator *) gtk_separator_new
(GTK_ORIENTATION_HORIZONTAL);
bool is_box = GTK_IS_BOX (user_data);
if (is_box)
@@ -344,7 +350,6 @@ anastasis_gtk_b_post_dialog_btn_ok_clicked_cb (GObject
*object,
if (! is_box)
{
gtk_box_pack_start (vbox, hbox, 0, 0, 0);
- gtk_box_pack_start (vbox, separator, 0, 0, 0);
}
gtk_widget_show (GTK_WIDGET (hbox));
@@ -357,7 +362,6 @@ anastasis_gtk_b_post_dialog_btn_ok_clicked_cb (GObject
*object,
gtk_widget_show (GTK_WIDGET (buttons));
gtk_widget_show (GTK_WIDGET (edit_btn));
gtk_widget_show (GTK_WIDGET (delete_btn));
- gtk_widget_show (GTK_WIDGET (separator));
gtk_entry_set_text ( GTK_ENTRY (
GCG_get_main_window_object
("anastasis_gtk_b_post_dialog_full_name_entry")), "");
@@ -371,6 +375,8 @@ anastasis_gtk_b_post_dialog_btn_ok_clicked_cb (GObject
*object,
GCG_get_main_window_object
("anastasis_gtk_b_post_dialog_country_entry")), "");
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_b_post_dialog")));
+ gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_main_window_forward_button")), true);
}
@@ -434,7 +440,6 @@ anastasis_gtk_b_video_dialog_btn_ok_clicked_cb (GObject
*object,
{
GtkHBox *hbox;
GtkBox *vbox = GTK_BOX (GCG_get_main_window_object
("anastasis_gtk_b_authentication_vbox"));
- GtkSeparator *separator = (GtkSeparator *) gtk_separator_new
(GTK_ORIENTATION_HORIZONTAL);
bool is_box = GTK_IS_BOX (user_data);
if (is_box)
@@ -475,7 +480,6 @@ anastasis_gtk_b_video_dialog_btn_ok_clicked_cb (GObject
*object,
if (! is_box)
{
gtk_box_pack_start (vbox, hbox, 0, 0, 0);
- gtk_box_pack_start (vbox, separator, 0, 0, 0);
}
gtk_widget_show (GTK_WIDGET (hbox));
@@ -484,12 +488,13 @@ anastasis_gtk_b_video_dialog_btn_ok_clicked_cb (GObject
*object,
gtk_widget_show (GTK_WIDGET (buttons));
gtk_widget_show (GTK_WIDGET (edit_btn));
gtk_widget_show (GTK_WIDGET (delete_btn));
- gtk_widget_show (GTK_WIDGET (separator));
gtk_entry_set_text ( GTK_ENTRY (
GCG_get_main_window_object
("anastasis_gtk_b_video_dialog_photo_path_entry")), "");
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_b_video_dialog")));
+ gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_main_window_forward_button")), true);
}
@@ -545,7 +550,6 @@ anastasis_gtk_b_sms_dialog_btn_ok_clicked_cb (GObject
*object,
{
GtkHBox *hbox;
GtkBox *vbox = GTK_BOX (GCG_get_main_window_object
("anastasis_gtk_b_authentication_vbox"));
- GtkSeparator *separator = (GtkSeparator *) gtk_separator_new
(GTK_ORIENTATION_HORIZONTAL);
bool is_box = GTK_IS_BOX (user_data);
if (is_box)
@@ -586,7 +590,6 @@ anastasis_gtk_b_sms_dialog_btn_ok_clicked_cb (GObject
*object,
if (! is_box)
{
gtk_box_pack_start (vbox, hbox, 0, 0, 0);
- gtk_box_pack_start (vbox, separator, 0, 0, 0);
}
gtk_widget_show (GTK_WIDGET (hbox));
@@ -595,12 +598,13 @@ anastasis_gtk_b_sms_dialog_btn_ok_clicked_cb (GObject
*object,
gtk_widget_show (GTK_WIDGET (buttons));
gtk_widget_show (GTK_WIDGET (edit_btn));
gtk_widget_show (GTK_WIDGET (delete_btn));
- gtk_widget_show (GTK_WIDGET (separator));
gtk_entry_set_text ( GTK_ENTRY (
GCG_get_main_window_object
("anastasis_gtk_b_sms_dialog_phonenumber_entry")), "");
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_b_sms_dialog")));
+ gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_main_window_forward_button")), true);
}
@@ -656,7 +660,6 @@ anastasis_gtk_b_email_dialog_btn_ok_clicked_cb (GObject
*object,
{
GtkHBox *hbox;
GtkBox *vbox = GTK_BOX (GCG_get_main_window_object
("anastasis_gtk_b_authentication_vbox"));
- GtkSeparator *separator = (GtkSeparator *) gtk_separator_new
(GTK_ORIENTATION_HORIZONTAL);
bool is_box = GTK_IS_BOX (user_data);
if (is_box)
@@ -697,7 +700,6 @@ anastasis_gtk_b_email_dialog_btn_ok_clicked_cb (GObject
*object,
if (! is_box)
{
gtk_box_pack_start (vbox, hbox, 0, 0, 0);
- gtk_box_pack_start (vbox, separator, 0, 0, 0);
}
gtk_widget_show (GTK_WIDGET (hbox));
@@ -706,12 +708,13 @@ anastasis_gtk_b_email_dialog_btn_ok_clicked_cb (GObject
*object,
gtk_widget_show (GTK_WIDGET (buttons));
gtk_widget_show (GTK_WIDGET (edit_btn));
gtk_widget_show (GTK_WIDGET (delete_btn));
- gtk_widget_show (GTK_WIDGET (separator));
gtk_entry_set_text ( GTK_ENTRY (
GCG_get_main_window_object
("anastasis_gtk_b_email_dialog_mailaddress_entry")), "");
gtk_widget_hide (GTK_WIDGET (GCG_get_main_window_object (
"anastasis_gtk_b_email_dialog")));
+ gtk_widget_set_sensitive (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_main_window_forward_button")), true);
}
diff --git a/src/anastasis/anastasis-gtk_helper.c
b/src/anastasis/anastasis-gtk_helper.c
index 6b25123..4eb0788 100644
--- a/src/anastasis/anastasis-gtk_helper.c
+++ b/src/anastasis/anastasis-gtk_helper.c
@@ -185,9 +185,16 @@ action_cb (void *cls,
}
if (check_state (redux_state, "ReduxUserAttributesAddedState"))
{
- init_auth_methods (redux_state);
+ if (json_object_get (redux_state, "backup-state"))
+ {
+ init_auth_methods (redux_state);
+ gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_b_authentication_frame")));
+ gtk_widget_show (GTK_WIDGET (GCG_get_main_window_object (
+
"anastasis_gtk_b_authentication_methods_image")));
+ }
}
- /** FIXME: Don't use this like this */
+ /** FIXME: Don't use this like this; now used to check if json state
is build correctly */
if (0 == persist_state (redux_state))
return;
else
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.