diff --git a/source/ubl-settings-update.c b/source/ubl-settings-update.c index 4596e73..82b0e8a 100644 --- a/source/ubl-settings-update.c +++ b/source/ubl-settings-update.c @@ -4,9 +4,34 @@ config main_config; //functions +void on_save_done(main_window *, config_str output, int size){ + char *final_output = yon_char_parsed_to_string(output,size,""); + if (final_output){ + printf("%s\n",final_output); + free(final_output); + } + yon_char_parsed_free(output,size); + textdomain(template_ui_LocaleName); + switch (main_config.save_config){ + case 0: + yon_ubl_status_box_render(GLOBAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); + break; + case 1: + yon_ubl_status_box_render(LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); + break; + case 2: + yon_ubl_status_box_render(GLOBAL_LOCAL_SAVE_SUCCESS_LABEL,BACKGROUND_IMAGE_SUCCESS_TYPE); + break; + } + textdomain(LocaleName); + +} + void yon_save_interface(main_window *widgets){ if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widgets->AutoUpdateCheck))){ yon_config_register(AUTOUPDATE,AUTOUPDATE_command,"enable"); + } else { + yon_config_register(AUTOUPDATE,AUTOUPDATE_command,"disable"); } int save_mode = gtk_combo_box_get_active(GTK_COMBO_BOX(widgets->UpdateModeCombo)); switch (save_mode){ @@ -1491,6 +1516,7 @@ void yon_main_window_complete(main_window *widgets){ } yon_load_proceed(YON_CONFIG_LOCAL); yon_interface_update(widgets); + yon_save_window_set_postsave_function(on_save_done,widgets); } int main(int argc, char *argv[]){ diff --git a/source/ubl-settings-update.h b/source/ubl-settings-update.h index 2898d37..15b5f11 100644 --- a/source/ubl-settings-update.h +++ b/source/ubl-settings-update.h @@ -269,6 +269,8 @@ typedef struct { GtkWidget *AcceptButton; } documentation_confirmation_window; +void on_save_done(main_window *, config_str output, int size); + void yon_save_interface(main_window *widgets); void on_config_save(GtkWidget *self, main_window *widgets); void on_config_global_save(GtkWidget *self, main_window *widgets); diff --git a/ubl-settings-update.glade b/ubl-settings-update.glade index 16dc5a4..177bb1c 100644 --- a/ubl-settings-update.glade +++ b/ubl-settings-update.glade @@ -163,122 +163,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. document-edit-symbolic - - True - False - False - - - True - False - Load from global configuration - - - - - - True - False - Load from local configuration - - - - - - True - False - False - False - - - True - False - Documentation - True - - - - - - True - False - About - - - - - - True - False - False - - - True - False - Save to global and local documentation - - - - - - True - False - Save to global configuration - - - - - - True - False - Save to local configuration - - - - - - True - False - - - True - False - DD.MM.YYYY - True - - - - - True - False - DD-MM-YYYY - True - - - - - True - False - DD/MM/YYYY - True - - - True False @@ -304,66 +188,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 5 vertical 5 - - - True - False - end - 5 - - - True - False - Date of last automatic update: - - - False - True - 0 - - - - - True - False - - - False - True - 1 - - - - - True - True - False - True - menu4 - - - True - False - com.ublinux.libublsettingsui-gtk3.funnel-symbolic - - - - - - False - True - 2 - - - - - False - True - 0 - - True @@ -390,7 +214,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True False - end + start True @@ -399,6 +223,18 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. 1 + + + True + True + False + + + False + True + 2 + + False @@ -1387,6 +1223,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True True liststore1 + + + @@ -1409,6 +1248,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. True WebPublicationList both + + + True @@ -1813,4 +1655,176 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + + True + False + False + + + True + False + Load from global configuration + + + + + + True + False + Load from local configuration + + + + + + True + False + False + False + + + True + False + Documentation + True + + + + + + True + False + About + + + + + + True + False + False + + + True + False + Save to global and local documentation + + + + + + True + False + Save to global configuration + + + + + + True + False + Save to local configuration + + + + + + True + False + + + True + False + DD.MM.YYYY + True + True + + + + + True + False + DD-MM-YYYY + True + True + + + + + True + False + DD/MM/YYYY + True + True + + + + + True + False + end + 5 + + + True + False + Date of last automatic update: + + + False + True + 0 + + + + + True + False + + + False + True + 1 + + + + + True + True + False + True + menu4 + + + True + False + com.ublinux.libublsettingsui-gtk3.funnel-symbolic + + + + + + False + True + 2 + + + diff --git a/ubl-settings-update_ru.po b/ubl-settings-update_ru.po index feb7cca..2c6d470 100644 --- a/ubl-settings-update_ru.po +++ b/ubl-settings-update_ru.po @@ -424,7 +424,7 @@ msgstr "Подписи будут проверяться при их налич #: source/ubl-strings.h:106 msgid "Signatures will be required for all packages and databases" -msgstr "Подписи будут необходимы для всех nпакетов и баз данных" +msgstr "Подписи будут необходимы для всех пакетов и баз данных" #: source/ubl-strings.h:106 msgid "If the signature is verified for packages and the database, it must be in the keyring and be fully trusted"