From 9dc61d211b777c730bfd358bd62cea1e497f4e7e Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Wed, 27 Mar 2024 18:10:13 +0600 Subject: [PATCH 1/4] Changed tooltip column at saving window; Removed window config loading before registration --- libublsettingsui-gtk3-saving.glade | 2 +- source/libublsettingsui-gtk3.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libublsettingsui-gtk3-saving.glade b/libublsettingsui-gtk3-saving.glade index 1514e56..a8d5098 100644 --- a/libublsettingsui-gtk3-saving.glade +++ b/libublsettingsui-gtk3-saving.glade @@ -93,7 +93,7 @@ True liststore1 horizontal - 3 + 4 none diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index c16c2c4..063e202 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -698,7 +698,6 @@ template_main_window *yon_ubl_window_setup(){ if(template_config) yon_ubl_setup_sockets(widgets->PlugBox,widgets->LeftBox,widgets->RightBox,template_config->socket_id,template_config->load_socket_id,template_config->save_socket_id); yon_window_config_setup(GTK_WINDOW(widgets->Window)); - yon_window_config_load(ui_config_path); GtkCssProvider *css=gtk_css_provider_new(); gtk_css_provider_load_from_resource(css,template_app_information.css_path); gtk_style_context_add_provider_for_screen(gdk_screen_get_default(), From 9dea517ea89401915635c8123852f7c2913ad18a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 28 Mar 2024 18:22:52 +0600 Subject: [PATCH 2/4] Crash fix --- source/libublsettingsui-gtk3.c | 1 - 1 file changed, 1 deletion(-) diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index 063e202..400054b 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -304,7 +304,6 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){ char *temp=cur_command; cur_command = yon_config_parameter_prepare_command(cur_command,type!=YON_CONFIG_CUSTOM?yon_config_get_type_path(type):path,NULL,NULL); compare_command = yon_char_unite(compare_command,!yon_char_is_empty(compare_command)?";":"",cur_command,NULL); - free(temp); } config_compare = yon_config_get_compared(compare_command,&compare_size); From e6fa5ad6051e95e32d4a83bb5a55c2118e2cee2c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 29 Mar 2024 11:53:51 +0600 Subject: [PATCH 3/4] Localisation fix for file chooser buttons --- source/libublsettingsui-gtk3.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index 400054b..851bf5d 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -274,9 +274,12 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){ char *compare_command=""; char *cur_command; if (!path&&type == YON_CONFIG_CUSTOM){ + textdomain(template_ui_LocaleName); GtkWidget *dialog = gtk_file_chooser_dialog_new(template_app_information.app_title,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,CANCEL_LABEL,GTK_RESPONSE_CANCEL,SAVE_LABEL,GTK_RESPONSE_ACCEPT,NULL); + textdomain(template_app_information.app_locale); GtkFileFilter *filter = gtk_file_filter_new(); gtk_file_filter_add_pattern(filter,"*.ini"); + gtk_file_filter_set_name(filter, "*.ini"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter); int response = gtk_dialog_run(GTK_DIALOG(dialog)); if (response == GTK_RESPONSE_ACCEPT){ From cfcd154d7333cd5aa26f25a6a41016921cd986de Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 1 Apr 2024 11:01:36 +0600 Subject: [PATCH 4/4] Fixed save filechooser icon --- source/libublsettingsui-gtk3.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index 851bf5d..cdb12b6 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -278,6 +278,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...){ GtkWidget *dialog = gtk_file_chooser_dialog_new(template_app_information.app_title,NULL,GTK_FILE_CHOOSER_ACTION_SAVE,CANCEL_LABEL,GTK_RESPONSE_CANCEL,SAVE_LABEL,GTK_RESPONSE_ACCEPT,NULL); textdomain(template_app_information.app_locale); GtkFileFilter *filter = gtk_file_filter_new(); + gtk_window_set_icon_name(GTK_WINDOW(dialog),yon_char_append("com.ublinux.",template_app_information.app_tech_name)); gtk_file_filter_add_pattern(filter,"*.ini"); gtk_file_filter_set_name(filter, "*.ini"); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER(dialog),filter);