master #64

Merged
asmeron merged 8 commits from YanTheKaller/ubl-settings-video:master into master 2 years ago

@ -517,27 +517,35 @@ void yon_interface_update(){
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeAMDCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeAMDCombo),0);
if (!yon_char_is_empty(optirun)){ if (!yon_char_is_empty(optirun)){
if (strcmp(optirun,"no")){
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),2); gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),2);
gtk_entry_set_text(GTK_ENTRY(main_config.widgets->OptirunEntry),optirun); 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)) } 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 else
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->OptirunCombo),0);
if (!yon_char_is_empty(primusrun)){ if (!yon_char_is_empty(primusrun)){
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),2); if (strcmp(primusrun,"no")){
gtk_entry_set_text(GTK_ENTRY(main_config.widgets->PrimusrunEntry),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);
} else {
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),1);
}
} else if (yon_char_is_empty(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 else
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),0); gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->PrimusrunCombo),0);
if (!yon_char_is_empty(gapfix1)) // if (!yon_char_is_empty(gapfix1))
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),2); // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),2);
else if (!yon_char_is_empty(gapfix2)) // else if (!yon_char_is_empty(gapfix2))
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),3); // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),3);
else // else
gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),1); // gtk_combo_box_set_active(GTK_COMBO_BOX(main_config.widgets->FailsafeNvidiaCombo),1);
yon_monitor_view_update(); yon_monitor_view_update();
} }
@ -553,6 +561,7 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
char *path=""; char *path="";
textdomain(template_ui_LocaleName); 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); 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); 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-services");
gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL); gtk_window_set_title(GTK_WINDOW(dialog),TITLE_LABEL);
@ -565,7 +574,8 @@ void yon_load_proceed(YON_CONFIG_TYPE type){
if (response == GTK_RESPONSE_ACCEPT){ if (response == GTK_RESPONSE_ACCEPT){
char *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog)); char *file = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(dialog));
if (!yon_char_is_empty(file)){ if (!yon_char_is_empty(file)){
path=file; path=yon_char_unite("'",file,"'",NULL);
free(file);
} }
gtk_widget_destroy(dialog); gtk_widget_destroy(dialog);
} else { } else {
@ -711,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"); yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,"disable");
if (main_display) if (main_display)
yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,"primary"); 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) if (rotate)
yon_char_parsed_add_or_create_if_exists(final_parsed,&final_size,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,","); char *final_string = yon_char_parsed_to_string(final_parsed,final_size,",");
@ -828,8 +840,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->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->UnsupportedCheck), "toggled", G_CALLBACK(on_resolutions_unsupported_show),monitors);
g_signal_connect(G_OBJECT(monitors->PortCombo), "changed", G_CALLBACK(on_port_chosen_changed),monitors); g_signal_connect(G_OBJECT(monitors->PortCombo), "changed", G_CALLBACK(on_port_chosen_changed),monitors);
yon_gtk_window_setup(GTK_WINDOW(monitors->MainWindow),GTK_WINDOW(main_config.widgets->Window),TITLE_LABEL,"com.ublinux.ubl-settings-video","VieoConfigWindow");
gtk_window_set_title(GTK_WINDOW(monitors->MainWindow),TITLE_LABEL);
char *target = (char*)gtk_label_get_text(GTK_LABEL(window->NameLabel)); char *target = (char*)gtk_label_get_text(GTK_LABEL(window->NameLabel));
@ -1256,7 +1267,8 @@ void yon_adapter_window_setup(main_window *widgets){
} }
void yon_set_sensitive_from_combo_box(GtkComboBox *toggle, GtkWidget *target){ 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) /** void yon_setup_widgets(main_window *widgets)

@ -1,38 +1,28 @@
.thin {
margin:0px;
padding:0px;
}
.noborder { .noborder {
border:none; border:none;
} }
.nobackground {
background:transparent;
}
.nobackground:active {
background:transparent;
}
.textHead{ .textHead{
text-shadow: 2px 2px @theme_bg_color; text-shadow: 2px 2px @theme_bg_color;
color: @theme_text_color; color: @theme_text_color;
} }
.thin {
margin:0px;
padding:0px;
}
.inherited>* { .inherited>* {
border:none; border:none;
background:inherit; background:inherit;
} }
.opacited {
opacity:0.98;
}
.borders {
border-radius: 2px;
border-width: 1px;
border-color: @theme_text_color;
}
.workingbg { .workingbg {
background:@theme_base_color; 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{ .menuitembottom{
margin-top:0px; margin-top:0px;
margin-bottom:3px; margin-bottom:3px;
@ -47,7 +37,7 @@ border-color: @theme_text_color;
border-left-width:inherit; border-left-width:inherit;
border-right-width:inherit; border-right-width:inherit;
} }
.menuitemtop{ .menuitemtop{
margin-bottom:0px; margin-bottom:0px;
border-color:inherit; border-color:inherit;
@ -55,19 +45,19 @@ border-color: @theme_text_color;
border-left-width:inherit; border-left-width:inherit;
border-right-width:inherit; border-right-width:inherit;
} }
.menuitemtop *{ .menuitemtop >*{
margin:2px 2px 0 2px; margin:4px 2px 0 2px;
padding: 5px 10px 3px 5px; padding: 3px 10px 3px 5px;
border:transparent; border:transparent;
} }
.menuitemmiddle *{ .menuitemmiddle >*{
margin:0 2px 0 2px; margin:0 2px 0 2px;
padding: 3px 10px 3px 5px; padding: 3px 10px 3px 5px;
border:transparent; border:transparent;
} }
.menuitembottom *{ .menuitembottom >*{
margin:0 2px 2px 2px; margin:0 2px 2px 2px;
padding: 3px 10px 5px 5px; padding: 3px 10px 3px 5px;
} }
.menuitemtop:hover { .menuitemtop:hover {
background:@theme_bg_color; background:@theme_bg_color;
@ -90,25 +80,24 @@ border-color: @theme_text_color;
border-right-width:inherit; border-right-width:inherit;
} }
.menuitemtop:hover* { .menuitemtop:hover>* {
margin:2px 2px 0 2px; margin:4px 2px 0 2px;
padding: 5px 10px 3px 5px; padding: 3px 10px 3px 5px;
background:@theme_selected_bg_color; background:@theme_selected_bg_color;
border-radius:2px; border-radius:2px;
} }
.menuitemmiddle:hover* { .menuitemmiddle:hover>* {
margin:0 2px 0 2px; margin:0 2px 0 2px;
padding: 3px 10px 3px 5px; padding: 3px 10px 3px 5px;
background:@theme_selected_bg_color; background:@theme_selected_bg_color;
border-radius:2px; border-radius:2px;
} }
.menuitembottom:hover* { .menuitembottom:hover>* {
margin:0 2px 2px 2px; margin:0 2px 2px 2px;
padding: 3px 10px 5px 5px; padding: 3px 10px 3px 5px;
background:@theme_selected_bg_color; background:@theme_selected_bg_color;
border-radius:2px; border-radius:2px;
} }
.boxInfoMessError{ .boxInfoMessError{
background-color: #ea9999; background-color: #ea9999;
} }
@ -116,7 +105,35 @@ border-color: @theme_text_color;
.boxInfoMessOK{ .boxInfoMessOK{
background-color: #f3f0ac; background-color: #f3f0ac;
} }
.errorBox {
border-width: 2px;
border-color: #ea9999;
border-style:solid;
}
.chosenOutline{
transition: 0ms;
border-width: 1px;
border-color: #f3f0ac;
border-style:solid;
}
.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{ .marginright image{
margin-right: 2px; margin-right: 2px;
} }
treeview row:nth-child(odd) { background-color: #000000; }
treeview row:nth-child(even) { background-color: #ffffff; }

@ -884,6 +884,7 @@
<child> <child>
<object class="GtkEntry" id="OptirunEntry"> <object class="GtkEntry" id="OptirunEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
</object> </object>
<packing> <packing>
@ -949,6 +950,7 @@
<child> <child>
<object class="GtkEntry" id="PrimusrunEntry"> <object class="GtkEntry" id="PrimusrunEntry">
<property name="visible">True</property> <property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can-focus">True</property> <property name="can-focus">True</property>
</object> </object>
<packing> <packing>

@ -497,7 +497,7 @@ msgstr "Пакет с драйвером и утилитами AMD с подде
#: source/ubl-strings.h:125 #: source/ubl-strings.h:125
msgid "Important field is empty" msgid "Important field is empty"
msgstr "Пустое важное полу" msgstr "Пустое важное поле"
#: source/ubl-strings.h:127 #: source/ubl-strings.h:127
msgid "Load drivers from database" msgid "Load drivers from database"

@ -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;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;;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;;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;;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;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-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-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-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-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-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-openchrome;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-sisusb;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-vesa;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-vmware;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-voodoo;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 2204;;xf86-video-qxl;video-qxl;UBLinux package includes qxl video driver;X.org X11 qxl video driver
1 OS_VERSION_ID DRV_PAСKAGE_UBM DRV_PAСKAGE DRV_NAME DRV_DESCRIPTION DRV_SUPPORT
8 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
9 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
10 2204 xf86-video-nouveau video-nouveau UBLinux package includes opensource driver NVIDIA Open source nvidia graphics card driver
11 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 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
12 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 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
13 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
14 2204 xf86-video-amdgpu video-amdgpu UBLinux package includes AMD opensource driver Opensource X.org amdgpu video driver for AMD graphics card
15 2204 xf86-video-ati video-ati UBLinux package includes ATI opensource driver Opensource X.org ati video driver for ATI graphics card
16 2204 xf86-video-dummy video-dummy UBLinux package includes dummy driver X.org dummy video driver
17 2204 xf86-video-fbdev video-fbdev UBLinux package includes framebuffer video driver X.org framebuffer video driver
18 2204 xf86-video-openchrome video-openchrome UBLinux package includes VIA video driver Open Source X driver for VIA IGPs
19 2204 xf86-video-sisusb video-sisusb UBLinux package includes SiS video driver X.org SiS USB video driver
20 2204 xf86-video-vesa video-vesa UBLinux package includes vesa video driver X.org vesa video driver
21 2204 xf86-video-vmware video-vmware UBLinux package includes VMWare video driver X.org vmware video driver
22 2204 xf86-video-voodoo video-voodoo UBLinux package includes Voodoo video driver X.org 3dfx Voodoo1/Voodoo2 2D video driver
23 2204 xf86-video-qxl video-qxl UBLinux package includes qxl video driver X.org X11 qxl video driver
Loading…
Cancel
Save