From c4e57a03d009840e393834b75b49293ad43f8cdb Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 18 Nov 2025 14:12:15 +0600 Subject: [PATCH 1/5] Fixed monitors render --- ubl-settings-video-monitor.glade | 5 ++++- ubl-settings-video.glade | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ubl-settings-video-monitor.glade b/ubl-settings-video-monitor.glade index 3ab2100..c2980ae 100644 --- a/ubl-settings-video-monitor.glade +++ b/ubl-settings-video-monitor.glade @@ -1,10 +1,12 @@ - + True False + center + center True @@ -52,6 +54,7 @@ True False + start 3 3 5 diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index 0827b15..4a8d17c 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -1,5 +1,5 @@ - + @@ -431,7 +431,8 @@ True False - 150 + True + 20 none False -- 2.35.1 From 33dc651182bc030fef8f0cdfbfab5103f85535d7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 18 Nov 2025 14:20:21 +0600 Subject: [PATCH 2/5] Fixed driver installation cancelling --- source/ubl-settings-video-driver.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-video-driver.c b/source/ubl-settings-video-driver.c index 27098cb..68c68e2 100644 --- a/source/ubl-settings-video-driver.c +++ b/source/ubl-settings-video-driver.c @@ -74,7 +74,7 @@ void on_terminal_done(GtkWidget *, int , main_window *widgets){ const char cancel_signal = 3; char *command = yon_char_new(" "); command[0]=cancel_signal; - char *tmp = yon_char_unite(command,"; exit 0\n",NULL); + char *tmp = yon_char_unite(command,"\n exit 0\n",NULL); on_pacman_db_unlock(); free(command); vte_terminal_feed_child(VTE_TERMINAL(widgets->InstallTerminal),tmp,strlen(tmp)); -- 2.35.1 From 554f78cfa353a46d10fc3217e8dd4f4a64e14754 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 18 Nov 2025 14:30:26 +0600 Subject: [PATCH 3/5] Fixed loading function --- source/ubl-settings-video.c | 66 ++++++++++++++++++++----------------- source/ubl-settings-video.h | 2 +- 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 37aa805..61e5249 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -231,40 +231,44 @@ void yon_interface_update(){ yon_monitor_view_update(); } -void yon_load_proceed(YON_CONFIG_TYPE type){ +void yon_load_proceed(YON_CONFIG_TYPE type){ if (type!=YON_CONFIG_CUSTOM){ yon_config_clean(); + if (!yon_char_is_empty(config_get_default_command)) + yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); + } + if (type==YON_CONFIG_GLOBAL){ + yon_config_load_config(type,config_get_command("global"),NULL); + } else if (type==YON_CONFIG_LOCAL){ + yon_config_load_config(type,config_get_command("system"),NULL); + } else if (type==YON_CONFIG_CUSTOM){ + char *path=""; + 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,OPEN_LABEL,GTK_RESPONSE_ACCEPT,NULL); + textdomain(LocaleName); + gtk_window_set_icon_name(GTK_WINDOW(dialog),"com.ublinux.ubl-settings-services"); + gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL); + 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); + gtk_widget_show(dialog); + int response = gtk_dialog_run(GTK_DIALOG(dialog)); + if (response == GTK_RESPONSE_ACCEPT){ + char *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); + if (!yon_char_is_empty(file)){ + path=file; + } + yon_config_clean(); + if (!yon_char_is_empty(config_get_default_command)) + yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); + char *command = config_get_command(path); + yon_config_load_config(type,command,NULL); + gtk_widget_destroy(dialog); + } else { + gtk_widget_destroy(dialog); + } } - if (!yon_char_is_empty(config_get_default_command)) - yon_config_load_config(YON_CONFIG_DEFAULT,config_get_default_command,NULL); - switch (type){ - case YON_CONFIG_GLOBAL: - yon_config_load_config(type,config_get_command("global"),NULL); - yon_ubl_status_box_render(yon_char_get_localised_from_lib(GLOBAL_LOAD_SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); - break; - case YON_CONFIG_LOCAL: - yon_config_load_config(type,config_get_command("system"),NULL); - yon_ubl_status_box_render(yon_char_get_localised_from_lib(LOCAL_LOAD_SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); - break; - case YON_CONFIG_CUSTOM: - char *path = NULL; - path=yon_custom_config_init(GTK_FILE_CHOOSER_ACTION_OPEN); - yon_char_remove_brackets(path); - if (!yon_char_is_empty(path)){ - if ((access(path,0)==F_OK&&access(path,4)!=F_OK)){ - if (yon_status_box_is_set()){ - yon_ubl_status_box_render(ACCESS_DENIED_LABEL(path),BACKGROUND_IMAGE_FAIL_TYPE); - return; - } - } - yon_config_clean(); - yon_config_load_config(type,config_get_command(path),NULL); - yon_ubl_status_box_render(yon_char_get_localised_from_lib(LOCAL_LOAD_SUCCESS_LABEL),BACKGROUND_IMAGE_SUCCESS_TYPE); - } - break; - default: - break; - } } void on_config_local_load(GtkWidget *self,main_window *){ diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index 816053f..8f91920 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -146,7 +146,7 @@ typedef struct{ typedef char* string; __attribute__((unused)) static \ -string version_application; +string version_application = "2.22"; #define _(String) gettext(String) -- 2.35.1 From 55b413e0123fb21e343a97f37f64cc500a478e05 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Tue, 18 Nov 2025 15:16:38 +0600 Subject: [PATCH 4/5] Localisation update --- locale/ubl-settings-video-video-drivers.pot | 6 ++++++ locale/ubl-settings-video-video-drivers_ru.po | 8 ++++++++ source/ubl-settings-video.c | 2 +- source/ubl-settings-video.h | 2 +- 4 files changed, 16 insertions(+), 2 deletions(-) diff --git a/locale/ubl-settings-video-video-drivers.pot b/locale/ubl-settings-video-video-drivers.pot index b7456d8..781a854 100644 --- a/locale/ubl-settings-video-video-drivers.pot +++ b/locale/ubl-settings-video-video-drivers.pot @@ -109,3 +109,9 @@ msgstr "" msgid "Intel i810/i830/i915/945G/G965+, except GMA 3600" msgstr "" + +msgid "NVIDIA 340xx driver and utilities" +msgstr "" + +msgid "NVIDIA Open 575xx driver and utilities" +msgstr "" diff --git a/locale/ubl-settings-video-video-drivers_ru.po b/locale/ubl-settings-video-video-drivers_ru.po index 8f43946..dd981d9 100644 --- a/locale/ubl-settings-video-video-drivers_ru.po +++ b/locale/ubl-settings-video-video-drivers_ru.po @@ -110,3 +110,11 @@ msgstr "Пакет с драйвером и утилитами NVIDIA 575xx" msgid "Intel i810/i830/i915/945G/G965+, except GMA 3600" msgstr "" "Intel i810/i830/i915/945G/G965+, кроме GMA 3600" + +msgid "NVIDIA 340xx driver and utilities" +msgstr "" +"Драйвер и утилиты NVIDIA 340xx" + +msgid "NVIDIA Open 575xx driver and utilities" +msgstr "" +"Драйвер и утилиты NVIDIA Open 575xx" diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 61e5249..a0f99a7 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -365,7 +365,7 @@ void yon_proprietary_local_get(main_window *widgets){ target->package = current[2]; target->kernel = current[0]; target->devices = current_size>5?current[5]:NULL; - target->description = current[4]; + target->description = _(current[4]); target->module_installed = yon_packages_check_installed(current[1]); target->package_installed = yon_packages_check_installed(current[2]); target->module_exist = yon_packages_check_exist(current[1]); diff --git a/source/ubl-settings-video.h b/source/ubl-settings-video.h index 8f91920..816053f 100644 --- a/source/ubl-settings-video.h +++ b/source/ubl-settings-video.h @@ -146,7 +146,7 @@ typedef struct{ typedef char* string; __attribute__((unused)) static \ -string version_application = "2.22"; +string version_application; #define _(String) gettext(String) -- 2.35.1 From 217107a289ea73494e718ba1a9718ad0e4ddf7ca Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Thu, 20 Nov 2025 10:02:21 +0600 Subject: [PATCH 5/5] Changed drivers sections --- ubl-settings-video.glade | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index 4a8d17c..a831176 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -205,6 +205,7 @@ True False + vertical 5 @@ -247,6 +248,7 @@ True False + vertical 5 @@ -302,12 +304,14 @@ True False + vertical 5 True False Free drivers: + 0 False @@ -345,12 +349,14 @@ True False + vertical 5 True False Failsafe AMD/ATI driver: + 0 False -- 2.35.1