From 733a56b7973112e7135dbde55ea77995aff8cc37 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 15 Sep 2025 11:17:01 +0600 Subject: [PATCH 1/6] Comments removal; variable rename; custom config creation owner fix --- source/libublsettingsui-gtk3-save.c | 31 ++++++++++------------------- 1 file changed, 11 insertions(+), 20 deletions(-) diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c index 2a3b9b3..c8a9dde 100644 --- a/source/libublsettingsui-gtk3-save.c +++ b/source/libublsettingsui-gtk3-save.c @@ -487,32 +487,21 @@ void yon_loaded_config_set_sections_from_sections_dictionary(struct loaded_confi struct loaded_config *yon_config_get_compared(char *command){ if (command){ int size; - config_str config = yon_config_load(command,&size); + config_str config_p = yon_config_load(command,&size); config_str temporary = NULL; int temp_size=0; - if (config&&size>0){ + if (config_p&&size>0){ for (int i=0;ipw_uid,user->pw_gid); int a = system(command_creation); free(command_creation); if (access(file,0)!=F_OK){ @@ -557,9 +548,9 @@ char *yon_custom_config_init(GtkFileChooserAction type){ } /* - ============ - init section - ============ + =========================================================== + init section + =========================================================== */ void on_save_parameters(GtkWidget *self, template_saving_window *window){ From 9e0b1116ef92a66aa14866f79fc33b57b52d4714 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 15 Sep 2025 11:39:32 +0600 Subject: [PATCH 2/6] own fix --- source/libublsettingsui-gtk3-save.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c index c8a9dde..59774ae 100644 --- a/source/libublsettingsui-gtk3-save.c +++ b/source/libublsettingsui-gtk3-save.c @@ -529,8 +529,8 @@ char *yon_custom_config_init(GtkFileChooserAction type){ if (access(file,0)!=F_OK){ char *command_creation = ubconfig_file_create(file); struct passwd *user = getpwnam(yon_ubl_root_user_get()); - chown(file,user->pw_uid,user->pw_gid); int a = system(command_creation); + chown(file,user->pw_uid,user->pw_gid); free(command_creation); if (access(file,0)!=F_OK){ yon_ubl_status_box_render(CUSTOM_CONFIG_CREATION_ERROR_LABEL,BACKGROUND_IMAGE_FAIL_TYPE); From 735a0bb967bb1bfa242ec060e059315074c687bb Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 2 Oct 2025 16:28:29 +0600 Subject: [PATCH 3/6] Test fix for commands --- ...libublsettingsui-gtk3.toggled-symbolic.svg | 53 +++++++++++++++++++ ...bublsettingsui-gtk3.untoggled-symbolic.svg | 53 +++++++++++++++++++ source/libublsettingsui-gtk3-save.c | 4 +- 3 files changed, 108 insertions(+), 2 deletions(-) create mode 100644 icons/status/com.ublinux.libublsettingsui-gtk3.toggled-symbolic.svg create mode 100644 icons/status/com.ublinux.libublsettingsui-gtk3.untoggled-symbolic.svg diff --git a/icons/status/com.ublinux.libublsettingsui-gtk3.toggled-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.toggled-symbolic.svg new file mode 100644 index 0000000..96dc956 --- /dev/null +++ b/icons/status/com.ublinux.libublsettingsui-gtk3.toggled-symbolic.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + diff --git a/icons/status/com.ublinux.libublsettingsui-gtk3.untoggled-symbolic.svg b/icons/status/com.ublinux.libublsettingsui-gtk3.untoggled-symbolic.svg new file mode 100644 index 0000000..abc7ca7 --- /dev/null +++ b/icons/status/com.ublinux.libublsettingsui-gtk3.untoggled-symbolic.svg @@ -0,0 +1,53 @@ + + + + + + + + + + + diff --git a/source/libublsettingsui-gtk3-save.c b/source/libublsettingsui-gtk3-save.c index 59774ae..4e28174 100644 --- a/source/libublsettingsui-gtk3-save.c +++ b/source/libublsettingsui-gtk3-save.c @@ -384,8 +384,8 @@ void yon_save_window_compared_config_init_unfound(template_saving_window *window int yon_config_parameter_prepare_elements(config_str target, int *size){ int success = 0; for (int i=0;i<(*size);i++){ - char *start_bracket_replaced_string = yon_char_replace(target[i],"[","[\""); - char *end_bracket_replaced_string = yon_char_replace(start_bracket_replaced_string,"]","\"]"); + char *start_bracket_replaced_string = yon_char_replace(target[i],"[","[\'"); + char *end_bracket_replaced_string = yon_char_replace(start_bracket_replaced_string,"]","\']"); target[i] = end_bracket_replaced_string; } return success; From 2b80fa9d27cda61396ffde0981057c4170488f2c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 6 Oct 2025 12:46:07 +0600 Subject: [PATCH 4/6] Localisation update --- libublsettingsui-gtk3.pot | 3 +++ libublsettingsui-gtk3_ru.po | 5 ++++- source/libublsettingsui-gtk3.h | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index c226b19..5919d26 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -388,3 +388,6 @@ msgstr "" #: source/libublsettingsui-gtk3.h:493 msgid "Access to file denied" msgstr "" + +msgid "Error! Invalid configuration parameter were loaded" +msgstr "" \ No newline at end of file diff --git a/libublsettingsui-gtk3_ru.po b/libublsettingsui-gtk3_ru.po index 1767057..578244e 100644 --- a/libublsettingsui-gtk3_ru.po +++ b/libublsettingsui-gtk3_ru.po @@ -394,4 +394,7 @@ msgstr "Выход" #: source/libublsettingsui-gtk3.h:493 msgid "Access to file denied" -msgstr "Отказано в доступе к файлу" \ No newline at end of file +msgstr "Отказано в доступе к файлу" + +msgid "Error! Invalid configuration parameter were loaded" +msgstr "Ошибка! Был загружен невалидный параметр" \ No newline at end of file diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index 9708ff7..b69e600 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -620,4 +620,5 @@ yon_password_window *yon_password_open(GtkEntry *target); #define _INCORRECT_HASH_LABEL yon_char_get_localised_from_lib("Invalid hash") #define _ENCRYPTION_DEFAULT_LABEL yon_char_get_localised_from_lib("Default (None)") #define ACCESS_DENIED_LABEL(target) yon_char_unite(yon_char_get_localised_from_lib("Access to file denied"),": ", target,NULL) + #define CONFIG_INVALID_LABEL _("Error! Invalid configuration parameter were loaded") #endif \ No newline at end of file From a84274e9a355fe29918b742f7d92767b80befa70 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 6 Oct 2025 13:57:41 +0600 Subject: [PATCH 5/6] Fixed library localisation --- Makefile | 5 +++++ libublsettingsui-gtk3.pot | 1 + source/libublsettingsui-gtk3.h | 2 +- 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a1c489d..9751fcd 100644 --- a/Makefile +++ b/Makefile @@ -78,6 +78,11 @@ build: depend prepare uninstall: @echo "Uninstall ..." + @for LANG in $$(find ./ -iname "*.po" -print | sed -En "s/.+_([[:alpha:]]+)\.po/\1/p" | sort -u); do \ +# PATH_FILE_MO="${DESTDIR}${PREFIX}/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + PATH_FILE_MO="${DESTDIR}/usr/share/locale/$${LANG}/LC_MESSAGES/${PKGNAME}.mo"; \ + $(RM) "$${PATH_FILE_MO}"; \ + done @for FILE_PO in $(wildcard *.po); do \ LANG=$${FILE_PO##*_};LANG=$${LANG%.*}; \ FILE_MO=$${FILE_PO##*/}; FILE_MO="$${FILE_MO%_*.po}.mo"; \ diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index 5919d26..ef43fe7 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -389,5 +389,6 @@ msgstr "" msgid "Access to file denied" msgstr "" +#: source/libublsettingsui-gtk3.h:493 msgid "Error! Invalid configuration parameter were loaded" msgstr "" \ No newline at end of file diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index b69e600..7e2100f 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -620,5 +620,5 @@ yon_password_window *yon_password_open(GtkEntry *target); #define _INCORRECT_HASH_LABEL yon_char_get_localised_from_lib("Invalid hash") #define _ENCRYPTION_DEFAULT_LABEL yon_char_get_localised_from_lib("Default (None)") #define ACCESS_DENIED_LABEL(target) yon_char_unite(yon_char_get_localised_from_lib("Access to file denied"),": ", target,NULL) - #define CONFIG_INVALID_LABEL _("Error! Invalid configuration parameter were loaded") + #define CONFIG_INVALID_LABEL yon_char_get_localised_from_lib("Error! Invalid configuration parameter were loaded") #endif \ No newline at end of file From c9600adf14001a52b3138f4adb6e775c7cbe55f6 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 6 Oct 2025 17:05:06 +0600 Subject: [PATCH 6/6] configuration file corrupt parameters label changes --- libublsettingsui-gtk3.pot | 2 +- libublsettingsui-gtk3_ru.po | 4 ++-- source/libublsettingsui-gtk3.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/libublsettingsui-gtk3.pot b/libublsettingsui-gtk3.pot index ef43fe7..32e384a 100644 --- a/libublsettingsui-gtk3.pot +++ b/libublsettingsui-gtk3.pot @@ -390,5 +390,5 @@ msgid "Access to file denied" msgstr "" #: source/libublsettingsui-gtk3.h:493 -msgid "Error! Invalid configuration parameter were loaded" +msgid "The configuration file contains incorrect parameters." msgstr "" \ No newline at end of file diff --git a/libublsettingsui-gtk3_ru.po b/libublsettingsui-gtk3_ru.po index 578244e..51807fd 100644 --- a/libublsettingsui-gtk3_ru.po +++ b/libublsettingsui-gtk3_ru.po @@ -396,5 +396,5 @@ msgstr "Выход" msgid "Access to file denied" msgstr "Отказано в доступе к файлу" -msgid "Error! Invalid configuration parameter were loaded" -msgstr "Ошибка! Был загружен невалидный параметр" \ No newline at end of file +msgid "The configuration file contains incorrect parameters." +msgstr "Файл конфигурации содержит некорректные параметры" \ No newline at end of file diff --git a/source/libublsettingsui-gtk3.h b/source/libublsettingsui-gtk3.h index 7e2100f..ae64072 100644 --- a/source/libublsettingsui-gtk3.h +++ b/source/libublsettingsui-gtk3.h @@ -620,5 +620,5 @@ yon_password_window *yon_password_open(GtkEntry *target); #define _INCORRECT_HASH_LABEL yon_char_get_localised_from_lib("Invalid hash") #define _ENCRYPTION_DEFAULT_LABEL yon_char_get_localised_from_lib("Default (None)") #define ACCESS_DENIED_LABEL(target) yon_char_unite(yon_char_get_localised_from_lib("Access to file denied"),": ", target,NULL) - #define CONFIG_INVALID_LABEL yon_char_get_localised_from_lib("Error! Invalid configuration parameter were loaded") + #define CONFIG_INVALID_LABEL yon_char_get_localised_from_lib("The configuration file contains incorrect parameters.") #endif \ No newline at end of file