diff options
| author | Christian Grothoff <christian@grothoff.org> | 2022-09-26 14:37:19 +0200 |
|---|---|---|
| committer | Christian Grothoff <christian@grothoff.org> | 2022-09-26 14:37:19 +0200 |
| commit | 1fcfa8ba6fb8fd93f6438d29f27e10a561e80d0c (patch) | |
| tree | c7209c614c8fa0c325242ce5982577eb25cfc4d0 | |
| parent | e6f8a2978818c6047fba5f3455cd130c37d1bfa6 (diff) | |
| parent | 390cb8c365cc53b2b79c908f7e1bd6c0f19a6a46 (diff) | |
| download | anastasis-gtk-1fcfa8ba6fb8fd93f6438d29f27e10a561e80d0c.tar.gz anastasis-gtk-1fcfa8ba6fb8fd93f6438d29f27e10a561e80d0c.tar.bz2 anastasis-gtk-1fcfa8ba6fb8fd93f6438d29f27e10a561e80d0c.zip | |
Merge branch 'master' of git+ssh://git.taler.net/anastasis-gtk
| -rw-r--r-- | configure.ac | 14 | ||||
| -rw-r--r-- | contrib/anastasis_gtk_add_provider.glade | 18 | ||||
| -rw-r--r-- | contrib/anastasis_gtk_main_window.glade | 1356 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src/anastasis/Makefile.am | 1 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_action.c | 262 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_attributes.c | 2 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_handle-add-provider.c | 26 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c | 6 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_handle-country-activated.c | 60 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_handle-currency-changed.c | 78 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c | 92 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_handle-policy-activate.c | 9 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_handle-print.c | 7 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_helper.h | 7 | ||||
| -rw-r--r-- | src/anastasis/anastasis-gtk_pe-edit-policy.c | 9 | ||||
| -rwxr-xr-x | src/testing/test_prepare.sh | 12 |
20 files changed, 896 insertions, 1078 deletions
diff --git a/configure.ac b/configure.ac index 08b8e94..6bed77a 100644 --- a/configure.ac +++ b/configure.ac @@ -19,7 +19,7 @@ # # Process this file with autoconf to produce a configure script. # -AC_PREREQ(2.61) +AC_PREREQ([2.69]) AC_INIT([Anastasis GTK],[0.2.0],[bug-anastasis@gnu.org],[anastasis-gtk]) AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([silent-rules]) @@ -27,22 +27,19 @@ AC_CONFIG_HEADERS([anastasis_gtk_config.h]) AH_TOP([#define _GNU_SOURCE 1]) -AC_ISC_POSIX AC_PROG_AWK AM_PROG_CC_C_O AC_PROG_MKDIR_P AC_PROG_CPP -AC_PROG_CC_C99 +AC_PROG_CC AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET -AC_LIBTOOL_WIN32_DLL -AC_HEADER_STDC AC_CANONICAL_HOST # dynamic libraries/plugins AC_DISABLE_STATIC -AC_PROG_LIBTOOL +LT_INIT AC_SYS_LARGEFILE AC_FUNC_FSEEKO @@ -352,8 +349,6 @@ AC_MSG_CHECKING(for gtk) without_gtk=true PKG_CHECK_MODULES([GTK], [gtk+-3.0]) -AM_PATH_GTK_3_0([3.22.0],,AC_MSG_ERROR([anastasis-gtk requires GTK 3.22])) - CFLAGS="$CFLAGS $GTK_CFLAGS" CPPFLAGS="$CPPFLAGS $GTK_CFLAGS" LIBS="$LIBS $GTK_LIBS" @@ -492,7 +487,7 @@ AS_IF([test -n "$SOURCE_DATE_EPOCH"], [thisyear=$(date +%Y)]) AC_SUBST(ANASTASIS_GTK_YEARTO, ${thisyear}, [year of the most current release]) -AC_OUTPUT([ +AC_CONFIG_FILES([ Makefile contrib/Makefile doc/Makefile @@ -505,3 +500,4 @@ po/Makefile.in po/Makefile anastasis-gtk.desktop ]) +AC_OUTPUT diff --git a/contrib/anastasis_gtk_add_provider.glade b/contrib/anastasis_gtk_add_provider.glade index 67797a6..54cf062 100644 --- a/contrib/anastasis_gtk_add_provider.glade +++ b/contrib/anastasis_gtk_add_provider.glade @@ -140,24 +140,6 @@ Author: Christian Grothoff <property name="position">1</property> </packing> </child> - <child> - <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can-focus">False</property> - <property name="can-default">True</property> - <property name="has-default">True</property> - <property name="receives-default">True</property> - <property name="use-stock">True</property> - <signal name="clicked" handler="url_add_button_clicked_cb" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> diff --git a/contrib/anastasis_gtk_main_window.glade b/contrib/anastasis_gtk_main_window.glade index b5084c3..02a86ec 100644 --- a/contrib/anastasis_gtk_main_window.glade +++ b/contrib/anastasis_gtk_main_window.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.22.2 +<!-- Generated with glade 3.38.2 Copyright (C) 2019-2021 Anastasis SARL @@ -30,7 +30,7 @@ Author: Christian Grothoff, Dennis Neufeld <!-- interface-authors Christian Grothoff, Dennis Neufeld --> <object class="GtkImage" id="add_image"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="stock">gtk-add</property> </object> <object class="GtkListStore" id="anastasis_gtk_backup_progress_liststore"> @@ -82,26 +82,26 @@ Author: Christian Grothoff, Dennis Neufeld </object> <object class="GtkAdjustment" id="anastasis_gtk_enter_secret_hadjustment"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkTextBuffer" id="anastasis_gtk_enter_secret_textbuffer"> <signal name="changed" handler="anastasis_gtk_enter_secret_textbuffer_changed_cb" swapped="no"/> </object> <object class="GtkAdjustment" id="anastasis_gtk_enter_secret_vadjustment"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="anastasis_gtk_policy_box_adjustment_h"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="anastasis_gtk_policy_box_adjustment_v"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkListStore" id="anastasis_gtk_recovery_progress_liststore"> <columns> @@ -152,19 +152,19 @@ Author: Christian Grothoff, Dennis Neufeld </object> <object class="GtkAdjustment" id="backup_adjustmenth"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="backup_adjustmentv"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkImage" id="backup_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="stock">gtk-go-up</property> </object> <object class="GtkListStore" id="backup_provider_liststore"> @@ -233,80 +233,57 @@ Author: Christian Grothoff, Dennis Neufeld <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="currency_liststore"> - <columns> - <!-- column-name currency_name --> - <column type="gchararray"/> - </columns> - <data> - <row> - <col id="0">CHF</col> - </row> - <row> - <col id="0">EUR</col> - </row> - <row> - <col id="0">USD</col> - </row> - <row> - <col id="0">KUDOS</col> - </row> - <row> - <col id="0">TESTKUDOS</col> - </row> - </data> - </object> <object class="GtkImage" id="edit_image"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="stock">gtk-edit</property> </object> <object class="GtkImage" id="email_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="margin_end">5</property> + <property name="can-focus">False</property> + <property name="margin-right">5</property> + <property name="margin-end">5</property> <property name="pixbuf">outline_email_black_24dp.png</property> </object> <object class="GtkAdjustment" id="expiration_year_adjustment"> <property name="upper">9999</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkImage" id="image_freeotp"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">outline_totp_24dp.png</property> </object> <object class="GtkImage" id="image_iban"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">outline_iban_24dp.png</property> </object> <object class="GtkImage" id="image_sms"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="margin_end">5</property> + <property name="can-focus">False</property> + <property name="margin-right">5</property> + <property name="margin-end">5</property> <property name="pixbuf">outline_stay_current_portrait_black_24dp.png</property> </object> <object class="GtkImage" id="image_sms1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="margin_end">5</property> + <property name="can-focus">False</property> + <property name="margin-right">5</property> + <property name="margin-end">5</property> <property name="pixbuf">outline_stay_current_portrait_black_24dp.png</property> </object> <object class="GtkImage" id="open_file_image"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="stock">gtk-open</property> </object> <object class="GtkImage" id="open_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> <property name="stock">gtk-open</property> </object> <object class="GtkTreeStore" id="policy_review_treestore"> @@ -335,14 +312,14 @@ Author: Christian Grothoff, Dennis Neufeld </object> <object class="GtkAdjustment" id="policy_version_adjustment"> <property name="upper">4294967295</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkImage" id="postal_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="margin_end">5</property> + <property name="can-focus">False</property> + <property name="margin-right">5</property> + <property name="margin-end">5</property> <property name="pixbuf">outline_home_work_black_24dp.png</property> </object> <object class="GtkEntryBuffer" id="provider_url_entrybuffer"> @@ -350,47 +327,47 @@ Author: Christian Grothoff, Dennis Neufeld </object> <object class="GtkImage" id="question_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">5</property> - <property name="margin_end">5</property> + <property name="can-focus">False</property> + <property name="margin-right">5</property> + <property name="margin-end">5</property> <property name="pixbuf">outline_contact_support_black_24dp.png</property> </object> <object class="GtkAdjustment" id="recovery_adjustmenth"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="recovery_adjustmentv"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkImage" id="restart_image"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="stock">gtk-goto-first</property> </object> <object class="GtkImage" id="restore_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">4</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">4</property> <property name="stock">gtk-go-down</property> </object> <object class="GtkAdjustment" id="secret_box_adjustmenth"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="secret_box_adjustmentv"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkAdjustment" id="secret_selection_h_adjustment"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkListStore" id="secret_selection_liststore"> <columns> @@ -406,12 +383,14 @@ Author: Christian Grothoff, Dennis Neufeld <column type="gchararray"/> <!-- column-name secret_date_numeric --> <column type="guint64"/> + <!-- column-name providers_json --> + <column type="gpointer"/> </columns> </object> <object class="GtkAdjustment" id="secret_selection_v_adjustment"> <property name="upper">100</property> - <property name="step_increment">1</property> - <property name="page_increment">10</property> + <property name="step-increment">1</property> + <property name="page-increment">10</property> </object> <object class="GtkListStore" id="unpaid_qrcodes_liststore"> <columns> @@ -424,50 +403,47 @@ Author: Christian Grothoff, Dennis Neufeld </columns> </object> <object class="GtkWindow" id="anastasis_gtk_main_window"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="events">GDK_BUTTON_PRESS_MASK | GDK_STRUCTURE_MASK</property> - <property name="window_position">center</property> - <property name="default_width">700</property> - <property name="default_height">500</property> + <property name="window-position">center</property> + <property name="default-width">700</property> + <property name="default-height">500</property> <signal name="delete-event" handler="anastasis_gtk_quit_cb" swapped="no"/> - <child type="titlebar"> - <placeholder/> - </child> <child> <object class="GtkBox" id="anastasis_gtk_main_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox" id="anastasis_gtk_progress_vbox"> - <property name="can_focus">False</property> - <property name="margin_right">5</property> + <property name="can-focus">False</property> + <property name="margin-right">5</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkScrolledWindow" id="anastasis_gtk_backup_progress_scrolled_window"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hadjustment">backup_adjustmenth</property> <property name="vadjustment">backup_adjustmentv</property> - <property name="window_placement_set">False</property> - <property name="shadow_type">in</property> - <property name="propagate_natural_width">True</property> + <property name="window-placement-set">False</property> + <property name="shadow-type">in</property> + <property name="propagate-natural-width">True</property> <child> <object class="GtkTreeView" id="anastasis_gtk_backup_progress_treeview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hadjustment">backup_adjustmenth</property> <property name="vadjustment">backup_adjustmentv</property> <property name="model">anastasis_gtk_backup_progress_liststore</property> - <property name="headers_clickable">False</property> - <property name="enable_search">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <property name="tooltip_column">2</property> + <property name="headers-clickable">False</property> + <property name="enable-search">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> + <property name="tooltip-column">2</property> <signal name="button-press-event" handler="anastasis_gtk_backup_progress_treeview_button_press_event_cb" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="anastasis_gtk_backup_progress_tree_selection"/> @@ -500,24 +476,24 @@ Author: Christian Grothoff, Dennis Neufeld <child> <object class="GtkScrolledWindow" id="anastasis_gtk_recovery_progress_scrolled_window"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hadjustment">recovery_adjustmenth</property> <property name="vadjustment">recovery_adjustmentv</property> - <property name="window_placement_set">False</property> - <property name="shadow_type">in</property> - <property name="propagate_natural_width">True</property> + <property name="window-placement-set">False</property> + <property name="shadow-type">in</property> + <property name="propagate-natural-width">True</property> <child> <object class="GtkTreeView" id="anastasis_gtk_recovery_progress_treeview"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hadjustment">recovery_adjustmenth</property> <property name="vadjustment">recovery_adjustmentv</property> <property name="model">anastasis_gtk_recovery_progress_liststore</property> - <property name="headers_clickable">False</property> - <property name="enable_search">False</property> - <property name="search_column">0</property> - <property name="show_expanders">False</property> - <property name="tooltip_column">2</property> + <property name="headers-clickable">False</property> + <property name="enable-search">False</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> + <property name="tooltip-column">2</property> <signal name="button-press-event" handler="anastasis_gtk_recovery_progress_treeview_button_press_event_cb" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection" id="anastasis_gtk_recovery_progress_tree_selection"/> @@ -551,16 +527,16 @@ Author: Christian Grothoff, Dennis Neufeld <object class="GtkButton" id="anastasis_gtk_main_window_save_as_button"> <property name="label">gtk-save-as</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Save the current state of Anastasis to a file. Useful if you want to resume the operation later.</property> - <property name="margin_start">15</property> - <property name="margin_end">15</property> - <property name="margin_top">20</property> - <property name="margin_bottom">20</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Save the current state of Anastasis to a file. Useful if you want to resume the operation later.</property> + <property name="margin-start">15</property> + <property name="margin-end">15</property> + <property name="margin-top">20</property> + <property name="margin-bottom">20</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_main_window_save_as_button_clicked_cb" swapped="no"/> </object> <packing> @@ -581,29 +557,29 @@ Author: Christian Grothoff, Dennis Neufeld <child> <object class="GtkScrolledWindow" id="anastasis_gtk_scrolledwindow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="hadjustment">recovery_adjustmentv</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport" id="anastasis_gtk_viewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox" id="anastasis_gtk_super_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="anastasis_gtk_error_label"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">DYNAMIC ERROR MESSAGE</property> <attributes> <attribute name="weight" value="bold"/> @@ -620,26 +596,26 @@ Author: Christian Grothoff, Dennis Neufeld <child> <object class="GtkAlignment" id="anastasis_gtk_start_frame"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-left">10</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> + <property name="can-focus">False</property> <property name="halign">center</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> - <property name="margin_start">10</property> - <property name="margin_end">10</property> - <property name="margin_top">10</property> - <property name="margin_bottom">10</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> <property name="orientation">vertical</property> <property name="spacing">20</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> <property name="label" translatable="yes">What do you want to do?</property> <property name="justify">center</property> @@ -659,12 +635,12 @@ Author: Christian Grothoff, Dennis Neufeld <object class="GtkButton" id="anastasis_gtk_backup_button"> <property name="label" translatable="yes">_Back up a secret</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Begin fresh backup process</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Begin fresh backup process</property> <property name="image">backup_image</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> + <property name="use-underline">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_backup_button_clicked_cb" swapped="no"/> </object> <packing> @@ -678,12 +654,12 @@ Author: Christian Grothoff, Dennis Neufeld <object class="GtkButton" id="anastasis_gtk_recovery_button"> <property name="label" translatable="yes">_Recover a secret</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Begin secret recovery process</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Begin secret recovery process</property> <property name="image">restore_image</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> + <property name="use-underline">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_recovery_button_clicked_cb" swapped="no"/> </object> <packing> @@ -697,12 +673,12 @@ Author: Christian Grothoff, Dennis Neufeld <object class="GtkButton" id="anastasis_gtk_open_state"> <property name="label">_Open a saved action</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Continue from file with saved Anastasis state</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Continue from file with saved Anastasis state</property> <property name="image">open_image</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> + <property name="use-underline">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_open_state_clicked_cb" swapped="no"/> </object> <packing> @@ -723,31 +699,31 @@ Author: Christian Grothoff, Dennis Neufeld </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="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> + <property name="can-focus">False</property> + <property name="left-padding">12</property> <child> <object class="GtkBox" id="anastasis_gtk_continent_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="anastasis_gtk_continent_treeview"> <property name="visible">True</property> - <property name="can_focus">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> + <property name="enable-search">False</property> + <property name="search-column">0</property> + <property name="activate-on-single-click">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="anastasis_gtk_continent_selection"> <signal name="changed" handler="anastasis_gtk_continent_selection_changed_cb" swapped="no"/> @@ -777,16 +753,16 @@ Author: Christian Grothoff, Dennis Neufeld <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="anastasis_gtk_country_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="model">country_liststore</property> - <property name="enable_search">False</property> - <property name="search_column">0</property> - <property name="activate_on_single_click">True</property> + <property name="enable-search">False</property> + <property name="search-column">0</property> + <property name="activate-on-single-click">True</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="anastasis_gtk_country_selection"> <signal name="changed" handler="anastasis_gtk_country_selection_changed_cb" swapped="no"/> @@ -813,44 +789,6 @@ Author: Christian Grothoff, Dennis Neufeld <property name="position">1</property> </packing> </child> - <child> - <object class="GtkScrolledWindow"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="anastasis_gtk_currency_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="model">currency_liststore</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="anastasis_gtk_currency_selection"> - <property name="mode">multiple</property> - <signal name="changed" handler="anastasis_gtk_currency_selection_changed_cb" swapped="no"/> - </object> - </child> - <child> - <object class="GtkTreeViewColumn"> - <property name="title" translatable="yes">Currencies</property> - <property name="sort_column_id">0</property> - <child> - <object class="GtkCellRendererText" id="currency"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">5</property> - <property name="position">2</property> - </packing> - </child> </object> </child> </object> @@ -858,12 +796,12 @@ Author: Christian Grothoff, Dennis Neufeld <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">These questions determine which personal attributes we can ask you for, and which backup providers could be used.</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">These questions determine which personal attributes we can ask you for, and which backup providers could be used.</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Where do you live? In which currencies do you want to pay?</property> <attributes> <attribute name="weight" value="bold"/> @@ -879,42 +817,42 @@ Author: Christian Grothoff, Dennis Neufeld </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> + <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="can-focus">False</property> <child> <object class="GtkBox" id="who_are_you_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">10</property> <property name="homogeneous">True</property> <child> <object class="GtkBox" id="anastasis_gtk_identity_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">15</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_full_name_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_full_name_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</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="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="margin-left">20</property> + <property name="margin-start">20</property> <property name="label" translatable="yes">Full name:</property> </object> <packing> @@ -927,14 +865,14 @@ Author: Christian Grothoff, Dennis Neufeld <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkEntry" id="anastasis_gtk_ia_full_name_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="placeholder_text" translatable="yes" comments="Change to a common "dummy" name in the target language, using the suggested canonical format for that name in that language.">DOE, John</property> + <property name="placeholder-text" translatable="yes" comments="Change to a common "dummy" name in the target language, using the suggested canonical format for that name in that language.">DOE, John</property> <signal name="changed" handler="AG_identity_changed" swapped="no"/> <signal name="focus-in-event" handler="anastasis_gtk_show_on_focus_in_event_cb" object="anastasis_gtk_name_casewarning_label" swapped="yes"/> <signal name="focus-out-event" handler="anastasis_gtk_hide_on_focus_out_event_cb" object="anastasis_gtk_name_casewarning_label" swapped="yes"/> @@ -950,7 +888,7 @@ Author: Christian Grothoff, Dennis Neufeld <child> <object class="GtkLabel" id="anastasis_gtk_ia_name_format_hint_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" comments="You may completely change the recommended format if the given format is inappropriate for the target language or culture.">If possible, use "LASTNAME, Firstname(s)" without abbreviations.</property> </object> <packing> @@ -977,13 +915,13 @@ Author: Christian Grothoff, Dennis Neufeld <child> <object class="GtkBox" id="private_hbox1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <child> <object class="GtkLabel" id="privacy_label1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <property name="label" translatable="yes">This stays private</property> </object> <packing> @@ -995,10 +933,10 @@ Author: Christian Grothoff, Dennis Neufeld </child> <child> <object class="GtkImage" id="blindfold_image1"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1010,8 +948,8 @@ Author: Christian Grothoff, Dennis Neufeld </child> <child> <object class="GtkLabel" id="anastasis_gtk_name_casewarning_label"> - <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="If the user's language does not have cases (like in Kanji), you may choose to leave out the text about case-sensitivity to avoid confusing the reader.">This field is case-sensitive. You must enter + <property name="can-focus">False</property> + <property name="label" translatable="yes" comments="If the user's language does not have cases (like in Kanji), you may choose to leave out the text about case-sensitivity to avoid confusing the reader.">This field is case-sensitive. You must enter exactly the same value during recovery.</property> <attributes> <attribute name="foreground" value="#81813d3d9c9c"/> @@ -1020,7 +958,7 @@ exactly the same value during recovery.</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">2</property> </packing> </child> @@ -1035,7 +973,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1053,18 +991,18 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_birthdate_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_birthdate_hbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="anastasis_gtk_ia_birthdate_label"> <property name="visible">True</property> - <property name="can_focus">False</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="margin-left">20</property> + <property name="margin-start">20</property> <property name="label" translatable="yes">Birthdate:</property> </object> <packing> @@ -1077,11 +1015,11 @@ exactly the same value during recovery.</property> <child> <object class="GtkCalendar" id="anastasis_gtk_ia_birthdate_cal"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="year">1980</property> <property name="month">8</property> <property name="day">22</property> - <property name="show_week_numbers">True</property> + <property name="show-week-numbers">True</property> <signal name="day-selected" handler="AG_identity_changed" swapped="no"/> <signal name="style-updated" handler="gtk_widget_queue_draw" swapped="no"/> </object> @@ -1103,13 +1041,13 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="private_hbox2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <child> <object class="GtkLabel" id="privacy_label2"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <property name="label" translatable="yes">This stays private</property> </object> <packing> @@ -1121,10 +1059,10 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkImage" id="blindfold_image2"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1145,7 +1083,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1163,20 +1101,20 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_birthplace_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_birthplace_hbox"> <property name="visible">True</property> - <property name="can_focus">False</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="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="margin-left">20</property> + <property name="margin-start">20</property> <property name="label" translatable="yes">Birthplace:</property> </object> <packing> @@ -1189,14 +1127,14 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkEntry" id="anastasis_gtk_ia_birthplace_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="placeholder_text" translatable="yes" comments="Example for Birthplace in suitable language- and culture-specific format with good details.">Lafayette, Indiana, USA</property> + <property name="placeholder-text" translatable="yes" comments="Example for Birthplace in suitable language- and culture-specific format with good details.">Lafayette, Indiana, USA</property> <signal name="changed" handler="AG_identity_changed" swapped="no"/> <signal name="focus-in-event" handler="anastasis_gtk_show_on_focus_in_event_cb" object="anastasis_gtk_birthplace_casewarning_label" swapped="yes"/> <signal name="focus-out-event" handler="anastasis_gtk_hide_on_focus_out_event_cb" object="anastasis_gtk_birthplace_casewarning_label" swapped="no"/> @@ -1212,7 +1150,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkLabel" id="anastasis_gtk_ia_birthplace_format_hint_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes" comments="You may completely change the recommendation if for the target language/culture the recommendation is not applicable.">If possible, use "Location, Region, Country".</property> <attributes> <attribute name="scale" value="0.90000000000000002"/> @@ -1242,13 +1180,13 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="private_hbox3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <child> <object class="GtkLabel" id="privacy_label3"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <property name="label" translatable="yes">This stays private</property> </object> <packing> @@ -1260,10 +1198,10 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkImage" id="blindfold_image3"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1275,8 +1213,8 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkLabel" id="anastasis_gtk_birthplace_casewarning_label"> - <property name="can_focus">False</property> - <property name="label" translatable="yes" comments="If the user's language does not have cases (like in Kanji), you may choose to leave out the text about case-sensitivity to avoid confusing the reader.">This field is case-sensitive. You must enter + <property name="can-focus">False</property> + <property name="label" translatable="yes" comments="If the user's language does not have cases (like in Kanji), you may choose to leave out the text about case-sensitivity to avoid confusing the reader.">This field is case-sensitive. You must enter exactly the same value during recovery.</property> <attributes> <attribute name="foreground" value="#81813d3d9c9c"/> @@ -1299,7 +1237,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1317,19 +1255,19 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_ahv_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_ahv_hbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="anastasis_gtk_ia_ahv_label"> <property name="visible">True</property> - <property name="can_focus">False</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="margin-left">20</property> + <property name="margin-start">20</property> <property name="label" translatable="yes">AHV number:</property> </object> <packing> @@ -1342,13 +1280,13 @@ exactly the same value during recovery.</property> <child> <object class="GtkEntry" id="anastasis_gtk_ia_ahv_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">16</property> - <property name="width_chars">17</property> - <property name="max_width_chars">16</property> - <property name="caps_lock_warning">False</property> - <property name="placeholder_text" translatable="yes">756.1222.3425.89</property> - <property name="input_purpose">number</property> + <property name="can-focus">True</property> + <property name="max-length">16</property> + <property name="width-chars">17</property> + <property name="max-width-chars">16</property> + <property name="caps-lock-warning">False</property> + <property name="placeholder-text" translatable="yes">756.1222.3425.89</property> + <property name="input-purpose">number</property> <signal name="changed" handler="AG_identity_changed" swapped="no"/> <signal name="delete-text" handler="anastasis_gtk_autocomplete_delete_text" swapped="no"/> <signal name="insert-text" handler="anastasis_gtk_autocomplete_insert_text" swapped="no"/> @@ -1371,13 +1309,13 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="private_hbox4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <child> <object class="GtkLabel" id="privacy_label4"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <property name="label" translatable="yes">This stays private</property> </object> <packing> @@ -1389,10 +1327,10 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkImage" id="blindfold_image4"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1413,7 +1351,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1431,19 +1369,19 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_tin_de_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_tin_de_hbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="anastasis_gtk_ia_tin_de_label"> <property name="visible">True</property> - <property name="can_focus">False</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="margin-left">20</property> + <property name="margin-start">20</property> <property name="label" translatable="yes">Steuerliche Identifikationsnummer:</property> </object> <packing> @@ -1456,12 +1394,12 @@ exactly the same value during recovery.</property> <child> <object class="GtkEntry" id="anastasis_gtk_ia_tin_de_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">11</property> - <property name="width_chars">11</property> - <property name="max_width_chars">11</property> - <property name="placeholder_text" translatable="yes">12345678912</property> - <property name="input_purpose">number</property> + <property name="can-focus">True</property> + <property name="max-length">11</property> + <property name="width-chars">11</property> + <property name="max-width-chars">11</property> + <property name="placeholder-text" translatable="yes">12345678912</property> + <property name="input-purpose">number</property> <signal name="changed" handler="AG_identity_changed" swapped="no"/> <signal name="style-updated" handler="gtk_widget_queue_draw" swapped="no"/> </object> @@ -1483,13 +1421,13 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="private_hbox5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <child> <object class="GtkLabel" id="privacy_label5"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <property name="label" translatable="yes">This stays private</property> </object> <packing> @@ -1501,10 +1439,10 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkImage" id="blindfold_image5"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1525,7 +1463,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1543,20 +1481,20 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_ssn_de_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_ssn_de_hbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="anastasis_gtk_ia_ssn_de_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Falls vorhanden sollte diese Nummer auf jeden Fall angegeben werden. Nur Beamte, Selbstständige und andere Personen die keine Rentenversicherungsnummer haben sollten dieses Feld leer lassen.</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Falls vorhanden sollte diese Nummer auf jeden Fall angegeben werden. Nur Beamte, Selbstständige und andere Personen die keine Rentenversicherungsnummer haben sollten dieses Feld leer lassen.</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="margin-left">20</property> + <property name="margin-start">20</property> <property name="label" translatable="yes">Sozialversicherungsnummer (optional):</property> </object> <packing> @@ -1569,12 +1507,12 @@ exactly the same value during recovery.</property> <child> <object class="GtkEntry" id="anastasis_gtk_ia_ssn_de_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">12</property> - <property name="width_chars">13</property> - <property name="max_width_chars">12</property> - <property name="placeholder_text" translatable="yes">14230460S534</property> - <property name="input_purpose">alpha</property> + <property name="can-focus">True</property> + <property name="max-length">12</property> + <property name="width-chars">13</property> + <property name="max-width-chars">12</property> + <property name="placeholder-text" translatable="yes">14230460S534</property> + <property name="input-purpose">alpha</property> <signal name="changed" handler="AG_identity_changed" swapped="no"/> <signal name="style-updated" handler="gtk_widget_queue_draw" swapped="no"/> </object> @@ -1596,13 +1534,13 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="private_hbox6"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <child> <object class="GtkLabel" id="privacy_label6"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <property name="label" translatable="yes">This stays private</property> </object> <packing> @@ -1614,10 +1552,10 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkImage" id="blindfold_image6"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1638,7 +1576,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1656,19 +1594,19 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_ssn_us_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox" id="anastasis_gtk_ia_ssn_us_hbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="anastasis_gtk_ia_ssn_us_label"> <property name="visible">True</property> - <property name="can_focus">False</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="margin-left">20</property> + <property name="margin-start">20</property> <property name="label" translatable="yes">Social security number:</property> </object> <packing> @@ -1681,11 +1619,11 @@ exactly the same value during recovery.</property> <child> <object class="GtkEntry" id="anastasis_gtk_ia_ssn_us_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">11</property> - <property name="width_chars">12</property> - <property name="max_width_chars">11</property> - <property name="placeholder_text" translatable="yes">000-00-0000</property> + <property name="can-focus">True</property> + <property name="max-length">11</property> + <property name="width-chars">12</property> + <property name="max-width-chars">11</property> + <property name="placeholder-text" translatable="yes">000-00-0000</property> <signal name="changed" handler="AG_identity_changed" swapped="no"/> <signal name="delete-text" handler="anastasis_gtk_autocomplete_delete_text" swapped="no"/> <signal name="insert-text" handler="anastasis_gtk_autocomplete_insert_text" swapped="no"/> @@ -1709,13 +1647,13 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="private_hbox7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <child> <object class="GtkLabel" id="privacy_label7"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">40</property> + <property name="can-focus">False</property> + <property name="margin-left">40</property> <property name="label" translatable="yes">This stays private</property> </object> <packing> @@ -1727,10 +1665,10 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkImage" id="blindfold_image7"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1751,7 +1689,7 @@ exactly the same value during recovery.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -1777,20 +1715,20 @@ exactly the same value during recovery.</property> <child> <object class="GtkBox" id="anastasis_gtk_private_explainer_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">20</property> - <property name="baseline_position">top</property> + <property name="baseline-position">top</property> <child> <object class="GtkBox" id="private_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="privacy_label"> <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">False</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">This stays private</property> <attributes> <attribute name="weight" value="bold"/> @@ -1806,10 +1744,10 @@ exactly the same value during recovery.</property> </child> <child> <object class="GtkImage" id="blindfold_image"> - <property name="width_request">24</property> - <property name="height_request">24</property> + <property name="width-request">24</property> + <property name="height-request">24</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="pixbuf">noun_blindfold_3574196.svg</property> </object> <packing> @@ -1829,9 +1767,9 @@ exactly the same value during recovery.</property> <child> <object class="GtkLabel" id="explainer_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">5</property> - <property name="margin_bottom">15</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> + <property name="margin-bottom">15</property> <property name="label" translatable="yes">The information you have entered here: • Will be hashed, and therefore unreadable • The non-hashed version is not shared</property> @@ -1846,9 +1784,9 @@ exactly the same value during recovery.</property> <child> <object class="GtkLabel" id="encrypt_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes"><a href="https://taler.net/papers/thesis-anastasis-2020.pdf">How Anastasis encrypts your data</a></property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> </object> <packing> <property name="expand">False</property> @@ -1859,9 +1797,9 @@ exactly the same value during recovery.</property> <child> <object class="GtkLabel" id="free_software_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Anastasis is <a href="https://www.gnu.org/philosophy/free-sw.html">Free Software</a></property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> </object> <packing> <property name="expand">False</property> @@ -1872,11 +1810,11 @@ exactly the same value during recovery.</property> <child> <object class="GtkLabel" id="funding_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">10</property> + <property name="can-focus">False</property> + <property name="margin-top">10</property> <property name="label" translatable="yes">Anastasis is developed by <a href="https://anastasis.lu/en/about.html#team">privacy advocates</a> with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> from the European Commission.</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="justify">center</property> </object> <packing> @@ -1888,15 +1826,15 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f </child> <child> <object class="GtkImage" id="ec_image"> - <property name="width_request">128</property> - <property name="height_request">128</property> + <property name="width-request">128</property> + <property name="height-request">128</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> - <property name="margin_top">10</property> - <property name="margin_bottom">10</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> <property name="pixbuf">bandiera_stelle.png</property> </object> <packing> @@ -1921,11 +1859,11 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Who are you?</property> <attributes> <attribute name="style" value="normal"/> @@ -1942,132 +1880,142 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f </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> + <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> + <property name="can-focus">False</property> + <property name="left-padding">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkFrame"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_right">50</property> - <property name="margin_end">50</property> + <property name="can-focus">False</property> + <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> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> + <!-- n-columns=3 n-rows=3 --> <object class="GtkGrid" id="anastasis_gtk_auth_button_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">5</property> - <property name="column_spacing">5</property> - <property name="row_homogeneous">True</property> - <property name="column_homogeneous">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">5</property> + <property name="column-spacing">5</property> + <property name="row-homogeneous">True</property> + <property name="column-homogeneous">True</property> <child> <object class="GtkButton" id="anastasis_gtk_btn_add_auth_sms"> <property name="label" translatable="yes">SMS</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Add authentication using a transaction number send to a mobile phone number.</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Add authentication using a transaction number send to a mobile phone number.</property> <property name="image">image_sms</property> <signal name="clicked" handler="anastasis_gtk_btn_add_auth_sms_clicked_cb" swapped="no"/> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButton" id="anastasis_gtk_btn_add_auth_email"> <property name="label" translatable="yes">Email</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Add authentication using a transaction number send to an e-mail address.</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Add authentication using a transaction number send to an e-mail address.</property> <property name="image">email_image</property> <signal name="clicked" handler="anastasis_gtk_btn_add_auth_email_clicked_cb" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButton" id="anastasis_gtk_btn_add_auth_question"> <property name="label" translatable="yes">Question</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Add authentication using security question and answer.</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Add authentication using security question and answer.</property> <property name="image">question_image</property> <signal name="clicked" handler="anastasis_gtk_btn_add_auth_question_clicked_cb" swapped="no"/> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkButton" id="anastasis_gtk_btn_add_auth_post"> <property name="label" translatable="yes">Post</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Add authentication using a transaction number send to a postal address.</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Add authentication using a transaction number send to a postal address.</property> <property name="image">postal_image</property> <signal name="clicked" handler="anastasis_gtk_btn_add_auth_post_clicked_cb" swapped="no"/> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkButton" id="anastasis_gtk_btn_add_auth_iban"> <property name="label" translatable="yes">IBAN</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Add authentication using a payment of from a designated IBAN account.</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Add authentication using a payment of from a designated IBAN account.</property> <property name="image">image_iban</property> <signal name="clicked" handler="anastasis_gtk_btn_add_auth_iban_clicked_cb" swapped="no"/> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">1</property> + <property name="left-attach">2</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkButton" id="anastasis_gtk_btn_add_auth_totp"> <property name="label" translatable="yes">TOTP</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Add Time-Based One-Time Password authentication (RFC 6238)</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Add Time-Based One-Time Password authentication (RFC 6238)</property> <property name="image">image_freeotp</property> <signal name="clicked" handler="anastasis_gtk_btn_add_auth_totp_clicked_cb" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </child> <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Which authorization method should be added?</property> <attributes> <attribute name="weight" value="bold"/> @@ -2085,30 +2033,30 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <child> <object class="GtkBox" id="anastasis_gtk_b_authentication_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkFrame"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</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> + <property name="can-focus">False</property> + <property name="left-padding">12</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="anastasis_gtk_authentication_methods_list"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="model">authentication_methods_liststore</property> - <property name="enable_search">False</property> - <property name="search_column">0</property> + <property name="enable-search">False</property> + <property name="search-column">0</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="anastasis_gtk_authentication_methods_selection"> <signal name="changed" handler="auth_method_selection_changed_cb" swapped="no"/> @@ -2120,8 +2068,8 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <property name="title" translatable="yes">Type</property> <property name="clickable">True</property> <property name="reorderable">True</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">0</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">0</property> <child> <object class="GtkCellRendererText" id="type"/> <attributes> @@ -2152,7 +2100,7 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <child type="label"> <object class="GtkLabel" id="anastasis_gtk_authorization_methods_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Authorization methods configured so far:</property> <attributes> <attribute name="weight" value="bold"/> @@ -2170,17 +2118,17 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <child> <object class="GtkBox" id="anastasis_gtk_authorization_meta_button_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkButton" id="anastasis_gtk_edit_provider_list"> <property name="label" translatable="yes">_Edit providers</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="image">edit_image</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> + <property name="use-underline">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_edit_provider_list_clicked_cb" swapped="no"/> </object> <packing> @@ -2195,10 +2143,10 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <property name="label">gtk-delete</property> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_authentication_method_delete_button_clicked_cb" swapped="no"/> </object> <packing> @@ -2226,7 +2174,7 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -2241,11 +2189,11 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Configure authorization methods!</property> <attributes> <attribute name="weight" value="bold"/> @@ -2261,31 +2209,31 @@ with <a href="https://www.ngi.eu/ngi-projects/ledger/">funding</a> f </child> <child> <object class="GtkFrame" id="anastasis_gtk_b_policy_frame"> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</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="top_padding">10</property> - <property name="bottom_padding">10</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="top-padding">10</property> + <property name="bottom-padding">10</property> + <property name="left-padding">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">10</property> <child> <object class="GtkLabel" id="review_policies_explainer_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_start">15</property> - <property name="margin_end">15</property> - <property name="margin_top">10</property> - <property name="margin_bottom">10</property> + <property name="margin-start">15</property> + <property name="margin-end">15</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> <property name="label" translatable="yes">Each recovery policy specifies a combination of authentication methods sufficient to recover the secret. Please review the recovery policies for the secret you are about to back up. If the automatically generated recovery policies are inadequate for your use case, use right-click to add, edit or delete policies. @@ -2301,14 +2249,14 @@ You can also use "back" to add additional authentication methods.</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="anastasis_gtk_review_policy_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="model">policy_review_treestore</property> - <property name="search_column">0</property> + <property name="search-column">0</property> <signal name="button-press-event" handler="anastasis_gtk_review_policy_treeview_button_press_event_cb" swapped="no"/> <signal name="key-press-event" handler="anastasis_gtk_review_policy_treeview_key_press_event_cb" swapped="no"/> <signal name="row-activated" handler="anastasis_gtk_review_policy_treeview_row_activated_cb" swapped="no"/> @@ -2397,11 +2345,11 @@ You can also use "back" to add additional authentication methods.</property> <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Review recovery policies</property> <attributes> <attribute name="weight" value="bold"/> @@ -2418,31 +2366,31 @@ You can also use "back" to add additional authentication methods.</property> <child> <object class="GtkFrame" id="anastasis_gtk_challenge_frame"> <property name="name">anastasis_gtk_challenge_frame</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</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> + <property name="can-focus">False</property> + <property name="left-padding">12</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hadjustment">anastasis_gtk_policy_box_adjustment_h</property> <property name="vadjustment">anastasis_gtk_policy_box_adjustment_v</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hadjustment">anastasis_gtk_policy_box_adjustment_h</property> <property name="vadjustment">anastasis_gtk_policy_box_adjustment_v</property> <child> <object class="GtkBox" id="anastasis_gtk_policy_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <placeholder/> @@ -2458,11 +2406,11 @@ You can also use "back" to add additional authentication methods.</property> <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Select challenge to recover secret:</property> <attributes> <attribute name="weight" value="bold"/> @@ -2478,49 +2426,49 @@ You can also use "back" to add additional authentication methods.</property> </child> <child> <object class="GtkFrame" id="anastasis_gtk_enter_secret_frame"> - <property name="height_request">1500</property> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</property> + <property name="height-request">1500</property> + <property name="can-focus">False</property> + <property name="label-xalign">0</property> + <property name="shadow-type">none</property> <child> <object class="GtkScrolledWindow" id="secret_frame_scrolled_window"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="vexpand">True</property> <property name="hadjustment">secret_box_adjustmenth</property> <property name="vadjustment">secret_box_adjustmentv</property> - <property name="shadow_type">in</property> - <property name="propagate_natural_width">True</property> - <property name="propagate_natural_height">True</property> + <property name="shadow-type">in</property> + <property name="propagate-natural-width">True</property> + <property name="propagate-natural-height">True</property> <child> <object class="GtkViewport" id="secret_frame_viewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="hadjustment">secret_box_adjustmenth</property> <property name="vadjustment">secret_box_adjustmentv</property> <child> <object class="GtkBox" id="secret_frame_main_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> - <property name="margin_start">10</property> - <property name="margin_end">10</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="orientation">vertical</property> <property name="spacing">5</property> - <property name="baseline_position">top</property> + <property name="baseline-position">top</property> <child> <object class="GtkBox" id="secret_name_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">start</property> <property name="label" translatable="yes">Secret's name</property> @@ -2535,11 +2483,11 @@ You can also use "back" to add additional authentication methods.</property> <child> <object class="GtkEntry" id="anastasis_gtk_secret_name_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="tooltip_text" translatable="yes">This allows you to uniquely identify a secret if you have made multiple back ups. The value entered here will NOT be protected by the authentication checks!</property> - <property name="primary_icon_tooltip_text" translatable="yes">If you make multiple backups using Anastasis, the secret's name will allow you to distinguish the different backups.</property> - <property name="placeholder_text" translatable="yes">Do NOT enter the actual secret here!</property> + <property name="can-focus">True</property> + <property name="has-focus">True</property> + <property name="tooltip-text" translatable="yes">This allows you to uniquely identify a secret if you have made multiple back ups. The value entered here will NOT be protected by the authentication checks!</property> + <property name="primary-icon-tooltip-text" translatable="yes">If you make multiple backups using Anastasis, the secret's name will allow you to distinguish the different backups.</property> + <property name="placeholder-text" translatable="yes">Do NOT enter the actual secret here!</property> <signal name="changed" handler="anastasis_gtk_enter_secret_name_entry_changed_cb" swapped="no"/> </object> <packing> @@ -2552,7 +2500,7 @@ You can also use "back" to add additional authentication methods.</property> <child> <object class="GtkLabel" id="secret_name_explanation_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Names should be unique, so that you can easily identify your secret later.</property> @@ -2575,16 +2523,16 @@ identify your secret later.</property> <child> <object class="GtkBox" id="secret_entry_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="secret_text_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Provide secret as text</property> </object> @@ -2605,29 +2553,29 @@ identify your secret later.</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkScrolledWindow" id="enter_secret_scrolled_window"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Enter the secret you want to back up here.</property> - <property name="margin_start">10</property> - <property name="margin_end">10</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Enter the secret you want to back up here.</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="hadjustment">anastasis_gtk_enter_secret_hadjustment</property> <property name="vadjustment">anastasis_gtk_enter_secret_vadjustment</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTextView" id="anastasis_gtk_enter_secret_textview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="hadjustment">anastasis_gtk_enter_secret_hadjustment</property> - <property name="hscroll_policy">natural</property> + <property name="hscroll-policy">natural</property> <property name="vadjustment">anastasis_gtk_enter_secret_vadjustment</property> - <property name="vscroll_policy">natural</property> + <property name="vscroll-policy">natural</property> <property name="buffer">anastasis_gtk_enter_secret_textbuffer</property> </object> </child> @@ -2642,17 +2590,17 @@ identify your secret later.</property> <child> <object class="GtkButton" id="anastasis_gtk_secret_clear_text_button"> <property name="label">gtk-clear</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_secret_clear_button_clicked_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> @@ -2667,19 +2615,19 @@ identify your secret later.</property> <object class="GtkBox"> <property name="name">anastasis_gtk_enter_secret_file_box</property> <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">False</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="spacing">10</property> <child> <object class="GtkBox" id="anastasis_gtk_secret_file_chooser_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="secret_by_file_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Or provide secret as a file:</property> </object> <packing> @@ -2693,11 +2641,11 @@ identify your secret later.</property> <object class="GtkButton" id="anastasis_gtk_enter_secret_open_button"> <property name="label">Choose file</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> <property name="image">open_file_image</property> - <property name="always_show_image">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_enter_secret_open_button_clicked_cb" swapped="no"/> </object> <packing> @@ -2717,12 +2665,12 @@ identify your secret later.</property> </child> <child> <object class="GtkBox" id="anastasis_gtk_secret_file_name_hbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="secret_file_name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Your secret file:</property> </object> <packing> @@ -2735,7 +2683,7 @@ identify your secret later.</property> <child> <object class="GtkLabel" id="anastasis_gtk_secret_file_name_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">DYNAMICALLY GENERATED</property> <attributes> <attribute name="weight" value="bold"/> @@ -2750,17 +2698,17 @@ identify your secret later.</property> <child> <object class="GtkButton" id="anastasis_gtk_secret_clear_file_button"> <property name="label">gtk-clear</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_secret_clear_button_clicked_cb" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> <property name="padding">5</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">2</property> </packing> </child> @@ -2790,15 +2738,15 @@ identify your secret later.</property> <child> <object class="GtkBox" id="expiration_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="orientation">vertical</property> <property name="spacing">5</property> - <property name="baseline_position">top</property> + <property name="baseline-position">top</property> <child> <object class="GtkLabel" id="recovery_expiration_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Your secret's recovery data expires on:</property> </object> <packing> @@ -2811,11 +2759,11 @@ identify your secret later.</property> <child> <object class="GtkBox" id="expiration_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="expiration_date_without_year_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">DYNAMICALLY SET</property> <attributes> <attribute name="weight" value="bold"/> @@ -2830,11 +2778,11 @@ identify your secret later.</property> <child> <object class="GtkSpinButton" id="expiration_year_spin_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="max_length">4</property> - <property name="width_chars">4</property> - <property name="max_width_chars">4</property> - <property name="input_purpose">digits</property> + <property name="can-focus">True</property> + <property name="max-length">4</property> + <property name="width-chars">4</property> + <property name="max-width-chars">4</property> + <property name="input-purpose">digits</property> <property name="adjustment">expiration_year_adjustment</property> <property name="numeric">True</property> <property name="value">9999</property> @@ -2865,18 +2813,18 @@ identify your secret later.</property> <child> <object class="GtkBox" id="payment_info_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">10</property> <child> <object class="GtkBox" id="backup_free_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">10</property> <child> <object class="GtkLabel" id="backup_fee_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Backup fee:</property> </object> <packing> @@ -2889,7 +2837,7 @@ identify your secret later.</property> <child> <object class="GtkLabel" id="backup_fee_value_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">DYNAMICALLY SET</property> <attributes> <attribute name="weight" value="bold"/> @@ -2913,7 +2861,7 @@ identify your secret later.</property> <child> <object class="GtkLabel" id="backup_fee_explainer_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">You pay this fee to back up your secret. The fee may increase with the expiry @@ -2943,11 +2891,11 @@ date of your secret's recovery data.</property> <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">10</property> - <property name="margin_bottom">10</property> + <property name="can-focus">False</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> <property name="label" translatable="yes">Provide secret to backup:</property> <attributes> <attribute name="weight" value="bold"/> @@ -2964,29 +2912,29 @@ date of your secret's recovery data.</property> </child> <child> <object class="GtkFrame" id="anastasis_gtk_pay_frame"> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</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="margin_top">5</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-top">5</property> + <property name="left-padding">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">5</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Please pay with GNU Taler:</property> </object> <packing> @@ -2999,22 +2947,22 @@ date of your secret's recovery data.</property> <child> <object class="GtkBox" id="anastasis_gtk_main_window_unpaid_box"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">5</property> - <property name="margin_right">5</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">5</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-left">5</property> + <property name="margin-right">5</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">5</property> + <property name="margin-bottom">5</property> <property name="orientation">vertical</property> <property name="spacing">5</property> <child> <object class="GtkTreeView" id="unpaid_qr_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="model">unpaid_qrcodes_liststore</property> - <property name="enable_search">False</property> - <property name="search_column">1</property> + <property name="enable-search">False</property> + <property name="search-column">1</property> <child internal-child="selection"> <object class="GtkTreeSelection" id="unpaid_qr_tree_selection"> <signal name="changed" handler="unpaid_qr_tree_selection_changed_cb" swapped="no"/> @@ -3077,11 +3025,11 @@ date of your secret's recovery data.</property> <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">5</property> - <property name="margin_end">5</property> - <property name="margin_top">10</property> - <property name="margin_bottom">5</property> + <property name="can-focus">False</property> + <property name="margin-start">5</property> + <property name="margin-end">5</property> + <property name="margin-top">10</property> + <property name="margin-bottom">5</property> <property name="label" translatable="yes">Payment required:</property> <attributes> <attribute name="weight" value="bold"/> @@ -3097,30 +3045,30 @@ date of your secret's recovery data.</property> </child> <child> <object class="GtkFrame" id="anastasis_gtk_completed_frame"> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</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="margin_start">10</property> - <property name="margin_end">10</property> - <property name="margin_top">10</property> - <property name="margin_bottom">10</property> - <property name="left_padding">12</property> + <property name="can-focus">False</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> + <property name="left-padding">12</property> <child> <object class="GtkBox" id="anastasis_gtk_success_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox" id="anastasis_gtk_backup_complete_box"> <property name="name">anastasis_gtk_backup_complete_box</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="anastasis_gtk_success_backup_label"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Your backup is complete.</property> <property name="justify">center</property> @@ -3138,12 +3086,12 @@ date of your secret's recovery data.</property> <child> <object class="GtkBox" id="recovery_expiration_box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">5</property> <child> <object class="GtkLabel" id="backup_expiration_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Your backup is valid until:</property> </object> @@ -3156,7 +3104,7 @@ date of your secret's recovery data.</property> </child> <child> <object class="GtkLabel" id="backup_expiration_date_label"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">DYNAMICALLY GENERATED</property> <attributes> <attribute name="weight" value="bold"/> @@ -3179,11 +3127,11 @@ date of your secret's recovery data.</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="anastasis_gtk_success_backup_version_label"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Backups were made at the following providers:</property> </object> @@ -3197,14 +3145,14 @@ date of your secret's recovery data.</property> <child> <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="anastasis_gtk_backup_complete_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="model">backup_provider_liststore</property> - <property name="search_column">0</property> + <property name="search-column">0</property> <child internal-child="selection"> <object class="GtkTreeSelection"/> </child> @@ -3275,12 +3223,12 @@ date of your secret's recovery data.</property> <child> <object class="GtkBox" id="anastasis_gtk_success_recovery_box"> <property name="name">anastasis_gtk_success_recovery_box</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkLabel" id="anastasis_gtk_success_recovery_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Your secret was recovered.</property> <attributes> @@ -3297,11 +3245,11 @@ date of your secret's recovery data.</property> <child> <object class="GtkBox" id="recovery_secret_name_hbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Secret name:</property> <attributes> <attribute name="weight" value="bold"/> @@ -3317,7 +3265,7 @@ date of your secret's recovery data.</property> <child> <object class="GtkLabel" id="recovery_secret_name_value_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">DYNAMICALLY GENERATED</property> </object> <packing> @@ -3337,15 +3285,15 @@ date of your secret's recovery data.</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="anastasis_gtk_secret_value_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">The secret is shown here. You can also copy it to the clipboard or save it to a file.</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">The secret is shown here. You can also copy it to the clipboard or save it to a file.</property> <property name="label">THE SECRET TEXT</property> <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> + <property name="wrap-mode">word-char</property> <property name="ellipsize">end</property> </object> <packing> @@ -3359,12 +3307,12 @@ date of your secret's recovery data.</property> <object class="GtkButton" id="anastasis_gtk_secret_copy_button"> <property name="label">gtk-copy</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Copy secret to clipboard</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Copy secret to clipboard</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_secret_copy_button_clicked_cb" swapped="no"/> </object> <packing> @@ -3378,11 +3326,11 @@ date of your secret's recovery data.</property> <object class="GtkButton" id="anastasis_gtk_secret_save_as_button"> <property name="label">gtk-save-as</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Save secret to file</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Save secret to file</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_secret_save_as_button_clicked_cb" swapped="no"/> </object> <packing> @@ -3403,21 +3351,21 @@ date of your secret's recovery data.</property> <child> <object class="GtkViewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> <object class="GtkImage" id="anastasis_gtk_secret_qr_image"> - <property name="width_request">400</property> - <property name="height_request">400</property> + <property name="width-request">400</property> + <property name="height-request">400</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_left">10</property> - <property name="margin_right">10</property> - <property name="margin_start">10</property> - <property name="margin_end">10</property> - <property name="margin_top">10</property> - <property name="margin_bottom">10</property> + <property name="can-focus">False</property> + <property name="margin-left">10</property> + <property name="margin-right">10</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="stock">gtk-missing-image</property> @@ -3448,11 +3396,11 @@ date of your secret's recovery data.</property> <child type="label"> <object class="GtkLabel" id="anastasis_gtk_backup_success_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">10</property> - <property name="margin_end">10</property> - <property name="margin_top">10</property> - <property name="margin_bottom">10</property> + <property name="can-focus">False</property> + <property name="margin-start">10</property> + <property name="margin-end">10</property> + <property name="margin-top">10</property> + <property name="margin-bottom">10</property> <property name="label" translatable="yes">Success!</property> <attributes> <attribute name="weight" value="bold"/> @@ -3469,36 +3417,36 @@ date of your secret's recovery data.</property> </child> <child> <object class="GtkFrame" id="anastasis_gtk_select_secret_frame"> - <property name="can_focus">False</property> - <property name="label_xalign">0</property> - <property name="shadow_type">none</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> + <property name="can-focus">False</property> + <property name="left-padding">12</property> <child> <object class="GtkBox" id="anastasis_gtk_secret_select_vbox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">10</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkLabel" id="select_secret_hint_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Select a secret to recover from the list below. If no secrets are listed, -you need to either go back and correct your personal information or + <property name="label" translatable="yes">Select a secret to recover from the list below. If no secrets are listed, +you need to either go back and correct your personal information or explicitly add the provider which you used before for the backup.</property> </object> <packing> @@ -3512,8 +3460,8 @@ explicitly add the provider which you used before for the backup.</property> <object class="GtkButton" id="anastasis_gtk_add_provider_button"> <property name="label" translatable="yes">Add provider</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="image">add_image</property> <signal name="clicked" handler="anastasis_gtk_add_provider_button_clicked_cb" swapped="no"/> </object> @@ -3535,20 +3483,20 @@ explicitly add the provider which you used before for the backup.</property> <child> <object class="GtkScrolledWindow" id="anastasis_secret_selection_scrolled_window"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hadjustment">secret_selection_h_adjustment</property> <property name="vadjustment">secret_selection_v_adjustment</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkViewport" id="anastasis_secret_selection_viewport"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="hadjustment">secret_selection_h_adjustment</property> <property name="vadjustment">secret_selection_v_adjustment</property> <child> <object class="GtkTreeView" id="anastasis_secret_selection_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hadjustment">secret_selection_h_adjustment</property> <property name="vadjustment">secret_selection_v_adjustment</property> <property name="model">secret_selection_liststore</property> @@ -3563,8 +3511,8 @@ explicitly add the provider which you used before for the backup.</property> <property name="sizing">autosize</property> <property name="title" translatable="yes">Secret name</property> <property name="clickable">True</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">3</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">3</property> <child> <object class="GtkCellRendererText" id="backup_name_renderer"/> <attributes> @@ -3578,8 +3526,8 @@ explicitly add the provider which you used before for the backup.</property> <property name="sizing">fixed</property> <property name="title" translatable="yes">Backup time</property> <property name="clickable">True</property> - <property name="sort_indicator">True</property> - <property name="sort_column_id">5</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">5</property> <child> <object class="GtkCellRendererText" id="backup_time_renderer"/> <attributes> @@ -3593,9 +3541,9 @@ explicitly add the provider which you used before for the backup.</property> <property name="visible">False</property> <property name="title" translatable="yes">Version</property> <property name="clickable">True</property> - <property name="sort_indicator">True</property> - <property name="sort_order">descending</property> - <property name="sort_column_id">1</property> + <property name="sort-indicator">True</property> + <property name="sort-order">descending</property> + <property name="sort-column-id">1</property> <child> <object class="GtkCellRendererText" id="backup_version_renderer"> <property name="visible">False</property> @@ -3647,7 +3595,7 @@ explicitly add the provider which you used before for the backup.</property> <child type="label"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Select secret to recover</property> <attributes> <attribute name="weight" value="bold"/> @@ -3688,16 +3636,16 @@ explicitly add the provider which you used before for the backup.</property> </child> <child> <object class="GtkBox" id="anastasis_gtk_main_control_vbox"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton" id="anastasis_gtk_main_window_prev_button"> <property name="label">gtk-go-back</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_main_window_back_clicked" swapped="no"/> </object> <packing> @@ -3710,12 +3658,12 @@ explicitly add the provider which you used before for the backup.</property> <child> <object class="GtkButton" id="anastasis_gtk_restart_button"> <property name="label" translatable="yes">_Restart</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Go back to the beginning.</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Go back to the beginning.</property> <property name="image">restart_image</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> + <property name="use-underline">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_restart_button_clicked_cb" swapped="no"/> </object> <packing> @@ -3727,7 +3675,7 @@ explicitly add the provider which you used before for the backup.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">True</property> @@ -3739,11 +3687,11 @@ explicitly add the provider which you used before for the backup.</property> <child> <object class="GtkButton" id="anastasis_gtk_main_window_quit_button"> <property name="label">gtk-quit</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_main_window_quit_button_clicked_cb" swapped="no"/> </object> <packing> @@ -3756,7 +3704,7 @@ explicitly add the provider which you used before for the backup.</property> <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">True</property> @@ -3770,12 +3718,12 @@ explicitly add the provider which you used before for the backup.</property> <property name="label">gtk-media-next</property> <property name="visible">True</property> <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <property name="always_show_image">True</property> + <property name="can-focus">False</property> + <property name="can-default">True</property> + <property name="has-default">True</property> + <property name="receives-default">True</property> + <property name="use-stock">True</property> + <property name="always-show-image">True</property> <signal name="clicked" handler="anastasis_gtk_main_window_forward_clicked" swapped="no"/> </object> <packing> @@ -3795,7 +3743,7 @@ explicitly add the provider which you used before for the backup.</property> <child> <object class="GtkStatusbar" id="anastasis_gtk_statusbar"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <property name="spacing">8</property> </object> diff --git a/debian/changelog b/debian/changelog index 8f77dc6..0da600b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +anastasis-gtk (0.2.99-3) unstable; urgency=low + + * Close to Anastasis 0.3.0, but testing package details. + + -- Christian Grothoff <grothoff@gnu.org> Mon, 20 Jun 2022 14:02:10 +0100 + anastasis-gtk (0.2.99-1) unstable; urgency=low * Close to anastasis-gtk 0.3.0, but a preview release for UX testing. diff --git a/debian/control b/debian/control index 9caa1ed..ae4a78b 100644 --- a/debian/control +++ b/debian/control @@ -5,8 +5,9 @@ Maintainer: Bertrand Marc <bmarc@debian.org> Build-Depends: autopoint, debhelper-compat (= 12), - libgnunetgtk-dev (>= 0.15.0), - libanastasis-dev (>= 0.1.0), + libgnunetgtk-dev (>= 0.17.0), + libgnunet-dev (>= 0.17.1), + libanastasis-dev (>= 0.2.99), libgladeui-dev (>=3.10.0), libgtk-3-dev (>=3.22.0), libmagic-dev, diff --git a/debian/rules b/debian/rules index 94830cc..ffaefe6 100755 --- a/debian/rules +++ b/debian/rules @@ -5,6 +5,9 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) %: dh ${@} +override_dh_builddeb: + dh_builddeb -- -Zgzip + override_dh_auto_configure: dh_auto_configure -- --disable-rpath diff --git a/po/POTFILES.in b/po/POTFILES.in index ad695fb..63d6223 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -17,7 +17,6 @@ src/anastasis/anastasis-gtk_handle-core-secret-changed.c src/anastasis/anastasis-gtk_handle-core-secret-name-changed.c src/anastasis/anastasis-gtk_handle-country-activated.c src/anastasis/anastasis-gtk_handle-country-unselected.c -src/anastasis/anastasis-gtk_handle-currency-changed.c src/anastasis/anastasis-gtk_handle-expiration-change.c src/anastasis/anastasis-gtk_handle-identity-changed.c src/anastasis/anastasis-gtk_handle-main-window-back-clicked.c diff --git a/src/anastasis/Makefile.am b/src/anastasis/Makefile.am index 0d658f4..5497721 100644 --- a/src/anastasis/Makefile.am +++ b/src/anastasis/Makefile.am @@ -29,7 +29,6 @@ anastasis_gtk_SOURCES = \ anastasis-gtk_handle-continent-selected.c \ anastasis-gtk_handle-country-activated.c \ anastasis-gtk_handle-country-unselected.c \ - anastasis-gtk_handle-currency-changed.c \ anastasis-gtk_handle-core-secret-changed.c \ anastasis-gtk_handle-core-secret-name-changed.c \ anastasis-gtk_handle-expiration-change.c \ diff --git a/src/anastasis/anastasis-gtk_action.c b/src/anastasis/anastasis-gtk_action.c index c13885a..a30f60d 100644 --- a/src/anastasis/anastasis-gtk_action.c +++ b/src/anastasis/anastasis-gtk_action.c @@ -132,12 +132,9 @@ action_continent_selecting (void) continent) { const char *name; - const char *name_i18n; struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_string ("name", &name), - TALER_JSON_spec_i18n_str ("name", - &name_i18n), GNUNET_JSON_spec_end () }; @@ -157,7 +154,8 @@ action_continent_selecting (void) AG_CMC_CONTINENT_NAME, name, AG_CMC_CONTINENT_NAME_I18N, - name_i18n, + dgettext ("anastasis", + name), -1); GNUNET_JSON_parse_free (spec); } @@ -217,8 +215,8 @@ action_country_selecting (void) struct GNUNET_JSON_Specification spec[] = { GNUNET_JSON_spec_string ("code", &code), - TALER_JSON_spec_i18n_str ("name", - &name), + GNUNET_JSON_spec_string ("name", + &name), GNUNET_JSON_spec_end () }; @@ -237,7 +235,8 @@ action_country_selecting (void) &iter, -1, AG_CCMC_COUNTRY_NAME, - name, + dgettext ("anastasis", + name), AG_CCMC_COUNTRY_CODE, code, -1); @@ -537,8 +536,8 @@ action_user_attributes_collecting (void) GNUNET_JSON_spec_string ("name", &attr_name), GNUNET_JSON_spec_mark_optional ( - TALER_JSON_spec_i18n_str ("label", - &attr_label), + GNUNET_JSON_spec_string ("label", + &attr_label), NULL), GNUNET_JSON_spec_end () }; @@ -571,9 +570,11 @@ action_user_attributes_collecting (void) if (optional) GNUNET_asprintf (&l, _ ("%s (optional)"), - attr_label); + dgettext ("anastasis", + attr_label)); else - l = GNUNET_strdup (attr_label); + l = GNUNET_strdup (dgettext ("anastasis", + attr_label)); if ( (NULL != widget_name) && (NULL != w) ) { @@ -700,6 +701,107 @@ activate_by_method (json_t *methods) } +/** + * Function called with the results of #ANASTASIS_redux_action on "poll_providers". + * + * @param cls NULL + * @param error_code Error code + * @param response new state as result or config information of a provider + */ +static void +long_poll_providers_action_cb (void *cls, + enum TALER_ErrorCode error_code, + json_t *response); + + +/** + * Schedules the specified action. + * + * @param cls NULL + */ +static void +long_poll_providers_task (void *cls) +{ + struct ANASTASIS_LongAction *la = &AG_lacs[ANASTASIS_LP_POLL_PROVIDERS]; + json_t *tspec; + + (void) cls; + la->task = NULL; + if (GNUNET_TIME_absolute_is_future (la->next_time)) + { + la->task = GNUNET_SCHEDULER_add_at (la->next_time, + &long_poll_providers_task, + NULL); + return; + } + la->next_time = GNUNET_TIME_relative_to_absolute (LP_TIMEOUT); + tspec = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_time_rel ("timeout", + LP_TIMEOUT)); + GNUNET_log (GNUNET_ERROR_TYPE_INFO, + "Starting long polling task for provider configurations\n"); + la->ra = ANASTASIS_redux_action (AG_redux_state, + "poll_providers", + tspec, + &long_poll_providers_action_cb, + NULL); + json_decref (tspec); +} + + +/** + * Check if all providers we care about are ready, + * and if not try to long poll them. + * + * @return false if we have no providers at all + */ +static bool +sync_providers (void) +{ + struct ANASTASIS_LongAction *la = &AG_lacs[ANASTASIS_LP_POLL_PROVIDERS]; + json_t *ap; + const char *url; + json_t *obj; + bool ready = false; + bool poll = false; + + ap = json_object_get (AG_redux_state, + "authentication_providers"); + json_object_foreach (ap, url, obj) + { + struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; + enum GNUNET_GenericReturnValue ret; + + ret = ANASTASIS_reducer_lookup_salt (AG_redux_state, + url, + &provider_salt); + switch (ret) + { + case GNUNET_OK: + ready = true; + break; + case GNUNET_NO: + poll = true; + break; + case GNUNET_SYSERR: + GNUNET_break (0); + break; + } + } + if (poll) + { + la->next_time = GNUNET_TIME_UNIT_ZERO_ABS; + la->task = GNUNET_SCHEDULER_add_now (&long_poll_providers_task, + NULL); + } + return ready || poll; +} + + +/** + * Allow the user to configure authorization methods from + * the set of methods offered by known providers. + */ static void action_authentications_editing (void) { @@ -708,6 +810,7 @@ action_authentications_editing (void) AG_hide_all_frames (); AG_insensitive_children ("anastasis_gtk_auth_button_grid"); + (void) sync_providers (); aps = json_object_get (AG_redux_state, "authentication_providers"); { @@ -764,7 +867,7 @@ action_authentications_editing (void) activate_by_method (methods); break; default: - GNUNET_log (GNUNET_ERROR_TYPE_WARNING, + GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Status of provider `%s' is %u/%u\n", provider_url, (unsigned int) ec, @@ -1673,7 +1776,7 @@ find_challenge_by_uuid (const char *uuid) rd = json_object_get (AG_redux_state, "recovery_document"); cs = json_object_get (rd, - "cs"); + "challenges"); json_array_foreach (cs, index, c) { const char *u; @@ -1809,6 +1912,7 @@ show_challenge_feedback (const char *uuid, * present in the state that was used to locate this version * @param server_time when did the provider receive the upload * @param secret_name name the user assigned to the backup + * @param providers json array of providers offering this policy */ static void expand_policy_list (void *cls, @@ -1817,14 +1921,15 @@ expand_policy_list (void *cls, uint32_t version, json_int_t attribute_mask, struct GNUNET_TIME_Timestamp server_time, - const char *secret_name) + const char *secret_name, + const json_t *providers) { GtkListStore *ls = cls; GtkTreeIter iter; - bool first; + bool have_first; - first = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ls), - &iter); + have_first = gtk_tree_model_get_iter_first (GTK_TREE_MODEL (ls), + &iter); gtk_list_store_insert_with_values ( ls, &iter, @@ -1835,8 +1940,9 @@ expand_policy_list (void *cls, AG_SSMC_SECRET_NAME, secret_name, AG_SSMC_POLICY_DATE_STRING, GNUNET_TIME_timestamp2s (server_time), AG_SSMC_POLICY_DATE_NUMERIC, (guint64) server_time.abs_time.abs_value_us, + AG_SSMC_POLICY_PROVIDER_JSON, (gpointer) providers, -1); - if (first) + if (! have_first) { GtkTreeSelection *selection; @@ -2003,54 +2109,6 @@ long_poll_sync_action_cb (void *cls, /** - * Function called with the results of #ANASTASIS_redux_action on "poll_providers". - * - * @param cls NULL - * @param error_code Error code - * @param response new state as result or config information of a provider - */ -static void -long_poll_providers_action_cb (void *cls, - enum TALER_ErrorCode error_code, - json_t *response); - - -/** - * Schedules the specified action. - * - * @param cls NULL - */ -static void -long_poll_providers_task (void *cls) -{ - struct ANASTASIS_LongAction *la = &AG_lacs[ANASTASIS_LP_POLL_PROVIDERS]; - json_t *tspec; - - (void) cls; - la->task = NULL; - if (GNUNET_TIME_absolute_is_future (la->next_time)) - { - la->task = GNUNET_SCHEDULER_add_at (la->next_time, - &long_poll_providers_task, - NULL); - return; - } - la->next_time = GNUNET_TIME_relative_to_absolute (LP_TIMEOUT); - tspec = GNUNET_JSON_PACK ( - GNUNET_JSON_pack_time_rel ("timeout", - LP_TIMEOUT)); - GNUNET_log (GNUNET_ERROR_TYPE_INFO, - "Starting long polling task for provider configurations\n"); - la->ra = ANASTASIS_redux_action (AG_redux_state, - "poll_providers", - tspec, - &long_poll_providers_action_cb, - NULL); - json_decref (tspec); -} - - -/** * Start policy discovery process. Triggers download(s) * of the various provider configurations and (once we * have any) starts the policy discovery process. @@ -2084,11 +2142,27 @@ long_poll_providers_action_cb (void *cls, NULL); return; } - GNUNET_assert (NULL != AG_pd); - /* Find out which provider is new, merge that one! */ ap = json_object_get (response, "authentication_providers"); GNUNET_assert (NULL != ap); + if (NULL == AG_pd) + { + json_t *ns; + + /* Simply merge the state */ + ap = json_object_get (response, + "authentication_providers"); + ns = json_incref (AG_redux_state); + json_object_set (ns, + "authentication_providers", + ap); + AG_action_cb (NULL, + TALER_EC_NONE, + ns); + json_decref (ns); + return; + } + /* Find out which provider is new, merge that one! */ json_object_foreach (ap, url, obj) { struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; @@ -2116,55 +2190,21 @@ long_poll_providers_action_cb (void *cls, static void begin_discovery (void) { - struct ANASTASIS_LongAction *la = &AG_lacs[ANASTASIS_LP_POLL_PROVIDERS]; GtkListStore *ls; - json_t *ap; - const char *url; - json_t *obj; - bool ready = false; - bool poll = false; + bool have_providers; ls = GTK_LIST_STORE (GCG_get_main_window_object ( "secret_selection_liststore")); GNUNET_assert (NULL != ls); if (NULL == AG_pd) gtk_list_store_clear (ls); - ap = json_object_get (AG_redux_state, - "authentication_providers"); - json_object_foreach (ap, url, obj) - { - struct ANASTASIS_CRYPTO_ProviderSaltP provider_salt; - enum GNUNET_GenericReturnValue ret; - - ret = ANASTASIS_reducer_lookup_salt (AG_redux_state, - url, - &provider_salt); - switch (ret) - { - case GNUNET_OK: - ready = true; - break; - case GNUNET_NO: - poll = true; - break; - case GNUNET_SYSERR: - GNUNET_break (0); - break; - } - } - if (poll) - { - la->next_time = GNUNET_TIME_UNIT_ZERO_ABS; - la->task = GNUNET_SCHEDULER_add_now (&long_poll_providers_task, - NULL); - } + have_providers = sync_providers (); if (NULL == AG_pd) AG_pd = ANASTASIS_policy_discovery_start (AG_redux_state, NULL, &expand_policy_list, ls); - if ( (! ready) && - (! poll) ) + if (! have_providers) { AG_error (_ ("No available providers! Try to add one!")); } @@ -2296,7 +2336,7 @@ add_challenge (GtkBox *challenge_box, json_t *challenge; challenges = json_object_get (rd, - "cs"); + "challenges"); /* TODO: change data structure to have 'uuid' as the index into the 'challenges' object, instead of this 'challenges' being an array */ @@ -2468,7 +2508,8 @@ add_policy (GtkBox *policy_box, "Failed to process challenge #%u of policy #%u", (unsigned int) (1 + index), (unsigned int) (1 + pindex)); - AG_error (txt); + AG_error ("%s", + txt); GNUNET_free (txt); return false; } @@ -2525,7 +2566,7 @@ action_challenge_selecting (void) rd = json_object_get (AG_redux_state, "recovery_document"); policies = json_object_get (rd, - "dps"); + "decryption_policies"); GNUNET_assert (NULL != policies); policy_box = GTK_BOX (GCG_get_main_window_object ( "anastasis_gtk_policy_vbox")); @@ -2574,7 +2615,7 @@ action_challenge_selecting (void) "recovery_document"); GNUNET_assert (NULL != rd); challenges = json_object_get (rd, - "cs"); + "challenges"); GNUNET_assert (NULL != challenges); json_array_foreach (challenges, index, challenge) { @@ -2885,9 +2926,6 @@ render_feedback (GtkBuilder *builder, hide = true; type = "Hint"; break; - case TALER_EC_ANASTASIS_TRUTH_CHALLENGE_ACTIVE: - type = "Hint"; - break; default: break; } diff --git a/src/anastasis/anastasis-gtk_attributes.c b/src/anastasis/anastasis-gtk_attributes.c index 7aa9571..4222a2b 100644 --- a/src/anastasis/anastasis-gtk_attributes.c +++ b/src/anastasis/anastasis-gtk_attributes.c @@ -56,8 +56,6 @@ extract_cal (GtkWidget *cal) &year, &month, &day); - if (! (day && month && day)) - return NULL; GNUNET_snprintf (txt, sizeof (txt), "%04u-%02u-%02u", diff --git a/src/anastasis/anastasis-gtk_handle-add-provider.c b/src/anastasis/anastasis-gtk_handle-add-provider.c index 37413d9..74cc09d 100644 --- a/src/anastasis/anastasis-gtk_handle-add-provider.c +++ b/src/anastasis/anastasis-gtk_handle-add-provider.c @@ -107,10 +107,12 @@ config_cb (void *cls, &acfg->truth_upload_fee), TALER_JSON_pack_amount ("liability_limit", &acfg->liability_limit), - GNUNET_JSON_pack_string ("currency", - acfg->currency), GNUNET_JSON_pack_string ("business_name", acfg->business_name), + GNUNET_JSON_pack_string ("status", + "enabled"), + GNUNET_JSON_pack_uint64 ("http_status", + MHD_HTTP_OK), GNUNET_JSON_pack_uint64 ("storage_limit_in_megabytes", acfg->storage_limit_in_megabytes), GNUNET_JSON_pack_data_auto ("provider_salt", @@ -183,6 +185,7 @@ add_provider_dialog_response_cb (GtkDialog *dialog, GtkBuilder *builder = GTK_BUILDER (user_data); GtkEntry *entry; const char *url; + json_t *ap; if (NULL != co) { @@ -197,16 +200,31 @@ add_provider_dialog_response_cb (GtkDialog *dialog, pstate = NULL; return; } + if (NULL == pstate) + { + GNUNET_break (0); + return; + } + ap = json_object_get (AG_redux_state, + "authentication_providers"); + if (NULL == ap) + { + GNUNET_break (0); + return; + } entry = GTK_ENTRY (gtk_builder_get_object (builder, "url_entry")); url = gtk_entry_get_text (entry); ANASTASIS_policy_discovery_more (AG_pd, url, pstate); + GNUNET_break (0 == + json_object_set_new (ap, + url, + pstate)); + pstate = NULL; gtk_widget_destroy (GTK_WIDGET (dialog)); g_object_unref (G_OBJECT (builder)); - json_decref (pstate); - pstate = NULL; } diff --git a/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c b/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c index 091b1fb..3e55413 100644 --- a/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c +++ b/src/anastasis/anastasis-gtk_handle-auth-edit-provider-clicked.c @@ -326,7 +326,11 @@ url_add_button_clicked_cb (GtkButton *button, /** - * FIXME. + * The user changed the URL of a provider to be possibly added. + * Validate the syntax and if it is a valid URL, enable the button. + * + * @param entry the edited widget + * @param user_data the dialog builder */ void url_entry_changed_cb (GtkEntry *entry, diff --git a/src/anastasis/anastasis-gtk_handle-country-activated.c b/src/anastasis/anastasis-gtk_handle-country-activated.c index 2c80b61..afb65f3 100644 --- a/src/anastasis/anastasis-gtk_handle-country-activated.c +++ b/src/anastasis/anastasis-gtk_handle-country-activated.c @@ -41,11 +41,8 @@ void anastasis_gtk_country_selection_changed_cb (GtkTreeSelection *treeselection, gpointer user_data) { - GtkTreeSelection *currency_selection; - GtkTreeModel *currency_model; GtkTreeModel *model; GtkTreeIter iter; - char *scode; (void) user_data; if (! gtk_tree_selection_get_selected (treeselection, @@ -56,61 +53,4 @@ anastasis_gtk_country_selection_changed_cb (GtkTreeSelection *treeselection, return; } AG_enable_next (); - gtk_tree_model_get (model, - &iter, - AG_CCMC_COUNTRY_CODE, - &scode, - -1); - /* select all currencies matching current country */ - currency_selection = GTK_TREE_SELECTION ( - GCG_get_main_window_object ("anastasis_gtk_currency_selection")); - gtk_tree_selection_unselect_all (currency_selection); - currency_model = GTK_TREE_MODEL ( - GCG_get_main_window_object ("currency_liststore")); - { - json_t *countries; - json_t *country; - size_t index; - - countries = json_object_get (AG_redux_state, - "countries"); - json_array_foreach (countries, index, country) - { - const char *code; - const char *currency; - - code = json_string_value (json_object_get (country, - "code")); - GNUNET_assert (NULL != code); - if (0 != strcmp (code, - scode)) - continue; - currency = json_string_value (json_object_get (country, - "currency")); - GNUNET_assert (NULL != currency); - { - GtkTreeIter citer; - char *pcur; - - if (gtk_tree_model_get_iter_first (currency_model, - &citer)) - do { - gtk_tree_model_get (currency_model, - &citer, - AG_CMC_CURRENCY_NAME, - &pcur, - -1); - if (0 == strcasecmp (pcur, - currency)) - { - gtk_tree_selection_select_iter (currency_selection, - &citer); - } - g_free (pcur); - } while (gtk_tree_model_iter_next (currency_model, - &citer)); - } - } - } - g_free (scode); } diff --git a/src/anastasis/anastasis-gtk_handle-currency-changed.c b/src/anastasis/anastasis-gtk_handle-currency-changed.c deleted file mode 100644 index ba38b6f..0000000 --- a/src/anastasis/anastasis-gtk_handle-currency-changed.c +++ /dev/null @@ -1,78 +0,0 @@ -/* - This file is part of anastasis-gtk. - Copyright (C) 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_handle-country-activated.c - * @brief - * @author Christian Grothoff - * @author Dennis Neufeld - */ -#include <gnunet/platform.h> -#include <gnunet/gnunet_util_lib.h> -#include "anastasis-gtk_helper.h" -#include "anastasis-gtk_action.h" -#include "anastasis-gtk_handle-main-window-forward-clicked.h" -#include <jansson.h> - - -/** - * Function called on each selected item. - * Sets @a data to true if called. - * - * @param model unused - * @param path unused - * @param iter unused - * @param[out] data pointer to a `bool` to set to true - */ -static void -select_cb (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) -{ - bool *ptr = data; - - (void) model; - (void) path; - (void) iter; - *ptr = true; -} - - -/** - * Callback invoked if the currency selection changed. - * - * @param treeselection selection object - * @param user_data NULL - */ -void -anastasis_gtk_currency_selection_changed_cb (GtkTreeSelection *treeselection, - gpointer user_data) -{ - bool have_sel = false; - - (void) user_data; - gtk_tree_selection_selected_foreach (treeselection, - &select_cb, - &have_sel); - if (have_sel) - AG_enable_next (); - else - AG_insensitive ("anastasis_gtk_main_window_forward_button"); -} diff --git a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c index 4c4eab9..a4b6a64 100644 --- a/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c +++ b/src/anastasis/anastasis-gtk_handle-main-window-forward-clicked.c @@ -36,39 +36,8 @@ /** - * Function called on each selected currency. Appends - * the currency to the JSON array. - * - * @param model the model of the currencies - * @param path a path (unused) - * @param iter selected currency position - * @param data a `json *` with the JSON array to expand - */ -static void -append_currency (GtkTreeModel *model, - GtkTreePath *path, - GtkTreeIter *iter, - gpointer data) -{ - json_t *currencies = data; - gchar *currency; - - (void) path; - gtk_tree_model_get (model, - iter, - AG_CMC_CURRENCY_NAME, - ¤cy, - -1); - GNUNET_break (0 == - json_array_append_new (currencies, - json_string (currency))); - g_free (currency); -} - - -/** * The user selected the 'forward' button. Move on with the - * country and currency selection. + * country selection. */ static void forward_country_selecting (void) @@ -80,7 +49,6 @@ forward_country_selecting (void) gchar *country_name; gchar *country_code; json_t *arguments; - json_t *currencies; tv = GTK_TREE_VIEW (GCG_get_main_window_object ( "anastasis_gtk_country_treeview")); @@ -92,13 +60,6 @@ forward_country_selecting (void) GNUNET_break (0); return; } - currencies = json_array (); - GNUNET_assert (NULL != currencies); - gtk_tree_selection_selected_foreach ( - GTK_TREE_SELECTION ( - GCG_get_main_window_object ("anastasis_gtk_currency_selection")), - &append_currency, - currencies); gtk_tree_model_get (model, &iter, AG_CCMC_COUNTRY_NAME, &country_name, @@ -108,9 +69,7 @@ forward_country_selecting (void) GNUNET_JSON_pack_string ("country", country_name), GNUNET_JSON_pack_string ("country_code", - country_code), - GNUNET_JSON_pack_array_steal ("currencies", - currencies)); + country_code)); g_free (country_name); g_free (country_code); AG_freeze (); @@ -449,13 +408,9 @@ forward_secret_selecting (void) gchar *secret_name; gint version; gint mask; + const json_t *providers; AG_freeze (); - if (NULL != AG_pd) - { - ANASTASIS_policy_discovery_stop (AG_pd); - AG_pd = NULL; - } AG_stop_long_action (); selection = GTK_TREE_SELECTION ( GCG_get_main_window_object ( @@ -475,41 +430,26 @@ forward_secret_selecting (void) AG_SSMC_POLICY_VERSION, &version, AG_SSMC_ATTRIBUTE_MASK, &mask, AG_SSMC_SECRET_NAME, &secret_name, + AG_SSMC_POLICY_PROVIDER_JSON, &providers, -1); - { - json_t *providers; - - providers = json_array (); - /* FIXME #7221: should build array with _all_ providers - that provide the same policy here, instead of - just picking one of them... - => requires change in tree model or different - lookup. */ - GNUNET_assert (NULL != providers); - GNUNET_assert ( - 0 == - json_array_append ( - providers, - GNUNET_JSON_PACK ( - GNUNET_JSON_pack_string ("url", - provider_url), - GNUNET_JSON_pack_uint64 ("version", - version)))); - args = GNUNET_JSON_PACK ( - GNUNET_JSON_pack_array_steal ("providers", - providers), - GNUNET_JSON_pack_uint64 ("attribute_mask", - mask), - GNUNET_JSON_pack_string ("secret_name", - secret_name) - ); - } + args = GNUNET_JSON_PACK ( + GNUNET_JSON_pack_array_incref ("providers", + (json_t *) providers), + GNUNET_JSON_pack_uint64 ("attribute_mask", + mask), + GNUNET_JSON_pack_string ("secret_name", + secret_name)); GNUNET_log (GNUNET_ERROR_TYPE_INFO, "Proceeding with policy version %u at provider %s\n", (unsigned int) version, provider_url); g_free (provider_url); g_free (secret_name); + if (NULL != AG_pd) + { + ANASTASIS_policy_discovery_stop (AG_pd); + AG_pd = NULL; + } AG_ra = ANASTASIS_redux_action (AG_redux_state, "select_version", args, diff --git a/src/anastasis/anastasis-gtk_handle-policy-activate.c b/src/anastasis/anastasis-gtk_handle-policy-activate.c index ddb89ec..006dea1 100644 --- a/src/anastasis/anastasis-gtk_handle-policy-activate.c +++ b/src/anastasis/anastasis-gtk_handle-policy-activate.c @@ -33,10 +33,10 @@ void anastasis_gtk_review_policy_treeview_row_activated_cb ( - GtkTreeView *tree_view, - GtkTreePath *path, - GtkTreeViewColumn *column, - gpointer user_data) + GtkTreeView *tree_view, + GtkTreePath *path, + GtkTreeViewColumn *column, + gpointer user_data) { GtkTreeModel *tm = gtk_tree_view_get_model (tree_view); GtkTreeIter iter; @@ -52,7 +52,6 @@ anastasis_gtk_review_policy_treeview_row_activated_cb ( GNUNET_break (0); return; } - gtk_tree_path_free (path); gtk_tree_model_get (tm, &iter, AG_PRMC_POLICY_INDEX, diff --git a/src/anastasis/anastasis-gtk_handle-print.c b/src/anastasis/anastasis-gtk_handle-print.c index 6702dfc..c235ce2 100644 --- a/src/anastasis/anastasis-gtk_handle-print.c +++ b/src/anastasis/anastasis-gtk_handle-print.c @@ -87,8 +87,8 @@ print_to_file (GtkWindow *parent_window, { const char *tkey; struct GNUNET_JSON_Specification spec[] = { - TALER_JSON_spec_i18n_str ("label", - &tkey), + GNUNET_JSON_spec_string ("label", + &tkey), GNUNET_JSON_spec_end () }; @@ -103,7 +103,8 @@ print_to_file (GtkWindow *parent_window, found = true; GNUNET_break (0 == json_object_set (uattrs, - tkey, + dgettext ("anastasis", + tkey), av)); } } diff --git a/src/anastasis/anastasis-gtk_helper.h b/src/anastasis/anastasis-gtk_helper.h index b19e6dd..48972a2 100644 --- a/src/anastasis/anastasis-gtk_helper.h +++ b/src/anastasis/anastasis-gtk_helper.h @@ -90,7 +90,12 @@ enum AG_SecretSelectionModelColumns /** * A guint64. */ - AG_SSMC_POLICY_DATE_NUMERIC = 5 + AG_SSMC_POLICY_DATE_NUMERIC = 5, + + /** + * A gpointer. + */ + AG_SSMC_POLICY_PROVIDER_JSON = 6 }; diff --git a/src/anastasis/anastasis-gtk_pe-edit-policy.c b/src/anastasis/anastasis-gtk_pe-edit-policy.c index 6803cc2..2647680 100644 --- a/src/anastasis/anastasis-gtk_pe-edit-policy.c +++ b/src/anastasis/anastasis-gtk_pe-edit-policy.c @@ -277,7 +277,16 @@ ap_matches (const char *type, json_t *methods; size_t index; json_t *method; + const char *status; + status = json_string_value (json_object_get (ap, + "status")); + if (0 != strcasecmp (status, + "ok")) + { + /* provider is down, cannot proceed */ + return false; + } methods = json_object_get (ap, "methods"); GNUNET_break (NULL != methods); diff --git a/src/testing/test_prepare.sh b/src/testing/test_prepare.sh index 2c9191c..202342d 100755 --- a/src/testing/test_prepare.sh +++ b/src/testing/test_prepare.sh @@ -22,6 +22,7 @@ function cleanup() { for n in `jobs -p` do + kill -SIGCONT $n # in case one provider was suspended kill $n 2> /dev/null || true done rm -rf $CONF $CONF_4 $WALLET_DB $R1FILE $R2FILE $B1FILE $B2FILE $TMP_DIR @@ -394,10 +395,17 @@ echo -n "Launching anastasis services ..." # PREFIX="valgrind --log-file=anastasis-httpd.%p.log" PREFIX="" $PREFIX anastasis-httpd -L INFO -c $CONF_1 2> anastasis-httpd_1.log & +PPID_1=$! $PREFIX anastasis-httpd -L INFO -c $CONF_2 2> anastasis-httpd_2.log & +PPID_2=$! $PREFIX anastasis-httpd -L INFO -c $CONF_3 2> anastasis-httpd_3.log & +PPID_3=$! $PREFIX anastasis-httpd -L INFO -c $CONF_4 2> anastasis-httpd_4.log & - +PPID_4=$! +export PPID_1 +export PPID_2 +export PPID_3 +export PPID_4 if test $1 = 'fees' then @@ -548,6 +556,8 @@ then export WALLET_DB fi +echo '- use kill -SIGSTOP $PPID_$NUM ($NUM: 1-4) to suspend providers' + bash exit 0 |