From 42d16ebbd0ee183c585451081143a38aae5976f7 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 22 Apr 2024 11:48:37 +0600 Subject: [PATCH 1/4] Fixed parameters --- source/ubl-settings-video.c | 43 ++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 6e4d504..827f62b 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -450,6 +450,15 @@ void yon_interface_save(){ yon_config_remove_by_key(GL_YIELD); break; } + switch (gtk_combo_box_get_active(GTK_COMBO_BOX(main_config.widgets->DisplayDiscreteOnly))){ + case 0: + yon_config_remove_by_key(INTEGRATEDVGA); + break; + case 1:yon_config_register(INTEGRATEDVGA,INTEGRATEDVGA_command,"no"); + break; + case 2:yon_config_register(INTEGRATEDVGA,INTEGRATEDVGA_command,"yes "); + break; + } } void yon_interface_update(){ @@ -464,8 +473,8 @@ void yon_interface_update(){ char *freedrivers = yon_config_get_by_key(VGADRV_NOFREE); char *dpms= yon_config_get_by_key(XORG_EXT); char *dpi = yon_config_get_by_key(XORG_DPI); - char *failsafenvidia = yon_config_get_by_key(FAILSAFEATI); - char *failsafeati = yon_config_get_by_key(FAILSAFENVIDIA); + char *failsafenvidia = yon_config_get_by_key(FAILSAFENVIDIA); + char *failsafeati = yon_config_get_by_key(FAILSAFEATI); char *optirun = yon_config_get_by_key(OPTIRUN); char *primusrun = yon_config_get_by_key(PRIMUSRUN); char *discrete = yon_config_get_by_key(INTEGRATEDVGA); @@ -491,9 +500,9 @@ void yon_interface_update(){ gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FreeDriverCombo),0); if (!yon_char_is_empty(dpi)&&!strcmp(dpi,"auto")) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeAMDCombo),1); + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DisplayScalingCombo),1); else if (yon_char_is_empty(dpi)) - gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeAMDCombo),0); + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DisplayScalingCombo),0); else{ if (!strcmp(dpi,"2K")||!strcmp(dpi,"4K")){ gtk_combo_box_set_active_id(GTK_COMBO_BOX(main_config.widgets),dpi); @@ -539,6 +548,20 @@ void yon_interface_update(){ 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(dpms)&&!strcmp(dpms,"dpms")) + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DontSwitchDisplaysOffCombo),2); + else if (!yon_char_is_empty(dpms)&&!strcmp(dpms,"nodpms")) + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DontSwitchDisplaysOffCombo),1); + else + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DontSwitchDisplaysOffCombo),0); + + if (!yon_char_is_empty(discrete)&&!strcmp(discrete,"yes")) + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DisplayDiscreteOnly),2); + else if (!yon_char_is_empty(discrete)&&!strcmp(discrete,"no")) + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DisplayDiscreteOnly),1); + else + gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->DisplayDiscreteOnly),0); // if (!yon_char_is_empty(gapfix1)) // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),2); @@ -688,6 +711,7 @@ void on_monitor_config_save(GtkWidget *self, monitor_edit_window *window){ int modeline_cvt = 0; int cvt_reduced = 0; int modeline_gtf = 0; + int do_not_switch_off = 0; enabled = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->EnableCheck)); if (gtk_combo_box_get_active(GTK_COMBO_BOX(window->PortCombo))){ target = gtk_combo_box_text_get_active_text(GTK_COMBO_BOX_TEXT(window->PortCombo)); @@ -704,6 +728,7 @@ void on_monitor_config_save(GtkWidget *self, monitor_edit_window *window){ modeline_cvt = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ModelineCVTCheck)); cvt_reduced = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->UseCVTReducedCheck)); modeline_gtf = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->ModelineGTFCheck)); + do_not_switch_off = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(window->DoNotSwitchOffCheck)); int final_size; config_str final_parsed=NULL; @@ -721,6 +746,11 @@ 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 (do_not_switch_off){ + yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,"dpms"); + }else{ + yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,"nodpms"); + } if (position) yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,position); if (rotate) @@ -751,8 +781,10 @@ void yon_monitor_parse(monitor_edit_window *window, char *string){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->UseCVTReducedCheck),1); } else if (!strcmp(parsed[i],"dpms")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DoNotSwitchOffCheck),1); } else if (!strcmp(parsed[i],"nodpms")){ + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->DoNotSwitchOffCheck),0); } else if (!strcmp(parsed[i],"enable")){ gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(window->EnableCheck),1); @@ -768,7 +800,8 @@ void yon_monitor_parse(monitor_edit_window *window, char *string){ } else if (strstr(parsed[i],"lo:")||strstr(parsed[i],"LeftOf:")){ char *location = yon_char_divide_search(parsed[i],":",-1); - yon_gtk_combo_box_text_find(window->PositionPortCombo,parsed[i]); + int target = yon_gtk_combo_box_text_find(window->PositionPortCombo,parsed[i]); + gtk_combo_box_set_active(GTK_COMBO_BOX(window->RotationCombo),target); gtk_combo_box_set_active(GTK_COMBO_BOX(window->PositionPosCombo),1); } else if (strstr(parsed[i],"ro:")||strstr(parsed[i],"RightOf:")){ -- 2.35.1 From f34415427d8b5efa588f935503a36531b1f94d4c Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 22 Apr 2024 11:59:31 +0600 Subject: [PATCH 2/4] Fixed icon name for loading config menu --- source/ubl-settings-video.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 827f62b..611a43d 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -586,7 +586,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){ 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_icon_name(GTK_WINDOW(dialog),"com.ublinux.ubl-settings-video"); gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL); GtkFileFilter *filter = gtk_file_filter_new(); gtk_file_filter_add_pattern(filter,"*.ini"); -- 2.35.1 From 2aad1dd4426771e2bca431adaa9a03a5086baea8 Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 22 Apr 2024 13:00:48 +0600 Subject: [PATCH 3/4] Fixed blocking of deleted monitor porst from configuration; Fixed monitor deletion --- source/ubl-settings-video.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/source/ubl-settings-video.c b/source/ubl-settings-video.c index 611a43d..56f4160 100644 --- a/source/ubl-settings-video.c +++ b/source/ubl-settings-video.c @@ -667,6 +667,10 @@ void on_monitor_delete(GtkWidget *self,monitor_data *window){ GtkWidget *target = gtk_widget_get_parent(window->ScreenOverlay); GtkWidget *flow_box = gtk_widget_get_parent(target); gtk_container_remove(GTK_CONTAINER(flow_box),target); + const char *target_monitor = gtk_label_get_text(GTK_LABEL(window->NameLabel)); + if (!yon_char_is_empty(target_monitor)){ + yon_config_remove_by_key(XORG_MONITOR((char*)target_monitor)); + } free(window); } } @@ -888,7 +892,7 @@ void on_monitor_configure(GtkWidget *self,monitor_data *window){ } for (int i=0;iPortCombo),main_config.ports[i]); } -- 2.35.1 From f97e51efb09fe3fc82506f7f98916a6b0e25232b Mon Sep 17 00:00:00 2001 From: Ivan Yarcev Date: Mon, 22 Apr 2024 14:08:17 +0600 Subject: [PATCH 4/4] Localisation fix --- source/ubl-strings.h | 2 +- ubl-settings-video-configuration.glade | 5 +++-- ubl-settings-video.pot | 2 +- ubl-settings-video_ru.po | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/source/ubl-strings.h b/source/ubl-strings.h index 5ebfea5..ad39d25 100644 --- a/source/ubl-strings.h +++ b/source/ubl-strings.h @@ -4,7 +4,7 @@ #define MONITOR_LABEL _("Monitor ") #define TITLE_LABEL _("Video adapter and display settings") #define TITLE_INFO_LABEL _("Video output settings and video card drivers installation") -#define MONITOR_PORT_LABEL _("Port: ") +#define MONITOR_PORT_LABEL _("Port:") #define MONITOR_RESOLUTION_LABEL _("Resolution (px): ") #define MONITOR_FREQUENCY_LABEL _("Frequency (Hz): ") #define MONITOR_ROTATION_LABEL _("Rotation: ") diff --git a/ubl-settings-video-configuration.glade b/ubl-settings-video-configuration.glade index 04214f2..944db36 100644 --- a/ubl-settings-video-configuration.glade +++ b/ubl-settings-video-configuration.glade @@ -1,7 +1,8 @@ - + + False True @@ -88,7 +89,7 @@ True False - Port + Port: False diff --git a/ubl-settings-video.pot b/ubl-settings-video.pot index 8b19400..f3c5fbb 100644 --- a/ubl-settings-video.pot +++ b/ubl-settings-video.pot @@ -102,7 +102,7 @@ msgid "Video output settings and video card drivers installation" msgstr "" #: source/ubl-strings.h:7 -msgid "Port: " +msgid "Port:" msgstr "" #: source/ubl-strings.h:8 diff --git a/ubl-settings-video_ru.po b/ubl-settings-video_ru.po index 6158f34..ae7a40d 100644 --- a/ubl-settings-video_ru.po +++ b/ubl-settings-video_ru.po @@ -102,7 +102,7 @@ msgid "Video output settings and video card drivers installation" msgstr "Настройка вывода изображения и установка драйвера видеокарты" #: source/ubl-strings.h:7 -msgid "Port: " +msgid "Port:" msgstr "Порт: " #: source/ubl-strings.h:8 -- 2.35.1