ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

GSdx: A bit more work on the Linux dialog box. 

git-svn-id: http://pcsx2.googlecode.com/svn/trunk@4369 96395faa-99c1-11dd-bbfe-3dabce05a288
This commit is contained in:
arcum42 2011-02-26 05:19:18 +00:00
parent 2b885abde9
commit 9d26ae1241
2 changed files with 24 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3rdparty/SDL-1.3.0-5387/include/SDL_config_linux.h vendored
View File

@ -137,7 +137,7 @@
#define HAVE_SSCANF 1 #define HAVE_SSCANF 1
#define HAVE_SNPRINTF 1 #define HAVE_SNPRINTF 1
#define HAVE_VSNPRINTF 1 #define HAVE_VSNPRINTF 1
#define HAVE_M_PI #define HAVE_M_PI
#define HAVE_ATAN 1 #define HAVE_ATAN 1
#define HAVE_ATAN2 1 #define HAVE_ATAN2 1
#define HAVE_CEIL 1 #define HAVE_CEIL 1

48
plugins/GSdx/GSLinuxDialog.cpp
View File

@ -48,7 +48,7 @@ bool RunLinuxDialog()
GtkWidget *render_label, *render_combo_box; GtkWidget *render_label, *render_combo_box;
GtkWidget *interlace_label, *interlace_combo_box; GtkWidget *interlace_label, *interlace_combo_box;
GtkWidget *aspect_label, *aspect_combo_box; GtkWidget *aspect_label, *aspect_combo_box;
GtkWidget *texture_check, *log_check, *an_8_bit_check, *alpha_check, *aa_check, *win_check; GtkWidget *filter_check, *logz_check, *paltex_check, *fba_check, *aa_check, *win_check;
int return_value; int return_value;
/* Create the widgets */ /* Create the widgets */
@ -136,27 +136,27 @@ bool RunLinuxDialog()
gtk_container_add(GTK_CONTAINER(main_box), aspect_combo_box); gtk_container_add(GTK_CONTAINER(main_box), aspect_combo_box);
texture_check = gtk_check_button_new_with_label("Texture Filtering"); filter_check = gtk_check_button_new_with_label("Texture Filtering");
log_check = gtk_check_button_new_with_label("Logarithmic Z"); logz_check = gtk_check_button_new_with_label("Logarithmic Z");
an_8_bit_check = gtk_check_button_new_with_label("Allow 8 bit textures"); paltex_check = gtk_check_button_new_with_label("Allow 8 bit textures");
alpha_check = gtk_check_button_new_with_label("Alpha correction (FBA)"); fba_check = gtk_check_button_new_with_label("Alpha correction (FBA)");
aa_check = gtk_check_button_new_with_label("Edge anti-aliasing"); aa_check = gtk_check_button_new_with_label("Edge anti-aliasing");
win_check = gtk_check_button_new_with_label("Disable Effects Processing"); win_check = gtk_check_button_new_with_label("Disable Effects Processing");
gtk_container_add(GTK_CONTAINER(main_box), texture_check); gtk_container_add(GTK_CONTAINER(main_box), filter_check);
gtk_container_add(GTK_CONTAINER(main_box), log_check); gtk_container_add(GTK_CONTAINER(main_box), logz_check);
gtk_container_add(GTK_CONTAINER(main_box), an_8_bit_check); gtk_container_add(GTK_CONTAINER(main_box), paltex_check);
gtk_container_add(GTK_CONTAINER(main_box), alpha_check); gtk_container_add(GTK_CONTAINER(main_box), fba_check);
gtk_container_add(GTK_CONTAINER(main_box), aa_check); gtk_container_add(GTK_CONTAINER(main_box), aa_check);
gtk_container_add(GTK_CONTAINER(main_box), win_check); gtk_container_add(GTK_CONTAINER(main_box), win_check);
// These should be set to their actual values, not false. // Filter should be 3 states, not 2.
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(texture_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(filter_check), theApp.GetConfig("filter", 1));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(log_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(logz_check), theApp.GetConfig("logz", 1));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(an_8_bit_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(paltex_check), theApp.GetConfig("paltex", 0));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(alpha_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fba_check), theApp.GetConfig("fba", 1));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(aa_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(aa_check), theApp.GetConfig("aa1", 0));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win_check), false); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(win_check), theApp.GetConfig("windowed", 1));
gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), main_frame); gtk_container_add (GTK_CONTAINER(gtk_dialog_get_content_area(GTK_DIALOG(dialog))), main_frame);
gtk_widget_show_all (dialog); gtk_widget_show_all (dialog);
@ -179,17 +179,15 @@ bool RunLinuxDialog()
if (gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box)) != -1) if (gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box)) != -1)
aspect = gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box)); aspect = gtk_combo_box_get_active(GTK_COMBO_BOX(aspect_combo_box));
texture = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(texture_check));
log = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(log_check));
8_bit = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(an_8_bit_check));
alpha = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(alpha_check));
aa = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(aa_check));
windowed = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win_check));
#endif #endif
theApp.SetConfig("filter", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(filter_check)));
theApp.SetConfig("logz", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(logz_check)));
theApp.SetConfig("paltex", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(paltex_check)));
theApp.SetConfig("fba", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fba_check)));
theApp.SetConfig("aa1", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(aa_check)));
theApp.SetConfig("windowed", (int)gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(win_check)));
gtk_widget_destroy (dialog); gtk_widget_destroy (dialog);
return true; return true;