From c5ba9359e6fa25f605f5d3b103940265804ba15c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 12:06:23 +0600 Subject: [PATCH 1/8] css missing class fix; Russian localisation fix --- ubl-settings-video.css | 12 ++++++++++++ ubl-settings-video_ru.po | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ubl-settings-video.css b/ubl-settings-video.css index 7bf569e..4a186ac 100644 --- a/ubl-settings-video.css +++ b/ubl-settings-video.css @@ -119,4 +119,16 @@ border-color: @theme_text_color; .marginright image{ margin-right: 2px; +} +.errorBox { + border-width: 2px; + border-color: #ea9999; + border-style:solid; +} + +.chosenOutline{ + transition: 0ms; + border-width: 1px; + border-color: #f3f0ac; + border-style:solid; } \ No newline at end of file diff --git a/ubl-settings-video_ru.po b/ubl-settings-video_ru.po index 95960d1..6158f34 100644 --- a/ubl-settings-video_ru.po +++ b/ubl-settings-video_ru.po @@ -497,7 +497,7 @@ msgstr "Пакет с драйвером и утилитами AMD с подде #: source/ubl-strings.h:125 msgid "Important field is empty" -msgstr "Пустое важное полу" +msgstr "Пустое важное поле" #: source/ubl-strings.h:127 msgid "Load drivers from database" From e8f84f8610fd3543c91015665b5a05eb2f326da1 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 12:33:12 +0600 Subject: [PATCH 2/8] Fixed wrong parameter loading if there's no value in config --- source/ubl-settings-video.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index dd09caa..6dfcbc5 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -520,7 +520,7 @@ void yon_interface_update(){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),2); gtk_entry_set_text(GTK_ENTRY(main_config.widgets->OptirunEntry),optirun); } else if (yon_char_is_empty(optirun)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),1); + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0); else gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0); @@ -528,16 +528,16 @@ void yon_interface_update(){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),2); gtk_entry_set_text(GTK_ENTRY(main_config.widgets->PrimusrunEntry),primusrun); } else if (yon_char_is_empty(primusrun)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),1); + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),0); else gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),0); - if (!yon_char_is_empty(gapfix1)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),2); - else if (!yon_char_is_empty(gapfix2)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),3); - else - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),1); + // if (!yon_char_is_empty(gapfix1)) + // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),2); + // else if (!yon_char_is_empty(gapfix2)) + // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),3); + // else + // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),1); yon_monitor_view_update(); } @@ -828,8 +828,7 @@ void on_monitor_configure(GtkWidget *self,monitor_data *window){ g_signal_connect(G_OBJECT(monitors->ParameterLineCheck), "toggled", G_CALLBACK(yon_gtk_widget_set_sensitive_from_toggle_button), monitors->ParameterLineEntry); g_signal_connect(G_OBJECT(monitors->UnsupportedCheck), "toggled", G_CALLBACK(on_resolutions_unsupported_show),monitors); g_signal_connect(G_OBJECT(monitors->PortCombo), "changed", G_CALLBACK(on_port_chosen_changed),monitors); - - gtk_window_set_title(GTK_WINDOW(monitors->MainWindow),TITLE_LABEL); + yon_gtk_window_setup(GTK_WINDOW(monitors->MainWindow),GTK_WINDOW(main_config.widgets->Window),TITLE_LABEL,"com.ublinux.ubl-settings-video","VieoConfigWindow"); char *target = (char*)gtk_label_get_text(GTK_LABEL(window->NameLabel)); From ae6483bae8d1927e4804bd55086a55426b3d5643 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 12:39:22 +0600 Subject: [PATCH 3/8] fix of optirun and primusrun sensitivity --- source/ubl-settings-video.c | 3 ++- ubl-settings-video.glade | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 6dfcbc5..f5aa998 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -1255,7 +1255,8 @@ void yon_adapter_window_setup(main_window *widgets){ } void yon_set_sensitive_from_combo_box(GtkComboBox *toggle, GtkWidget *target){ - gtk_widget_set_sensitive(target,!gtk_combo_box_get_active(toggle)>1 ? 1 : 0); + int active = gtk_combo_box_get_active(toggle); + gtk_widget_set_sensitive(target,active>1 ? 1 : 0); } /** void yon_setup_widgets(main_window *widgets) diff --git a/ubl-settings-video.glade b/ubl-settings-video.glade index dc48158..0acbc20 100644 --- a/ubl-settings-video.glade +++ b/ubl-settings-video.glade @@ -884,6 +884,7 @@ True + False True @@ -949,6 +950,7 @@ True + False True From e6e0155a42f6a681704b30a93eabaf4ec8a3641f Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 14:07:35 +0600 Subject: [PATCH 4/8] css file update --- ubl-settings-video.css | 85 ++++++++++++++++++++++-------------------- 1 file changed, 45 insertions(+), 40 deletions(-) diff --git a/ubl-settings-video.css b/ubl-settings-video.css index 4a186ac..1ca94fe 100644 --- a/ubl-settings-video.css +++ b/ubl-settings-video.css @@ -1,38 +1,28 @@ +.thin { + margin:0px; + padding:0px; +} .noborder { border:none; } +.nobackground { +background:transparent; +} +.nobackground:active { +background:transparent; +} .textHead{ text-shadow: 2px 2px @theme_bg_color; color: @theme_text_color; } -.thin { - margin:0px; - padding:0px; -} + .inherited>* { border:none; background:inherit; } -.opacited { - opacity:0.98; -} -.borders { -border-radius: 2px; -border-width: 1px; -border-color: @theme_text_color; -} .workingbg { background:@theme_base_color; } -.textoutline { - text-shadow: 0.5px 0 0.5px @theme_bg_color, -0 0.5px 0.5px @theme_bg_color, --0.5px 0 0.5px @theme_bg_color, -0 -0.5px 0.5px @theme_bg_color; -} -.nobackground { - background: none; -} .menuitembottom{ margin-top:0px; margin-bottom:3px; @@ -47,7 +37,7 @@ border-color: @theme_text_color; border-left-width:inherit; border-right-width:inherit; } - + .menuitemtop{ margin-bottom:0px; border-color:inherit; @@ -55,19 +45,19 @@ border-color: @theme_text_color; border-left-width:inherit; border-right-width:inherit; } - .menuitemtop *{ - margin:2px 2px 0 2px; - padding: 5px 10px 3px 5px; + .menuitemtop >*{ + margin:4px 2px 0 2px; + padding: 3px 10px 3px 5px; border:transparent; } - .menuitemmiddle *{ + .menuitemmiddle >*{ margin:0 2px 0 2px; padding: 3px 10px 3px 5px; border:transparent; } - .menuitembottom *{ + .menuitembottom >*{ margin:0 2px 2px 2px; - padding: 3px 10px 5px 5px; + padding: 3px 10px 3px 5px; } .menuitemtop:hover { background:@theme_bg_color; @@ -90,25 +80,24 @@ border-color: @theme_text_color; border-right-width:inherit; } - .menuitemtop:hover* { - margin:2px 2px 0 2px; - padding: 5px 10px 3px 5px; + .menuitemtop:hover>* { + margin:4px 2px 0 2px; + padding: 3px 10px 3px 5px; background:@theme_selected_bg_color; border-radius:2px; } - .menuitemmiddle:hover* { + .menuitemmiddle:hover>* { margin:0 2px 0 2px; padding: 3px 10px 3px 5px; background:@theme_selected_bg_color; border-radius:2px; } - .menuitembottom:hover* { + .menuitembottom:hover>* { margin:0 2px 2px 2px; - padding: 3px 10px 5px 5px; + padding: 3px 10px 3px 5px; background:@theme_selected_bg_color; border-radius:2px; } - .boxInfoMessError{ background-color: #ea9999; } @@ -116,10 +105,6 @@ border-color: @theme_text_color; .boxInfoMessOK{ background-color: #f3f0ac; } - -.marginright image{ - margin-right: 2px; -} .errorBox { border-width: 2px; border-color: #ea9999; @@ -131,4 +116,24 @@ border-color: @theme_text_color; border-width: 1px; border-color: #f3f0ac; border-style:solid; -} \ No newline at end of file +} + +.separatorTop{ + border-color: darker (@theme_bg_color); + border-top-width:1px; + border-style:solid; +} + +.separatorBottom{ + border-color: darker (@theme_bg_color); + border-bottom-width:1px; + border-style:solid; +} + +.marginright image{ + margin-right: 2px; +} + +treeview row:nth-child(odd) { background-color: #000000; } + +treeview row:nth-child(even) { background-color: #ffffff; } \ No newline at end of file From 01b974b68b632867cfcc508ab1d993834cf0f589 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 14:29:23 +0600 Subject: [PATCH 5/8] Fixed 'no' in optirun & primusrun --- source/ubl-settings-video.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index f5aa998..e89ee64 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -517,16 +517,24 @@ void yon_interface_update(){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeAMDCombo),0); if (!yon_char_is_empty(optirun)){ + if (strcmp(primusrun,"no")){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),2); gtk_entry_set_text(GTK_ENTRY(main_config.widgets->OptirunEntry),optirun); + } else { + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),1); + } } else if (yon_char_is_empty(optirun)) gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0); else gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0); if (!yon_char_is_empty(primusrun)){ - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),2); - gtk_entry_set_text(GTK_ENTRY(main_config.widgets->PrimusrunEntry),primusrun); + if (strcmp(primusrun,"no")){ + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),2); + gtk_entry_set_text(GTK_ENTRY(main_config.widgets->PrimusrunEntry),primusrun); + } else { + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),1); + } } else if (yon_char_is_empty(primusrun)) gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),0); else From ea40140233a5ccbb5f63a950c518b57fb731fa28 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 14:41:30 +0600 Subject: [PATCH 6/8] Fixed file chooser icon --- source/ubl-settings-video.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index e89ee64..9515259 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -517,7 +517,7 @@ void yon_interface_update(){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeAMDCombo),0); if (!yon_char_is_empty(optirun)){ - if (strcmp(primusrun,"no")){ + if (strcmp(optirun,"no")){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),2); gtk_entry_set_text(GTK_ENTRY(main_config.widgets->OptirunEntry),optirun); } else { @@ -561,6 +561,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ 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); + yon_gtk_window_setup(GTK_WINDOW(dialog),NULL,TITLE_LABEL,icon_name,"FileChooserWindow"); textdomain(LocaleName); gtk_window_set_icon_name(GTK_WINDOW(dialog),"com.ublinux.ubl-settings-services"); gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL); From c576e2069a3f8435a25a72351b5e26ee1b6dab7d Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 14:54:13 +0600 Subject: [PATCH 7/8] Updated video-drivers.csv --- video-drivers.csv | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/video-drivers.csv b/video-drivers.csv index 12ccecd..cde0928 100644 --- a/video-drivers.csv +++ b/video-drivers.csv @@ -8,16 +8,16 @@ OS_VERSION_ID;DRV_PAСKAGE_UBM;DRV_PAСKAGE;DRV_NAME;DRV_DESCRIPTION;DRV_SUPPORT 2204;ubm-nvidia-510;;nvidia-510;UBLinux module includes NVIDIA 510xx driver and utilities;Driver for nVidia NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX series video cards 2204;;nvidia-510xx-dkms;nvidia-510;UBLinux package includes NVIDIA 510xx driver and utilities;Driver for nVidia NVS, Quadro Sync, Quadro NVS, Quadro Blade/Embedded, Quadro, Quadro RTX, NVIDIA RTX series video cards 2204;;xf86-video-nouveau;video-nouveau;UBLinux package includes opensource driver NVIDIA;Open source nvidia graphics card driver -2204;;vulkan-amdgpu-pro;vulkan-amdgpu-pro;UBLinux package includes AMD Vulkan driver and utilities;Driver for AMD Radeon R9 285/290/290X, Radeon R9 360/380/380X/390/390X, Radeon R9 Fury/Fury X/Nano, Radeon RX 400/500, Radeon RX Vega, Radeon VII, Radeon RX 5000/6000/7000 series video cards -2204;ubm-amdgpu-pro;;vulkan-amdgpu-pro;UBLinux module includes AMD driver and utilities;Driver for AMD серий Radeon R9 285/290/290X, Radeon R9 360/380/380X/390/390X, Radeon R9 Fury/Fury X/Nano, Radeon RX 400/500, Radeon RX Vega, Radeon VII, Radeon RX 5000/6000/7000 series video cards +2204;;vulkan-amdgpu-pro;vulkan-amdgpu-pro;UBLinux package includes AMD Vulkan driver and utilities;Driver for AMD Radeon™ R9 285/290/290X, Radeon™ R9 360/380/380X/390/390X, Radeon™ R9 Fury/Fury X/Nano, Radeon™ RX 400/500, Radeon™ RX Vega, Radeon™ VII, Radeon™ RX 5000/6000/7000 series video cards +2204;ubm-amdgpu-pro;;vulkan-amdgpu-pro;UBLinux module includes AMD driver and utilities;Driver for AMD серий Radeon™ R9 285/290/290X, Radeon™ R9 360/380/380X/390/390X, Radeon™ R9 Fury/Fury X/Nano, Radeon™ RX 400/500, Radeon™ RX Vega, Radeon™ VII, Radeon™ RX 5000/6000/7000 series video cards 2204;;xf86-video-intel;video-intel;UBLinux package includes Intel driver and utilities;Driver for video cards Intel i810/i830/i915/945G/G965+ and newer, except GMA 3600 2204;;xf86-video-amdgpu;video-amdgpu;UBLinux package includes AMD opensource driver;Opensource X.org amdgpu video driver for AMD graphics card 2204;;xf86-video-ati;video-ati;UBLinux package includes ATI opensource driver;Opensource X.org ati video driver for ATI graphics card 2204;;xf86-video-dummy;video-dummy;UBLinux package includes dummy driver;X.org dummy video driver 2204;;xf86-video-fbdev;video-fbdev;UBLinux package includes framebuffer video driver;X.org framebuffer video driver -2204;;xf86-video-openchrome;;UBLinux package includes VIA video driver;Open Source X driver for VIA IGPs -2204;;xf86-video-sisusb;;UBLinux package includes SiS video driver;X.org SiS USB video driver -2204;;xf86-video-vesa;;UBLinux package includes vesa video driver;X.org vesa video driver -2204;;xf86-video-vmware;;UBLinux package includes VMWare video driver;X.org vmware video driver -2204;;xf86-video-voodoo;;UBLinux package includes Voodoo video driver;X.org 3dfx Voodoo1/Voodoo2 2D video driver -2204;;xf86-video-qxl;;UBLinux package includes qxl video driver;X.org X11 qxl video driver \ No newline at end of file +2204;;xf86-video-openchrome;video-openchrome;UBLinux package includes VIA video driver;Open Source X driver for VIA IGPs +2204;;xf86-video-sisusb;video-sisusb;UBLinux package includes SiS video driver;X.org SiS USB video driver +2204;;xf86-video-vesa;video-vesa;UBLinux package includes vesa video driver;X.org vesa video driver +2204;;xf86-video-vmware;video-vmware;UBLinux package includes VMWare video driver;X.org vmware video driver +2204;;xf86-video-voodoo;video-voodoo;UBLinux package includes Voodoo video driver;X.org 3dfx Voodoo1/Voodoo2 2D video driver +2204;;xf86-video-qxl;video-qxl;UBLinux package includes qxl video driver;X.org X11 qxl video driver \ No newline at end of file From 350a1eb75fa2856fadf1afd474ceea6c6d0e507a Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Fri, 19 Apr 2024 18:05:27 +0600 Subject: [PATCH 8/8] Fixed custom config loading --- source/ubl-settings-video.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 9515259..6e4d504 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -574,7 +574,8 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ if (response == GTK_RESPONSE_ACCEPT){ char *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); if (!yon_char_is_empty(file)){ - path=file; + path=yon_char_unite("'",file,"'",NULL); + free(file); } gtk_widget_destroy(dialog); } else { @@ -720,6 +721,8 @@ void on_monitor_config_save(GtkWidget *self, monitor_edit_window *window){ yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,"disable"); if (main_display) yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,"primary"); + if (position) + yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,position); if (rotate) yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,rotate); char *final_string = yon_char_parsed_to_string(final_parsed,final_size,",");