Applications
/
ubl-settings-video
10
0
Fork 2
Code Issues 5 Pull Requests Packages Projects Releases Wiki Activity

Fixes for second display info render; AMD recognition fixes

Browse Source
pull/55/head
Ivan Dmitrievich Yartsev 2 years ago
parent ebfb3ea809
commit 3fae61a60a
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File

14
source/ubl-settings-video.c
Unescape View File

@ -1130,7 +1130,7 @@ dictionary *yon_proprieary_get(){
if (strstr(adapter[i],"vendor=")){ if (strstr(adapter[i],"vendor=")){
if (strstr(adapter[i],"Intel")) if (strstr(adapter[i],"Intel"))
flag |= (1<<0); flag |= (1<<0);
else if (strstr(adapter[i],"AMD")) else if (strstr(adapter[i],"AMD")||strstr(adapter[i],"Advanced Micro Devices"))
flag |= (1<<1); flag |= (1<<1);
else if (strstr(adapter[i],"NVIDIA")) else if (strstr(adapter[i],"NVIDIA"))
flag |= (1<<2); flag |= (1<<2);
@ -1526,7 +1526,7 @@ void yon_monitor_set_resolutions(){
void yon_adapter_window_setup(widgets_dict *widgets){ void yon_adapter_window_setup(widgets_dict *widgets){
int size=0; int size=0;
gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InformationOverlay),widgets->InformationCompanyLogoImage); gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InformationOverlay),widgets->InformationCompanyLogoImage);
config_str rtn=yon_config_load(get_adapter_info,&size); config_str rtn = yon_config_load(get_adapter_info,&size);
char *desc = yon_config_get_parameter(rtn,size,"description"); char *desc = yon_config_get_parameter(rtn,size,"description");
yon_char_divide_search(desc,"=",-1); yon_char_divide_search(desc,"=",-1);
char *product = yon_config_get_parameter(rtn,size,"product"); char *product = yon_config_get_parameter(rtn,size,"product");
@ -1551,7 +1551,7 @@ void yon_adapter_window_setup(widgets_dict *widgets){
GtkIconTheme *icthm=gtk_icon_theme_get_default(); GtkIconTheme *icthm=gtk_icon_theme_get_default();
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.nvidia-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL)); gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.nvidia-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
} }
else if (strstr(vendor,"AMD")){ else if (strstr(vendor,"AMD")||strstr(vendor,"Advanced Micro Devices")){
GtkIconTheme *icthm=gtk_icon_theme_get_default(); GtkIconTheme *icthm=gtk_icon_theme_get_default();
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.amd-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL)); gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.amd-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
} }
@ -1565,10 +1565,8 @@ void yon_adapter_window_setup(widgets_dict *widgets){
if (size>5){ if (size>5){
gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InformationOverlay2),widgets->InformationCompanyLogoImage2); gtk_overlay_add_overlay(GTK_OVERLAY(widgets->InformationOverlay2),widgets->InformationCompanyLogoImage2);
rtn=yon_char_parsed_rip(rtn,&size,0); rtn=yon_char_parsed_rip(rtn,&size,0);
rtn=yon_char_parsed_rip(rtn,&size,1); rtn=yon_char_parsed_rip(rtn,&size,0);
rtn=yon_char_parsed_rip(rtn,&size,2); rtn=yon_char_parsed_rip(rtn,&size,0);
rtn=yon_char_parsed_rip(rtn,&size,3);
rtn=yon_char_parsed_rip(rtn,&size,4);
char *desc = yon_config_get_parameter(rtn,size,"description"); char *desc = yon_config_get_parameter(rtn,size,"description");
yon_char_divide_search(desc,"=",-1); yon_char_divide_search(desc,"=",-1);
char *product = yon_config_get_parameter(rtn,size,"product"); char *product = yon_config_get_parameter(rtn,size,"product");
@ -1593,7 +1591,7 @@ void yon_adapter_window_setup(widgets_dict *widgets){
GtkIconTheme *icthm=gtk_icon_theme_get_default(); GtkIconTheme *icthm=gtk_icon_theme_get_default();
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage2),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.nvidia-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL)); gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage2),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.nvidia-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
} }
else if (strstr(vendor,"AMD")){ else if (strstr(vendor,"AMD"),strstr(vendor,"Advanced Micro Devices")){
GtkIconTheme *icthm=gtk_icon_theme_get_default(); GtkIconTheme *icthm=gtk_icon_theme_get_default();
gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage2),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.amd-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL)); gtk_image_set_from_pixbuf(GTK_IMAGE(widgets->InformationCompanyLogoImage2),gtk_icon_info_load_icon(gtk_icon_theme_lookup_icon_for_scale(icthm, "com.ublinux.ubl-settings-video.amd-logo",64,1,GTK_ICON_LOOKUP_FORCE_SVG),NULL));
} }

1
ubl-settings-video.glade
Unescape View File

@ -1901,7 +1901,6 @@ translated and supported by community.</property>
<property name="can-focus">False</property> <property name="can-focus">False</property>
<property name="valign">start</property> <property name="valign">start</property>
<property name="margin-top">30</property> <property name="margin-top">30</property>
<property name="label" translatable="yes">&lt;span size='15pt'&gt;&lt;span color='#1a5fb4'&gt;sdrtjhsrtjh:&lt;/span&gt; dfuykdftytdykkdfty&lt;/span&gt;</property>
<property name="use-markup">True</property> <property name="use-markup">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="yalign">0</property> <property name="yalign">0</property>

Write Preview
Loading…
Cancel
Save