diff options
-rw-r--r-- | configure.ac | 1 | ||||
-rw-r--r-- | contrib/LICENSING | 9 | ||||
-rw-r--r-- | contrib/Makefile.am | 8 | ||||
-rw-r--r-- | contrib/anastasis_gtk_about_window.glade.in | 44 | ||||
-rw-r--r-- | contrib/anastasis_gtk_main_window.glade | 183 | ||||
-rw-r--r-- | contrib/authentication_methods.png | bin | 82253 -> 0 bytes | |||
-rw-r--r-- | contrib/continent_selection.jpg | bin | 97890 -> 0 bytes | |||
-rw-r--r-- | contrib/country_selection.jpg | bin | 203711 -> 0 bytes | |||
-rw-r--r-- | contrib/policy_confirmation.png | bin | 67779 -> 0 bytes | |||
-rw-r--r-- | contrib/satisfy_challenge.png | bin | 85123 -> 0 bytes | |||
-rw-r--r-- | contrib/user_attributes.png | bin | 29782 -> 0 bytes | |||
-rw-r--r-- | debian/changelog | 6 | ||||
-rw-r--r-- | po/POTFILES.in | 1 | ||||
-rw-r--r-- | src/anastasis/Makefile.am | 1 | ||||
-rw-r--r-- | src/anastasis/anastasis-gtk.c | 77 | ||||
-rw-r--r-- | src/anastasis/anastasis-gtk_about.c | 65 | ||||
-rw-r--r-- | src/anastasis/anastasis-gtk_action.c | 13 | ||||
-rw-r--r-- | src/anastasis/anastasis-gtk_helper.c | 1 |
18 files changed, 6 insertions, 403 deletions
diff --git a/configure.ac b/configure.ac index d88fc7e..4967f8f 100644 --- a/configure.ac +++ b/configure.ac @@ -469,5 +469,4 @@ pixmaps/Makefile po/Makefile.in po/Makefile anastasis-gtk.desktop -contrib/anastasis_gtk_about_window.glade ]) diff --git a/contrib/LICENSING b/contrib/LICENSING index 349c393..da054c1 100644 --- a/contrib/LICENSING +++ b/contrib/LICENSING @@ -15,17 +15,8 @@ European union (official project logos): ngi_ledger.png bandiera_stelle.png -Anastasis SARL (Affero GPL): -authentication_methods.png -policy_confirmation.png -satisfy_challenge.png -user_attributes.png - The Noun project: noun_blindfold_3574196.svg Anastasis SARL (official logo, used with permission): logo.png - -Taler Systems SA (official logo, used with permission): -pay_with_taler.png diff --git a/contrib/Makefile.am b/contrib/Makefile.am index 7aa3fe4..197c9a2 100644 --- a/contrib/Makefile.am +++ b/contrib/Makefile.am @@ -8,13 +8,6 @@ pkgdatadir= $(prefix)/share/anastasis/ IMAGES = \ qr_dummy.png \ logo.png \ - country_selection.jpg \ - continent_selection.jpg \ - user_attributes.png \ - enter_secret.jpg \ - pay_with_taler.png \ - authentication_methods.png \ - satisfy_challenge.png \ noun_blindfold_3574196.svg \ outline_contact_support_black_24dp.png \ outline_stay_current_portrait_black_24dp.png \ @@ -32,7 +25,6 @@ EXTRA_DIST = \ pkgdata_DATA = \ $(IMAGES) \ this_stays_private.glade \ - anastasis_gtk_about_window.glade \ anastasis_gtk_auth_add_email.glade \ anastasis_gtk_auth_add_iban.glade \ anastasis_gtk_auth_add_post.glade \ diff --git a/contrib/anastasis_gtk_about_window.glade.in b/contrib/anastasis_gtk_about_window.glade.in deleted file mode 100644 index b7ee59f..0000000 --- a/contrib/anastasis_gtk_about_window.glade.in +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.38.2 --> -<interface> - <requires lib="gtk+" version="3.0"/> - <object class="GtkAboutDialog" id="about_window"> - <property name="can-focus">False</property> - <property name="type-hint">dialog</property> - <property name="program-name">anastasis-gtk</property> - <property name="version">@ANASTASIS_GTK_VERSION3@</property> - <property name="copyright" translatable="yes">(C) @ANASTASIS_GTK_YEARFROM@-@ANASTASIS_YEARTO@ Anastasis SARL</property> - <property name="website">https://anastasis.lu/</property> - <property name="website-label" translatable="yes">Anastasis</property> - <property name="authors">Belen Pena -Christian Grothoff -Dennis Neufeld</property> - <property name="documenters">Christian Grothoff -Dominik Meister -Dennis Neufeld</property> - <property name="logo">logo.svg</property> - <property name="license-type">gpl-3-0</property> - <signal name="response" handler="ANASTASIS_GTK_about_close_response" swapped="no"/> - <child internal-child="vbox"> - <object class="GtkBox"> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">2</property> - <child internal-child="action_area"> - <object class="GtkButtonBox"> - <property name="can-focus">False</property> - <property name="layout-style">end</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - </child> - </object> -</interface> diff --git a/contrib/anastasis_gtk_main_window.glade b/contrib/anastasis_gtk_main_window.glade index ae0d8e3..8f51d51 100644 --- a/contrib/anastasis_gtk_main_window.glade +++ b/contrib/anastasis_gtk_main_window.glade @@ -362,11 +362,6 @@ Author: Christian Grothoff, Dennis Neufeld <property name="margin-end">5</property> <property name="pixbuf">outline_video_camera_front_black_24dp.png</property> </object> - <object class="GtkImage" id="yes_image"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="stock">gtk-yes</property> - </object> <object class="GtkWindow" id="anastasis_gtk_main_window"> <property name="can-focus">False</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> @@ -380,75 +375,6 @@ Author: Christian Grothoff, Dennis Neufeld <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkMenuBar" id="anastasis_gtk_menubar"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkMenuItem" id="anastasis_gtk_file_menuitem"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_File</property> - <property name="use-underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="anastasis_gtk_file_menu"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkImageMenuItem" id="anastasis_quit_imagemenuitem"> - <property name="label">gtk-quit</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="use-underline">True</property> - <property name="use-stock">True</property> - <signal name="activate" handler="anastasis_gtk_quit_cb" swapped="no"/> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="anastasis_gtk_help_menuitem"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">_Help</property> - <property name="use-underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="anastasis_gtk_help_menu"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkImageMenuItem" id="anastasis_gtk_about_imagemenuitem"> - <property name="label">gtk-about</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="use-underline">True</property> - <property name="use-stock">True</property> - <signal name="activate" handler="anastasis_gtk_about_imagemenuitem_activate_cb" swapped="no"/> - </object> - </child> - <child> - <object class="GtkImageMenuItem" id="anastasis_gtk_animation"> - <property name="label">Show animation</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="image">yes_image</property> - <property name="use-stock">False</property> - <signal name="activate" handler="anastasis_gtk_animation_activate_cb" swapped="no"/> - </object> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -3823,115 +3749,6 @@ select a different provider or backup version.</property> <property name="position">1</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_b_policies_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">4</property> - </packing> - </child> - <child> - <object class="GtkImage" id="anastasis_gtk_enter_secret_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">5</property> - </packing> - </child> - <child> - <object class="GtkImage" id="anastasis_gtk_pay_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">6</property> - </packing> - </child> - <child> - <object class="GtkImage" id="anastasis_gtk_completed_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">7</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">True</property> diff --git a/contrib/authentication_methods.png b/contrib/authentication_methods.png Binary files differdeleted file mode 100644 index c0906a7..0000000 --- a/contrib/authentication_methods.png +++ /dev/null diff --git a/contrib/continent_selection.jpg b/contrib/continent_selection.jpg Binary files differdeleted file mode 100644 index 24697e8..0000000 --- a/contrib/continent_selection.jpg +++ /dev/null diff --git a/contrib/country_selection.jpg b/contrib/country_selection.jpg Binary files differdeleted file mode 100644 index ea9c05f..0000000 --- a/contrib/country_selection.jpg +++ /dev/null diff --git a/contrib/policy_confirmation.png b/contrib/policy_confirmation.png Binary files differdeleted file mode 100644 index f2cca67..0000000 --- a/contrib/policy_confirmation.png +++ /dev/null diff --git a/contrib/satisfy_challenge.png b/contrib/satisfy_challenge.png Binary files differdeleted file mode 100644 index 8e5d518..0000000 --- a/contrib/satisfy_challenge.png +++ /dev/null diff --git a/contrib/user_attributes.png b/contrib/user_attributes.png Binary files differdeleted file mode 100644 index edf5807..0000000 --- a/contrib/user_attributes.png +++ /dev/null diff --git a/debian/changelog b/debian/changelog index 4de2e82..3a1478a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +anastasis-gtk (0.1.0-2) unstable; urgency=low + + * Removed main menu. Final release for packaging. + + -- Christian Grothoff <grothoff@gnu.org> Wed, 09 Sep 2021 19:08:18 +0200 + anastasis-gtk (0.1.0-1) unstable; urgency=low * Fix dependencies and downgrade debhelper-compat for Ubuntu. diff --git a/po/POTFILES.in b/po/POTFILES.in index 37b53de..3483ced 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,3 @@ -src/anastasis/anastasis-gtk_about.c src/anastasis/anastasis-gtk_action.c src/anastasis/anastasis-gtk_attributes.c src/anastasis/anastasis-gtk_backup.c diff --git a/src/anastasis/Makefile.am b/src/anastasis/Makefile.am index 8efa113..b137fc1 100644 --- a/src/anastasis/Makefile.am +++ b/src/anastasis/Makefile.am @@ -12,7 +12,6 @@ bin_PROGRAMS = anastasis-gtk anastasis_gtk_SOURCES = \ anastasis-gtk.c \ - anastasis-gtk_about.c \ anastasis-gtk_action.c anastasis-gtk_action.h \ anastasis-gtk_attributes.c anastasis-gtk_attributes.h \ anastasis-gtk_dispatch.c anastasis-gtk_dispatch.h \ diff --git a/src/anastasis/anastasis-gtk.c b/src/anastasis/anastasis-gtk.c index 3a1e5e5..13e92a2 100644 --- a/src/anastasis/anastasis-gtk.c +++ b/src/anastasis/anastasis-gtk.c @@ -77,83 +77,6 @@ struct GNUNET_SCHEDULER_Task *AG_long_task; json_t *AG_redux_state; -/** - * Callback invoked if the the "show animation"-menuitem (Help) is clicked. - * - * @param menuitem the object which received the signal. - * @param user_data user data set when the signal handler was connected. - */ -void -anastasis_gtk_animation_activate_cb (GtkMenuItem *menuitem, - gpointer user_data) -{ - static const struct - { - const char *png; - const char *widget; - } map[] = { - { .png = "continent_selection.jpg", - .widget = "anastasis_gtk_continent_selection_image" }, - { .png = "country_selection.jpg", - .widget = "anastasis_gtk_country_selection_image" }, - { .png = "user_attributes.png", - .widget = "anastasis_gtk_user_attributes_image" }, - { .png = "authentication_methods.png", - .widget = "anastasis_gtk_b_authentication_methods_image" }, - { .png = "policy_confirmation.png", - .widget = "anastasis_gtk_b_policies_image" }, - { .png = "enter_secret.jpg", - .widget = "anastasis_gtk_enter_secret_image" }, - { .png = "pay_with_taler.png", - .widget = "anastasis_gtk_pay_image" }, - { .png = NULL, - .widget = NULL }, - { .png = NULL, - .widget = "anastasis_gtk_completed_image" } - }; - char *path; - - if (gtk_widget_is_visible (GTK_WIDGET (GCG_get_main_window_object ( - "anastasis_gtk_illustration_vbox")))) - { - AG_hide ("anastasis_gtk_illustration_vbox"); - return; - } - AG_show ("anastasis_gtk_illustration_vbox"); - path = GNUNET_OS_installation_get_path (GNUNET_OS_IPK_PREFIX); - if (NULL == path) - { - GNUNET_break (0); - return; - } - for (unsigned int i = 0; NULL != map[i].png; i++) - { - GObject *img; - - img = GCG_get_main_window_object (map[i].widget); - if (NULL == img) - { - GNUNET_log (GNUNET_ERROR_TYPE_ERROR, - "Could not find widget `%s' to set image path\n", - map[i].widget); - } - else - { - char *ip; - - GNUNET_asprintf (&ip, - "%s/share/anastasis/%s", - path, - map[i].png); - gtk_image_set_from_file (GTK_IMAGE (img), - ip); - GNUNET_free (ip); - } - } - GNUNET_free (path); -} - - void AG_stop_long_action (void) { diff --git a/src/anastasis/anastasis-gtk_about.c b/src/anastasis/anastasis-gtk_about.c deleted file mode 100644 index 4bfdbbe..0000000 --- a/src/anastasis/anastasis-gtk_about.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - This file is part of Anastasis-gtk - Copyright (C) 2005-2013, 2021 Anastasis SARL - - Anastasis is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published - by the Free Software Foundation; either version 3, or (at your - option) any later version. - - Anastasis is distributed in the hope that it will be useful, but - WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Anastasis; see the file COPYING. If not, write to the - Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - Boston, MA 02110-1301, USA. -*/ -/** - * @file src/anastasis/anastasis-gtk_about.c - * @author Christian Grothoff - * - * This file contains the about dialog. - */ -#include <gnunet/platform.h> -#include <gnunet-gtk/gnunet_gtk.h> - - -void -ANASTASIS_GTK_about_close_response (GtkDialog *dialog, - gint response_id, - gpointer user_data) -{ - GtkBuilder *builder = user_data; - - gtk_widget_destroy (GTK_WIDGET (dialog)); - g_object_unref (G_OBJECT (builder)); -} - - -/** - * This displays an about window - */ -void -anastasis_gtk_about_imagemenuitem_activate_cb (GtkWidget *dummy, - gpointer data) -{ - GtkBuilder *builder; - GtkWidget *diag; - - builder = GNUNET_GTK_get_new_builder ("anastasis_gtk_about_window.glade", - NULL); - if (NULL == builder) - { - GNUNET_break (0); - return; - } - diag = GTK_WIDGET (gtk_builder_get_object (builder, - "about_window")); - gtk_widget_show (diag); -} - - -/* end of anastasis-gtk_about.c */ diff --git a/src/anastasis/anastasis-gtk_action.c b/src/anastasis/anastasis-gtk_action.c index 4091ad1..b3c5333 100644 --- a/src/anastasis/anastasis-gtk_action.c +++ b/src/anastasis/anastasis-gtk_action.c @@ -147,7 +147,6 @@ action_continent_selecting (void) AG_show ("anastasis_gtk_main_window_forward_button"); AG_show ("anastasis_gtk_main_control_vbox"); AG_show ("anastasis_gtk_continent_frame"); - AG_show ("anastasis_gtk_continent_selection_image"); } @@ -242,10 +241,7 @@ action_country_selecting (void) } AG_show ("anastasis_gtk_main_window_prev_button"); AG_show ("anastasis_gtk_main_window_forward_button"); - AG_show ("anastasis_gtk_country_selection_image"); AG_show ("anastasis_gtk_continent_frame"); - AG_show ("anastasis_gtk_continent_selection_image"); - AG_show ("anastasis_gtk_country_selection_image"); } @@ -650,7 +646,6 @@ action_user_attributes_collecting (void) AG_show ("anastasis_gtk_main_window_forward_button"); AG_show ("anastasis_gtk_identity_frame"); AG_focus ("anastasis_gtk_ia_full_name_entry"); - AG_show ("anastasis_gtk_user_attributes_image"); } @@ -813,7 +808,6 @@ action_authentications_editing (void) AG_show ("anastasis_gtk_main_window_prev_button"); AG_show ("anastasis_gtk_main_window_forward_button"); AG_show ("anastasis_gtk_b_authentication_frame"); - AG_show ("anastasis_gtk_b_authentication_methods_image"); } @@ -1054,7 +1048,6 @@ action_policies_reviewing (void) AG_show ("anastasis_gtk_backup_progress_scrolled_window"); AG_hide ("anastasis_gtk_recovery_progress_scrolled_window"); AG_show ("anastasis_gtk_b_policy_frame"); - AG_show ("anastasis_gtk_b_policies_image"); AG_show ("anastasis_gtk_main_control_vbox"); AG_show ("anastasis_gtk_main_window_prev_button"); AG_show ("anastasis_gtk_main_window_forward_button"); @@ -1335,7 +1328,6 @@ action_secret_editing (void) AG_show ("anastasis_gtk_backup_progress_scrolled_window"); AG_hide ("anastasis_gtk_recovery_progress_scrolled_window"); AG_show ("anastasis_gtk_enter_secret_frame"); - AG_show ("anastasis_gtk_enter_secret_image"); AG_show ("anastasis_gtk_main_control_vbox"); AG_show ("anastasis_gtk_main_window_prev_button"); AG_show ("anastasis_gtk_main_window_forward_button"); @@ -1541,7 +1533,6 @@ action_truths_paying (void) json_decref (args); } AG_show ("anastasis_gtk_pay_frame"); - AG_show ("anastasis_gtk_pay_image"); AG_show ("anastasis_gtk_main_control_vbox"); AG_show ("anastasis_gtk_progress_vbox"); AG_progress_update (); @@ -1624,7 +1615,6 @@ action_policies_paying (void) json_decref (args); } AG_show ("anastasis_gtk_pay_frame"); - AG_show ("anastasis_gtk_pay_image"); AG_show ("anastasis_gtk_main_control_vbox"); AG_show ("anastasis_gtk_progress_vbox"); AG_progress_update (); @@ -1719,7 +1709,6 @@ action_backup_finished (void) AG_hide ("anastasis_gtk_success_recovery_box"); AG_show ("anastasis_gtk_success_backup_label"); AG_hide ("anastasis_gtk_success_recovery_box"); - AG_show ("anastasis_gtk_completed_image"); AG_show ("anastasis_gtk_main_control_vbox"); AG_hide ("anastasis_gtk_main_window_save_as_button"); AG_show ("anastasis_gtk_restart_button"); @@ -2650,7 +2639,6 @@ action_challenge_paying (void) AG_show ("anastasis_gtk_recovery_progress_scrolled_window"); AG_hide ("anastasis_gtk_backup_progress_scrolled_window"); AG_show ("anastasis_gtk_pay_frame"); - AG_show ("anastasis_gtk_pay_image"); AG_show ("anastasis_gtk_main_control_vbox"); AG_sensitive ("anastasis_gtk_main_window_prev_button"); AG_show ("anastasis_gtk_main_window_prev_button"); @@ -3223,7 +3211,6 @@ action_recovery_finished (void) AG_hide ("anastasis_gtk_backup_complete_box"); AG_hide ("anastasis_gtk_success_backup_label"); AG_show ("anastasis_gtk_success_recovery_box"); - AG_show ("anastasis_gtk_completed_image"); AG_show ("anastasis_gtk_main_control_vbox"); AG_hide ("anastasis_gtk_main_window_save_as_button"); AG_show ("anastasis_gtk_restart_button"); diff --git a/src/anastasis/anastasis-gtk_helper.c b/src/anastasis/anastasis-gtk_helper.c index 558eb20..84b369d 100644 --- a/src/anastasis/anastasis-gtk_helper.c +++ b/src/anastasis/anastasis-gtk_helper.c @@ -187,7 +187,6 @@ AG_hide_all_frames (void) { AG_hide ("anastasis_gtk_start_frame"); AG_hide_children ("anastasis_gtk_super_vbox"); - AG_hide_children ("anastasis_gtk_illustration_vbox"); if (AG_have_error) AG_show ("anastasis_gtk_error_label"); } |