From c1b1e68a5f609d99d2e86fea785f94640bebe076 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Mon, 2 Mar 2026 10:00:33 +0600 Subject: [PATCH 1/4] Fixed password change callback --- libublsettingsui-gtk3-password.glade | 1 - source/libublsettingsui-gtk3-password.c | 12 +++++++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/libublsettingsui-gtk3-password.glade b/libublsettingsui-gtk3-password.glade index 118c6d4..300ab69 100644 --- a/libublsettingsui-gtk3-password.glade +++ b/libublsettingsui-gtk3-password.glade @@ -166,7 +166,6 @@ - True False diff --git a/source/libublsettingsui-gtk3-password.c b/source/libublsettingsui-gtk3-password.c index 93d1f1b..4940f54 100644 --- a/source/libublsettingsui-gtk3-password.c +++ b/source/libublsettingsui-gtk3-password.c @@ -153,8 +153,12 @@ void on_password_hash_sensitiveness(GtkWidget *,yon_password_window *window){ } } +void on_password_changed(GtkWidget *, yon_password_window *window); + void yon_password_function_set(yon_password_window *window, double *password_func){ window->strength_func = password_func; + g_signal_connect(G_OBJECT(window->PasswordEntry),"changed",G_CALLBACK(on_password_changed),window); + gtk_widget_show(window->PasswordStrengthProgress); } void on_password_accept(GtkWidget *,dictionary *dict){ @@ -183,13 +187,16 @@ void on_password_accept(GtkWidget *,dictionary *dict){ } void on_password_changed(GtkWidget *, yon_password_window *window){ - const char *password_str = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); - double strength = ((double(*)(yon_password_window *,const char*))window->strength_func)(window,password_str); + if (window->strength_func){ + const char *password_str = gtk_entry_get_text(GTK_ENTRY(window->PasswordEntry)); + double strength = ((double(*)(yon_password_window *,const char*))window->strength_func)(window,password_str); + } } yon_password_window *yon_password_window_new(){ GtkBuilder *builder = gtk_builder_new_from_resource(ui_glade_path_password); yon_password_window *window = malloc(sizeof(yon_password_window)); + memset(window,0,sizeof(yon_password_window)); window->Window = yon_gtk_builder_get_widget(builder,"PasswordWindow"); window->HeadLabel = yon_gtk_builder_get_widget(builder,"userTitleNameLabel"); window->StatusBox = yon_gtk_builder_get_widget(builder,"StatusBox"); @@ -210,7 +217,6 @@ yon_password_window *yon_password_window_new(){ g_signal_connect(G_OBJECT(window->NoEncriptionCheck),"toggled",G_CALLBACK(on_password_hash_sensitiveness),window); g_signal_connect(G_OBJECT(window->PasswordHashEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window); g_signal_connect(G_OBJECT(window->PasswordEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window); - g_signal_connect(G_OBJECT(window->PasswordEntry),"changed",G_CALLBACK(on_password_changed),window); g_signal_connect(G_OBJECT(window->RepeatPasswordEntry),"changed",G_CALLBACK(on_password_hash_sensitiveness),window); gtk_widget_show(window->Window); return window; From 5df90b2a4ee56a1bb671d978b85c3e34263965d4 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 3 Mar 2026 10:10:42 +0600 Subject: [PATCH 2/4] Password window fixes --- libublsettingsui-gtk3-password.glade | 3 +-- source/libublsettingsui-gtk3-password.c | 5 ++--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/libublsettingsui-gtk3-password.glade b/libublsettingsui-gtk3-password.glade index 300ab69..97ecdf7 100644 --- a/libublsettingsui-gtk3-password.glade +++ b/libublsettingsui-gtk3-password.glade @@ -277,7 +277,6 @@ True - False True Password hash False @@ -341,7 +340,7 @@ - Accept + Ok True True True diff --git a/source/libublsettingsui-gtk3-password.c b/source/libublsettingsui-gtk3-password.c index 4940f54..b929eb1 100644 --- a/source/libublsettingsui-gtk3-password.c +++ b/source/libublsettingsui-gtk3-password.c @@ -129,10 +129,9 @@ void on_password_hash_sensitiveness(GtkWidget *,yon_password_window *window){ const char *hash = gtk_entry_get_text(GTK_ENTRY(window->PasswordHashEntry)); const char *hash_command = gtk_combo_box_get_active_id(GTK_COMBO_BOX(window->EncryptionCombo)); if (!yon_char_is_empty(hash_command)){ - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->NoEncriptionCheck),1); - gtk_widget_set_sensitive(window->NoEncriptionCheck,0); - } else { gtk_widget_set_sensitive(window->NoEncriptionCheck,1); + } else { + gtk_widget_set_sensitive(window->NoEncriptionCheck,0); } if (!yon_char_is_empty(password)||!yon_char_is_empty(repeat_password)){ gtk_widget_set_sensitive(window->HashBox,0); From 2c85599ba030d3798caa34a5b17120b03d105108 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 3 Mar 2026 10:18:35 +0600 Subject: [PATCH 3/4] Password window doamin fix --- libublsettingsui-gtk3-password.glade | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libublsettingsui-gtk3-password.glade b/libublsettingsui-gtk3-password.glade index 97ecdf7..1390623 100644 --- a/libublsettingsui-gtk3-password.glade +++ b/libublsettingsui-gtk3-password.glade @@ -1,6 +1,6 @@ - + True From 041306e48ed0db03774e3412387e73075467c206 Mon Sep 17 00:00:00 2001 From: Ivan Dmitrievich Yartsev Date: Tue, 3 Mar 2026 11:36:08 +0600 Subject: [PATCH 4/4] Localisation change --- libublsettingsui-gtk3.pot | 3 +++ libublsettingsui-gtk3_ru.po | 3 +++ source/libublsettingsui-gtk3-save.c | 4 ++-- source/libublsettingsui-gtk3.h | 1 + 4 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index 5551ef1..7a92106 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -487,3 +487,6 @@ msgstr "" #: source/libublsettingsui-gtk3.h:728 msgid "User" msgstr "" + +msgid "Open configuration file" +msgstr "" \ No newline at end of file diff --git a/libublsettingsui-gtk3_ru.po b/libublsettingsui-gtk3_ru.po index 87b76f2..ba86b5c 100644 --- a/libublsettingsui-gtk3_ru.po +++ b/libublsettingsui-gtk3_ru.po @@ -496,3 +496,6 @@ msgstr "Группа" #: source/libublsettingsui-gtk3.h:728 msgid "User" msgstr "Пользователь" + +msgid "Open configuration file" +msgstr "Открыть файл конфигурации" diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c index a547fa3..5bb9c67 100644 --- a/source/libublsettingsui-gtk3-save.c +++ b/source/libublsettingsui-gtk3-save.c @@ -511,8 +511,8 @@ char *yon_custom_config_init(GtkFileChooserAction type){ filechooser_window *dialog = yon_config_file_chooser_window_new(type); gtk_widget_hide(dialog->ChooseFolderCheck); - yon_gtk_window_setup(GTK_WINDOW(dialog->Window),NULL,template_app_information.app_title,yon_char_unite("com.ublinux.",template_app_information.app_tech_name,NULL),"ConfigFilechooserWindow"); - gtk_label_set_text(GTK_LABEL(dialog->HeaderTopic),template_app_information.app_title); + yon_gtk_window_setup(GTK_WINDOW(dialog->Window),NULL,OPEN_CONFIGURATION_FILE_LABEL,yon_char_unite("com.ublinux.",template_app_information.app_tech_name,NULL),"ConfigFilechooserWindow"); + gtk_label_set_text(GTK_LABEL(dialog->HeaderTopic),OPEN_CONFIGURATION_FILE_LABEL); if (type==GTK_FILE_CHOOSER_ACTION_SAVE){ // yon_file_chooser_set_button_label(yon_char_get_localised_from_lib(LOAD_CONFIG_LABEL)); diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index ee9c0ba..0a30d09 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -641,6 +641,7 @@ yon_window *yon_window_new(); #define CANCEL_LABEL yon_char_get_localised_from_lib("Cancel") #define ACCEPT_LABEL yon_char_get_localised_from_lib("Ok") #define OPEN_LABEL yon_char_get_localised_from_lib("Open") + #define OPEN_CONFIGURATION_FILE_LABEL yon_char_get_localised_from_lib("Open configuration file") #define CREATE_FOLDER_LABEL yon_char_get_localised_from_lib("Create directory") #define SELECT_FOLDER_LABEL yon_char_get_localised_from_lib("Select directory")