master #49

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

@ -360,10 +360,10 @@ void on_auto_choose_drivers(GtkWidget *self, widgets_dict *widgets)
{ {
int state = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self)); int state = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(self));
videoconfig.autoChooseDrivers=state; videoconfig.autoChooseDrivers=state;
gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaLabel, !state); // gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaLabel, !state);
gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDCombo, !state); // gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDCombo, !state);
gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDLabel, !state); // gtk_widget_set_sensitive(widgets->mainDriverFailsafeAMDLabel, !state);
gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaCombo, !state); // gtk_widget_set_sensitive(widgets->mainDriverFailsafeNvidiaCombo, !state);
} }
char *yon_configuration_get_save_command(char *command){ char *yon_configuration_get_save_command(char *command){
@ -380,9 +380,9 @@ char *yon_configuration_get_save_command(char *command){
str = yon_char_append(str, yon_char_append(" FAILSAFEATI=", videoconfig.failsafeATI)); str = yon_char_append(str, yon_char_append(" FAILSAFEATI=", videoconfig.failsafeATI));
else else
str = yon_char_append(str," FAILSAFEATI=\"\""); str = yon_char_append(str," FAILSAFEATI=\"\"");
str=yon_char_append(str," VGADRV_AUTO=NO"); str=yon_char_append(str," VGADRV_AUTO=no");
} else { } else {
str = yon_char_unite(str, " FAILSAFENVIDIA=\"\" FAILSAFEATI=\"\" VGADRV_AUTO=YES", NULL); str = yon_char_unite(str, " FAILSAFENVIDIA=\"\" FAILSAFEATI=\"\" VGADRV_AUTO=yes", NULL);
} }
if (videoconfig.optirun&&strcmp(videoconfig.optirun, dntus)!=0&&strcmp(videoconfig.optirun, "")!=0) if (videoconfig.optirun&&strcmp(videoconfig.optirun, dntus)!=0&&strcmp(videoconfig.optirun, "")!=0)
@ -561,7 +561,7 @@ void on_proprietary_get(GtkWidget *self, gpointer data){
void on_monitor_configure(GtkWidget *self,monitor_window *window){ void on_monitor_configure(GtkWidget *self,monitor_window *window){
if(window&&window->config){ if(window&&window->config){
monitor_edit_window *monitors = new(monitor_edit_window); monitor_edit_window *monitors = new(monitor_edit_window);
GtkBuilder *builder = gtk_builder_new_from_resource(glade_path); GtkBuilder *builder = gtk_builder_new_from_resource(glade_path_configuration);
monitors->templateMonitorConfigurationWindow = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationWindow")); monitors->templateMonitorConfigurationWindow = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationWindow"));
monitors->mainMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "mainMonitorConfigurationBox")); monitors->mainMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "mainMonitorConfigurationBox"));
monitors->templateMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationBox")); monitors->templateMonitorConfigurationBox = GTK_WIDGET(gtk_builder_get_object(builder, "templateMonitorConfigurationBox"));
@ -1260,7 +1260,7 @@ void yon_setup_config(char *configcommand)
param=yon_config_get_parameter(videoconfig.loaded_config,videoconfig.configsize,"VGADRV_AUTO"); param=yon_config_get_parameter(videoconfig.loaded_config,videoconfig.configsize,"VGADRV_AUTO");
if (param){ if (param){
yon_char_divide_search(param,"=",-1); yon_char_divide_search(param,"=",-1);
if (strcmp(param,"NO")!=0) if (strcmp(param,"no")!=0)
videoconfig.autoChooseDrivers=1; videoconfig.autoChooseDrivers=1;
} }
@ -1664,7 +1664,7 @@ void yon_setup_widgets(widgets_dict *widgets)
g_signal_connect(G_OBJECT(widgets->driversInstallButton), "clicked", G_CALLBACK(on_driver_install), widgets); g_signal_connect(G_OBJECT(widgets->driversInstallButton), "clicked", G_CALLBACK(on_driver_install), widgets);
g_signal_connect(G_OBJECT(widgets->driversInfoButton), "clicked", G_CALLBACK(on_driver_info), widgets); g_signal_connect(G_OBJECT(widgets->driversInfoButton), "clicked", G_CALLBACK(on_driver_info), widgets);
// g_signal_connect(G_OBJECT(widgets->mainDriverAutomaticallyChooseCheck), "toggled", G_CALLBACK(on_auto_choose_drivers), widgets); g_signal_connect(G_OBJECT(widgets->mainDriverAutomaticallyChooseCheck), "toggled", G_CALLBACK(on_auto_choose_drivers), widgets);
// g_signal_connect(G_OBJECT(widgets->mainHybridGraphicsDiscreteCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets); // g_signal_connect(G_OBJECT(widgets->mainHybridGraphicsDiscreteCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets);
g_signal_connect(G_OBJECT(widgets->mainExtraLaunchOptirunCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets->mainExtraLaunchOptirunEntry); g_signal_connect(G_OBJECT(widgets->mainExtraLaunchOptirunCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets->mainExtraLaunchOptirunEntry);
g_signal_connect(G_OBJECT(widgets->mainExtraLaunchPrismusunCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets->mainExtraLaunchPrismusunEntry); g_signal_connect(G_OBJECT(widgets->mainExtraLaunchPrismusunCheck), "toggled", G_CALLBACK(on_sensitive_change), widgets->mainExtraLaunchPrismusunEntry);

Loading…
Cancel
Save