From 0f85305c12025b10236399a6f8d66d0a387b75ef Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 6 Jun 2024 14:54:16 +0600 Subject: [PATCH 1/3] Upgrade for debug output fucntion --- source/libublsettingsui-gtk3.c | 3 ++- source/libublsettingsui-gtk3.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index aa104e6..7417684 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -481,10 +481,11 @@ int yon_confirmation_dialog_call(GtkWidget *self,dialog_confirmation_data *data) return resp; } -void yon_debug_output(char *pattern,char*text){ +char* yon_debug_output(char *pattern,char*text){ if (template_config->debug_mode){ printf(pattern,text); } + return text; } // standard functions diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index 7284e62..ab023bf 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -252,7 +252,7 @@ template_saving_window *yon_save_proceed(char *path,YON_CONFIG_TYPE type, ...); */ void yon_open_browser(GtkWidget *self, char *link); -void yon_debug_output(char *pattern,char*text); +char *yon_debug_output(char *pattern,char*text); /**yon_ubl_connect_config(_template_config *config) * [EN] -- 2.35.1 From 08d7ce5773fe16216fc6f6a0b2fbd875829411f6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 11 Jun 2024 14:02:11 +0600 Subject: [PATCH 2/3] Fixed line wrapping --- source/libublsettingsui-gtk3.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index 7417684..e05007e 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -466,6 +466,8 @@ int yon_confirmation_dialog_call(GtkWidget *self,dialog_confirmation_data *data) GtkWidget *label = gtk_label_new(data->action_text); gtk_widget_set_margin_end(label,20); gtk_widget_show(label); + gtk_label_set_line_wrap_mode(GTK_LABEL(label),PANGO_WRAP_WORD); + gtk_label_set_line_wrap(GTK_LABEL(label),1); GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5); gtk_widget_show(box); @@ -476,7 +478,7 @@ int yon_confirmation_dialog_call(GtkWidget *self,dialog_confirmation_data *data) int resp = gtk_dialog_run(GTK_DIALOG(dialog)); if (resp == GTK_RESPONSE_ACCEPT&&data->function){ data->function(NULL,data->data); - } + } else resp=0; gtk_widget_destroy(dialog); return resp; } -- 2.35.1 From ecd3637f0a667a81101c88cbd28cb09dff5c9ee3 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 11 Jun 2024 14:10:48 +0600 Subject: [PATCH 3/3] Fixed confirmation window initial size --- source/libublsettingsui-gtk3.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/libublsettingsui-gtk3.c b/source/libublsettingsui-gtk3.c index e05007e..d7231ec 100644 --- a/source/libublsettingsui-gtk3.c +++ b/source/libublsettingsui-gtk3.c @@ -463,11 +463,12 @@ int yon_confirmation_dialog_call(GtkWidget *self,dialog_confirmation_data *data) gtk_widget_set_margin_bottom(image,20); gtk_widget_set_margin_top(image,20); - GtkWidget *label = gtk_label_new(data->action_text); + GtkWidget *label = gtk_label_new(""); gtk_widget_set_margin_end(label,20); gtk_widget_show(label); gtk_label_set_line_wrap_mode(GTK_LABEL(label),PANGO_WRAP_WORD); gtk_label_set_line_wrap(GTK_LABEL(label),1); + gtk_label_set_text(GTK_LABEL(label),data->action_text); GtkWidget *box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL,5); gtk_widget_show(box); @@ -475,6 +476,8 @@ int yon_confirmation_dialog_call(GtkWidget *self,dialog_confirmation_data *data) gtk_box_pack_start(GTK_BOX(box),label,0,0,5); gtk_box_pack_start(GTK_BOX(gtk_dialog_get_content_area(GTK_DIALOG(dialog))),box,1,1,5); + gtk_window_set_default_size(GTK_WINDOW(dialog),450,-1); + int resp = gtk_dialog_run(GTK_DIALOG(dialog)); if (resp == GTK_RESPONSE_ACCEPT&&data->function){ data->function(NULL,data->data); -- 2.35.1