diff --git a/plugins/zzogl-pg/opengl/Linux/Linux.cpp b/plugins/zzogl-pg/opengl/Linux/Linux.cpp index 04a3ba7a4b..327c74b938 100644 --- a/plugins/zzogl-pg/opengl/Linux/Linux.cpp +++ b/plugins/zzogl-pg/opengl/Linux/Linux.cpp @@ -23,13 +23,6 @@ #include #include "GS.h" - -extern "C" { -#include "interface.h" -#include "support.h" -#include "callbacks.h" -} - #include "Linux.h" #include @@ -91,86 +84,6 @@ void CALLBACK GSkeyEvent(keyEvent *ev) } } -void OnConf_Ok(GtkButton *button, gpointer user_data) -{ - GtkWidget *treeview; - GtkTreeModel *treemodel; - GtkTreeIter treeiter; - gboolean treeoptval; - - conf.bilinear = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(lookup_widget(Conf, "checkBilinear"))); - // restore - if (conf.bilinear && prevbilinearfilter) - conf.bilinear = prevbilinearfilter; - - //conf.mrtdepth = 1;//IsDlgButtonChecked(hW, IDC_CONFIG_DEPTHWRITE); - - if is_checked(Conf, "radioAANone") - conf.aa = 0; - else if is_checked(Conf, "radioAA2X") - conf.aa = 1; - else if is_checked(Conf, "radioAA4X") - conf.aa = 2; - else if is_checked(Conf, "radioAA8X") - conf.aa = 3; - else - conf.aa = 4; - conf.negaa = 0; - - conf.options = 0; - conf.options |= is_checked(Conf, "checkAVI") ? GSOPTION_CAPTUREAVI : 0; - conf.options |= is_checked(Conf, "checkWireframe") ? GSOPTION_WIREFRAME : 0; - conf.options |= is_checked(Conf, "checkfullscreen") ? GSOPTION_FULLSCREEN : 0; - conf.options |= is_checked(Conf, "checkwidescreen") ? GSOPTION_WIDESCREEN : 0; - conf.options |= is_checked(Conf, "checkTGA") ? GSOPTION_TGASNAP : 0; - - if is_checked(Conf, "radiointerlace0") - conf.interlace = 0; - else if is_checked(Conf, "radiointerlace1") - conf.interlace = 1; - else - conf.interlace = 2; - - //------- get advanced options from the treeview model -------// - treeview = lookup_widget(Conf,"treeview1"); - treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); - gtk_tree_model_get_iter_first(treemodel, &treeiter); - - conf.gamesettings = 0; - for(map::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it) - { - treeoptval = FALSE; - gtk_tree_model_get(treemodel, &treeiter, 0, &treeoptval, -1); - - if(treeoptval) conf.gamesettings |= it->second.value; - - gtk_tree_model_iter_next(treemodel,&treeiter); - } - - GSsetGameCRC(0, conf.gamesettings); - //---------- done getting advanced options ---------// - - if is_checked(Conf, "radioSize640") - conf.options |= GSOPTION_WIN640; - else if is_checked(Conf, "radioSize800") - conf.options |= GSOPTION_WIN800; - else if is_checked(Conf, "radioSize1024") - conf.options |= GSOPTION_WIN1024; - else if is_checked(Conf, "radioSize1280") - conf.options |= GSOPTION_WIN1280; - - SaveConfig(); - - gtk_widget_destroy(Conf); - gtk_main_quit(); -} - -void OnConf_Cancel(GtkButton *button, gpointer user_data) -{ - gtk_widget_destroy(Conf); - gtk_main_quit(); -} - void add_map_entry(u32 option, const char *key, const char *desc) { confOpts.value = option; @@ -178,52 +91,16 @@ void add_map_entry(u32 option, const char *key, const char *desc) mapConfOpts[key] = confOpts; } -void CALLBACK GSconfigure() +void CreateGameHackTable(GtkWidget *treeview) { char descbuf[255]; bool itval; - GtkWidget *treeview; GtkCellRenderer *treerend; GtkListStore *treestore;//Gets typecast as GtkTreeModel as needed. GtkTreeIter treeiter; GtkTreeViewColumn *treecol; - - char strcurdir[256]; - getcwd(strcurdir, 256); - if (!(conf.options & GSOPTION_LOADED)) LoadConfig(); - Conf = create_Config(); - - // fixme; Need to check "checkInterlace" as well. - if (conf.interlace == 0) - set_checked(Conf, "radiointerlace0", true); - else if (conf.interlace == 1) - set_checked(Conf, "radiointerlace1", true); - else - set_checked(Conf, "radionointerlace", true); - - set_checked(Conf, "checkBilinear", !!conf.bilinear); - //set_checked(Conf, "checkbutton6", conf.mrtdepth); - set_checked(Conf, "radioAANone", (conf.aa==0)); - set_checked(Conf, "radioAA2X", (conf.aa==1)); - set_checked(Conf, "radioAA4X", (conf.aa==2)); - set_checked(Conf, "radioAA8X", (conf.aa==3)); - set_checked(Conf, "radioAA16X", (conf.aa==4)); - set_checked(Conf, "checkWireframe", (conf.options&GSOPTION_WIREFRAME)?1:0); - set_checked(Conf, "checkAVI", (conf.options&GSOPTION_CAPTUREAVI)?1:0); - set_checked(Conf, "checkfullscreen", (conf.options&GSOPTION_FULLSCREEN)?1:0); - set_checked(Conf, "checkwidescreen", (conf.options&GSOPTION_WIDESCREEN)?1:0); - set_checked(Conf, "checkTGA", (conf.options&GSOPTION_TGASNAP)?1:0); - - set_checked(Conf, "radioSize640", ((conf.options&GSOPTION_WINDIMS)>>4)==0); - set_checked(Conf, "radioSize800", ((conf.options&GSOPTION_WINDIMS)>>4)==1); - set_checked(Conf, "radioSize1024", ((conf.options&GSOPTION_WINDIMS)>>4)==2); - set_checked(Conf, "radioSize1280", ((conf.options&GSOPTION_WINDIMS)>>4)==3); - - prevbilinearfilter = conf.bilinear; - //--------- Let's build a treeview for our advanced options! --------// - treeview = lookup_widget(Conf,"treeview1"); treestore = gtk_list_store_new(2,G_TYPE_BOOLEAN, G_TYPE_STRING); //setup columns in treeview @@ -285,10 +162,31 @@ void CALLBACK GSconfigure() //don't select/highlight rows gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(treeview)), GTK_SELECTION_NONE); //------treeview done -------// +} - //Let's do it! - gtk_widget_show_all(Conf); - gtk_main(); +void SaveGameHackTable(GtkWidget *treeview) +{ + GtkTreeModel *treemodel; + GtkTreeIter treeiter; + gboolean treeoptval; + + //------- get advanced options from the treeview model -------// + treemodel = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); + gtk_tree_model_get_iter_first(treemodel, &treeiter); + + conf.gamesettings = 0; + for(map::iterator it = mapConfOpts.begin(); it != mapConfOpts.end(); ++it) + { + treeoptval = FALSE; + gtk_tree_model_get(treemodel, &treeiter, 0, &treeoptval, -1); + + if(treeoptval) conf.gamesettings |= it->second.value; + + gtk_tree_model_iter_next(treemodel,&treeiter); + } + + GSsetGameCRC(0, conf.gamesettings); + //---------- done getting advanced options ---------// } void OnToggle_advopts(GtkCellRendererToggle *cell, gchar *path, gpointer user_data) @@ -302,18 +200,206 @@ void OnToggle_advopts(GtkCellRendererToggle *cell, gchar *path, gpointer user_da gtk_list_store_set(GTK_LIST_STORE(user_data), &treeiter, 0, val, -1); } -void OnAbout_Ok(GtkButton *button, gpointer user_data) +void DisplayDialog() { - gtk_widget_destroy(About); - gtk_main_quit(); + int return_value; + + GtkWidget *dialog; + GtkWidget *main_frame, *main_box; + + GtkWidget *option_frame, *option_box; + GtkWidget *int_label, *int_box; + GtkWidget *bilinear_check, *bilinear_label; + GtkWidget *aa_label, *aa_box; + GtkWidget *wireframe_check, *avi_check; + GtkWidget *snap_label, *snap_box; + GtkWidget *size_label, *size_box; + GtkWidget *fullscreen_check, *widescreen_check; + + GtkWidget *advanced_frame, *advanced_box; + GtkWidget *advanced_scroll; + GtkWidget *tree; + + if (!(conf.options & GSOPTION_LOADED)) LoadConfig(); + + /* Create the widgets */ + dialog = gtk_dialog_new_with_buttons ( + "ZZOgl PG Config", + NULL, /* parent window*/ + (GtkDialogFlags)(GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT), + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + NULL); + + int_label = gtk_label_new ("Interlacing: (F5 to toggle)"); + int_box = gtk_combo_box_new_text (); + gtk_combo_box_append_text(GTK_COMBO_BOX(int_box), "No Interlacing"); + gtk_combo_box_append_text(GTK_COMBO_BOX(int_box), "Interlace 0"); + gtk_combo_box_append_text(GTK_COMBO_BOX(int_box), "Interlace 1"); + gtk_combo_box_set_active(GTK_COMBO_BOX(int_box), conf.interlace); + + + bilinear_check = gtk_check_button_new_with_label("Bilinear Filtering (Shift + F5)"); + bilinear_label = gtk_label_new ("Best quality is off. Turn on for speed."); + + aa_label = gtk_label_new ("Anti-Aliasing for Higher Quality(F6)"); + aa_box = gtk_combo_box_new_text (); + gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "1X - No Anti-Aliasing"); + gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "2X - Anti-Aliasing x 2"); + gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "4X - Anti-Aliasing x 4"); + gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "8X - Anti-Aliasing x 8"); + gtk_combo_box_append_text(GTK_COMBO_BOX(aa_box), "8X - Anti-Aliasing x 8"); + gtk_combo_box_set_active(GTK_COMBO_BOX(aa_box), conf.aa); + + wireframe_check = gtk_check_button_new_with_label("Wireframe Rendering(Shift + F6)"); + avi_check = gtk_check_button_new_with_label("Capture Avi (as zerogs.avi)(F7)"); + + snap_label = gtk_label_new ("Snapshot format:"); + snap_box = gtk_combo_box_new_text (); + gtk_combo_box_append_text(GTK_COMBO_BOX(snap_box), "JPEG"); + gtk_combo_box_append_text(GTK_COMBO_BOX(snap_box), "TIFF"); + gtk_combo_box_set_active(GTK_COMBO_BOX(snap_box), conf.options&GSOPTION_TGASNAP); + + fullscreen_check = gtk_check_button_new_with_label("Fullscreen (Alt + Enter)"); + widescreen_check = gtk_check_button_new_with_label("Widescreen"); + + size_label = gtk_label_new ("Default Window Size: (no speed impact)"); + size_box = gtk_combo_box_new_text (); + gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "640x480"); + gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "800x600"); + gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "1024x768"); + gtk_combo_box_append_text(GTK_COMBO_BOX(size_box), "1280x960"); + gtk_combo_box_set_active(GTK_COMBO_BOX(size_box), (conf.options&GSOPTION_WINDIMS)>>4); + + main_box = gtk_hbox_new(false, 5); + main_frame = gtk_frame_new ("ZZOgl PG Config"); + gtk_container_add (GTK_CONTAINER(main_frame), main_box); + + option_box = gtk_vbox_new(false, 5); + option_frame = gtk_frame_new (""); + gtk_container_add (GTK_CONTAINER(option_frame), option_box); + + advanced_box = gtk_vbox_new(false, 5); + advanced_frame = gtk_frame_new ("Advanced Settings:"); + gtk_container_add (GTK_CONTAINER(advanced_frame), advanced_box); + + tree = gtk_tree_view_new(); + CreateGameHackTable(tree); + advanced_scroll = gtk_scrolled_window_new(NULL, NULL); + gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(advanced_scroll), tree); + + gtk_box_pack_start(GTK_BOX(option_box), int_label, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), int_box, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), bilinear_check, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), bilinear_label, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), aa_label, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), aa_box, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), wireframe_check, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), avi_check, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), snap_label, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), snap_box, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), fullscreen_check, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), widescreen_check, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), size_label, false, false, 2); + gtk_box_pack_start(GTK_BOX(option_box), size_box, false, false, 2); + + gtk_box_pack_start(GTK_BOX(advanced_box), advanced_scroll, true, true, 2); + + gtk_box_pack_start(GTK_BOX(main_box), option_frame, false, false, 2); + gtk_box_pack_start(GTK_BOX(main_box), advanced_frame, true, true, 2); + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(bilinear_check), conf.bilinear); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(wireframe_check), (conf.options & GSOPTION_WIREFRAME)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(avi_check), (conf.options & GSOPTION_CAPTUREAVI)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(fullscreen_check), (conf.options & GSOPTION_FULLSCREEN)); + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widescreen_check), (conf.options & GSOPTION_WIDESCREEN)); + + gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), main_frame); + gtk_widget_show_all (dialog); + + return_value = gtk_dialog_run (GTK_DIALOG (dialog)); + + if (return_value == GTK_RESPONSE_ACCEPT) + { + int fake_options = 0; + SaveGameHackTable(tree); + + if (gtk_combo_box_get_active(GTK_COMBO_BOX(int_box)) != -1) + conf.interlace = gtk_combo_box_get_active(GTK_COMBO_BOX(int_box)); + + if (gtk_combo_box_get_active(GTK_COMBO_BOX(aa_box)) != -1) + conf.aa = gtk_combo_box_get_active(GTK_COMBO_BOX(aa_box)); + + conf.negaa = 0; + + switch(gtk_combo_box_get_active(GTK_COMBO_BOX(size_box))) + { + case 0: fake_options |= GSOPTION_WIN640; break; + case 1: fake_options |= GSOPTION_WIN800; break; + case 2: fake_options |= GSOPTION_WIN1024; break; + case 3: fake_options |= GSOPTION_WIN1280; break; + } + + conf.bilinear = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(bilinear_check)); + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(wireframe_check))) + fake_options |= GSOPTION_WIREFRAME; + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(avi_check))) + fake_options |= GSOPTION_CAPTUREAVI; + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(fullscreen_check))) + fake_options |= GSOPTION_FULLSCREEN; + + if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widescreen_check))) + fake_options |= GSOPTION_WIDESCREEN; + + if (gtk_combo_box_get_active(GTK_COMBO_BOX(snap_box)) == 1) + fake_options |= GSOPTION_TGASNAP; + + conf.options = fake_options; + SaveConfig(); + } + + gtk_widget_destroy (dialog); +} + +void CALLBACK GSconfigure() +{ + char strcurdir[256]; + getcwd(strcurdir, 256); + + if (!(conf.options & GSOPTION_LOADED)) LoadConfig(); + + DisplayDialog(); +} + +void __forceinline SysMessage(const char *fmt, ...) +{ + va_list list; + char msg[512]; + + va_start(list, fmt); + vsprintf(msg, fmt, list); + va_end(list); + + if (msg[strlen(msg)-1] == '\n') msg[strlen(msg)-1] = 0; + + GtkWidget *dialog; + dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_INFO, + GTK_BUTTONS_OK, + "%s", msg); + gtk_dialog_run (GTK_DIALOG (dialog)); + gtk_widget_destroy (dialog); } void CALLBACK GSabout() { - About = create_About(); - - gtk_widget_show_all(About); - gtk_main(); + SysMessage("ZZOgl PG: by Zeydlitz (PG version worked on by arcum42). Based off of ZeroGS, by zerofrog."); } s32 CALLBACK GStest() @@ -321,56 +407,6 @@ s32 CALLBACK GStest() return 0; } -GtkWidget *MsgDlg; - -void OnMsg_Ok() -{ - gtk_widget_destroy(MsgDlg); - gtk_main_quit(); -} - -void SysMessage(const char *fmt, ...) -{ - GtkWidget *Ok,*Txt; - GtkWidget *Box,*Box1; - va_list list; - char msg[512]; - - va_start(list, fmt); - vsprintf(msg, fmt, list); - va_end(list); - - if (msg[strlen(msg)-1] == '\n') msg[strlen(msg)-1] = 0; - - MsgDlg = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_position(GTK_WINDOW(MsgDlg), GTK_WIN_POS_CENTER); - gtk_window_set_title(GTK_WINDOW(MsgDlg), "GSsoft Msg"); - gtk_container_set_border_width(GTK_CONTAINER(MsgDlg), 5); - - Box = gtk_vbox_new(5, 0); - gtk_container_add(GTK_CONTAINER(MsgDlg), Box); - gtk_widget_show(Box); - - Txt = gtk_label_new(msg); - - gtk_box_pack_start(GTK_BOX(Box), Txt, FALSE, FALSE, 5); - gtk_widget_show(Txt); - - Box1 = gtk_hbutton_box_new(); - gtk_box_pack_start(GTK_BOX(Box), Box1, FALSE, FALSE, 0); - gtk_widget_show(Box1); - - Ok = gtk_button_new_with_label("Ok"); - gtk_signal_connect (GTK_OBJECT(Ok), "clicked", GTK_SIGNAL_FUNC(OnMsg_Ok), NULL); - gtk_container_add(GTK_CONTAINER(Box1), Ok); - GTK_WIDGET_SET_FLAGS(Ok, GTK_CAN_DEFAULT); - gtk_widget_show(Ok); - - gtk_widget_show(MsgDlg); - - gtk_main(); -} - void *SysLoadLibrary(char *lib) { return dlopen(lib, RTLD_NOW | RTLD_GLOBAL); diff --git a/plugins/zzogl-pg/opengl/Linux/Makefile.am b/plugins/zzogl-pg/opengl/Linux/Makefile.am index 7d3af6140e..49198459eb 100644 --- a/plugins/zzogl-pg/opengl/Linux/Makefile.am +++ b/plugins/zzogl-pg/opengl/Linux/Makefile.am @@ -1,4 +1,4 @@ noinst_LIBRARIES = libZeroGSLinux.a INCLUDES = $(shell pkg-config --cflags gtk+-2.0) -I@srcdir@/../ -I@srcdir@/../../../../common/include -libZeroGSLinux_a_SOURCES = callbacks.c Conf.cpp interface.c Linux.cpp support.c +libZeroGSLinux_a_SOURCES = Conf.cpp Linux.cpp diff --git a/plugins/zzogl-pg/opengl/Linux/buildgui.sh b/plugins/zzogl-pg/opengl/Linux/buildgui.sh deleted file mode 100644 index 9f0d1fcefb..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/buildgui.sh +++ /dev/null @@ -1,9 +0,0 @@ -# builds the GUI C classes -mkdir temp -cp zerogs.glade temp/ -cd temp -glade-2 --write-source zerogs.glade -rm src/main.c -cp src/*.h src/*.c ../ -cd .. -/bin/rm -rf temp diff --git a/plugins/zzogl-pg/opengl/Linux/callbacks.c b/plugins/zzogl-pg/opengl/Linux/callbacks.c deleted file mode 100644 index e87ed8be2d..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/callbacks.c +++ /dev/null @@ -1,34 +0,0 @@ -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#include "callbacks.h" -#include "interface.h" -#include "support.h" - - -void -OnConf_Ok (GtkButton *button, - gpointer user_data) -{ - -} - - -void -OnConf_Cancel (GtkButton *button, - gpointer user_data) -{ - -} - - -void -OnAbout_Ok (GtkButton *button, - gpointer user_data) -{ - -} - diff --git a/plugins/zzogl-pg/opengl/Linux/callbacks.h b/plugins/zzogl-pg/opengl/Linux/callbacks.h deleted file mode 100644 index e606c242f0..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/callbacks.h +++ /dev/null @@ -1,14 +0,0 @@ -#include - - -void -OnConf_Ok (GtkButton *button, - gpointer user_data); - -void -OnConf_Cancel (GtkButton *button, - gpointer user_data); - -void -OnAbout_Ok (GtkButton *button, - gpointer user_data); diff --git a/plugins/zzogl-pg/opengl/Linux/interface.c b/plugins/zzogl-pg/opengl/Linux/interface.c deleted file mode 100644 index 544c54063f..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/interface.c +++ /dev/null @@ -1,392 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#include -#include - -#include "callbacks.h" -#include "interface.h" -#include "support.h" - -#define GLADE_HOOKUP_OBJECT(component,widget,name) \ - g_object_set_data_full (G_OBJECT (component), name, \ - gtk_widget_ref (widget), (GDestroyNotify) gtk_widget_unref) - -#define GLADE_HOOKUP_OBJECT_NO_REF(component,widget,name) \ - g_object_set_data (G_OBJECT (component), name, widget) - -GtkWidget* -create_Config (void) -{ - GtkWidget *Config; - GtkWidget *vbox4; - GtkWidget *frame7; - GtkWidget *alignment4; - GtkWidget *hbox8; - GtkWidget *radionointerlace; - GSList *radionointerlace_group = NULL; - GtkWidget *radiointerlace0; - GtkWidget *radiointerlace1; - GtkWidget *label13; - GtkWidget *checkBilinear; - GtkWidget *frame4; - GtkWidget *alignment1; - GtkWidget *hbox6; - GtkWidget *radioAANone; - GSList *radioAANone_group = NULL; - GtkWidget *radioAA2X; - GtkWidget *radioAA4X; - GtkWidget *radioAA8X; - GtkWidget *radioAA16X; - GtkWidget *label9; - GtkWidget *checkWireframe; - GtkWidget *checkAVI; - GtkWidget *checkTGA; - GtkWidget *checkfullscreen; - GtkWidget *checkwidescreen; - GtkWidget *frame5; - GtkWidget *alignment2; - GtkWidget *hbox7; - GtkWidget *radioSize640; - GSList *radioSize640_group = NULL; - GtkWidget *radioSize800; - GtkWidget *radioSize1024; - GtkWidget *radioSize1280; - GtkWidget *label10; - GtkWidget *frame6; - GtkWidget *alignment3; - GtkWidget *scrolledwindow1; - GtkWidget *treeview1; - GtkWidget *label12; - GtkWidget *label11; - GtkWidget *hbuttonbox1; - GtkWidget *button1; - GtkWidget *button2; - - Config = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (Config), 5); - gtk_window_set_title (GTK_WINDOW (Config), _("ZeroOGS Configuration")); - - vbox4 = gtk_vbox_new (FALSE, 0); - gtk_widget_show (vbox4); - gtk_container_add (GTK_CONTAINER (Config), vbox4); - - frame7 = gtk_frame_new (NULL); - gtk_widget_show (frame7); - gtk_box_pack_start (GTK_BOX (vbox4), frame7, FALSE, FALSE, 0); - - alignment4 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment4); - gtk_container_add (GTK_CONTAINER (frame7), alignment4); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment4), 0, 0, 12, 0); - - hbox8 = gtk_hbox_new (FALSE, 0); - gtk_widget_show (hbox8); - gtk_container_add (GTK_CONTAINER (alignment4), hbox8); - - radionointerlace = gtk_radio_button_new_with_mnemonic (NULL, _("Interlace Off")); - gtk_widget_show (radionointerlace); - gtk_box_pack_start (GTK_BOX (hbox8), radionointerlace, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radionointerlace), radionointerlace_group); - radionointerlace_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radionointerlace)); - - radiointerlace0 = gtk_radio_button_new_with_mnemonic (NULL, _("Interlace 0")); - gtk_widget_show (radiointerlace0); - gtk_box_pack_start (GTK_BOX (hbox8), radiointerlace0, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiointerlace0), radionointerlace_group); - radionointerlace_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiointerlace0)); - - radiointerlace1 = gtk_radio_button_new_with_mnemonic (NULL, _("Interlace 1")); - gtk_widget_show (radiointerlace1); - gtk_box_pack_start (GTK_BOX (hbox8), radiointerlace1, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radiointerlace1), radionointerlace_group); - radionointerlace_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radiointerlace1)); - - label13 = gtk_label_new (_("Interlacing (F5 to toggle)")); - gtk_widget_show (label13); - gtk_frame_set_label_widget (GTK_FRAME (frame7), label13); - gtk_label_set_use_markup (GTK_LABEL (label13), TRUE); - - checkBilinear = gtk_check_button_new_with_mnemonic (_("Bilinear Filtering (Shift+F5)\n Best quality is on, turn off for speed")); - gtk_widget_show (checkBilinear); - gtk_box_pack_start (GTK_BOX (vbox4), checkBilinear, FALSE, FALSE, 0); - - frame4 = gtk_frame_new (NULL); - gtk_widget_show (frame4); - gtk_box_pack_start (GTK_BOX (vbox4), frame4, FALSE, FALSE, 0); - - alignment1 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment1); - gtk_container_add (GTK_CONTAINER (frame4), alignment1); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment1), 0, 0, 12, 0); - - hbox6 = gtk_hbox_new (TRUE, 0); - gtk_widget_show (hbox6); - gtk_container_add (GTK_CONTAINER (alignment1), hbox6); - - radioAANone = gtk_radio_button_new_with_mnemonic (NULL, _("None")); - gtk_widget_show (radioAANone); - gtk_box_pack_start (GTK_BOX (hbox6), radioAANone, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioAANone), radioAANone_group); - radioAANone_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioAANone)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radioAANone), TRUE); - - radioAA2X = gtk_radio_button_new_with_mnemonic (NULL, _("2X")); - gtk_widget_show (radioAA2X); - gtk_box_pack_start (GTK_BOX (hbox6), radioAA2X, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioAA2X), radioAANone_group); - radioAANone_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioAA2X)); - - radioAA4X = gtk_radio_button_new_with_mnemonic (NULL, _("4X")); - gtk_widget_show (radioAA4X); - gtk_box_pack_start (GTK_BOX (hbox6), radioAA4X, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioAA4X), radioAANone_group); - radioAANone_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioAA4X)); - - radioAA8X = gtk_radio_button_new_with_mnemonic (NULL, _("8X")); - gtk_widget_show (radioAA8X); - gtk_box_pack_start (GTK_BOX (hbox6), radioAA8X, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioAA8X), radioAANone_group); - radioAANone_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioAA8X)); - - radioAA16X = gtk_radio_button_new_with_mnemonic (NULL, _("16X")); - gtk_widget_show (radioAA16X); - gtk_box_pack_start (GTK_BOX (hbox6), radioAA16X, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioAA16X), radioAANone_group); - radioAANone_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioAA16X)); - - label9 = gtk_label_new (_("Anti-aliasing for higher quality (F6)")); - gtk_widget_show (label9); - gtk_frame_set_label_widget (GTK_FRAME (frame4), label9); - gtk_label_set_use_markup (GTK_LABEL (label9), TRUE); - - checkWireframe = gtk_check_button_new_with_mnemonic (_("Wireframe rendering (Shift+F6)")); - gtk_widget_show (checkWireframe); - gtk_box_pack_start (GTK_BOX (vbox4), checkWireframe, FALSE, FALSE, 0); - - checkAVI = gtk_check_button_new_with_mnemonic (_("Capture Avi (zerogs.avi)(F7)")); - gtk_widget_show (checkAVI); - gtk_box_pack_start (GTK_BOX (vbox4), checkAVI, FALSE, FALSE, 0); - - checkTGA = gtk_check_button_new_with_mnemonic (_("Save Snapshots as TGAs (default is JPG)")); - gtk_widget_show (checkTGA); - gtk_box_pack_start (GTK_BOX (vbox4), checkTGA, FALSE, FALSE, 0); - - checkfullscreen = gtk_check_button_new_with_mnemonic (_("Fullscreen (Alt+Enter)\n to get out press Alt+Enter again (or ESC)")); - gtk_widget_show (checkfullscreen); - gtk_box_pack_start (GTK_BOX (vbox4), checkfullscreen, FALSE, FALSE, 0); - - checkwidescreen = gtk_check_button_new_with_mnemonic (_("Wide Screen")); - gtk_widget_show (checkwidescreen); - gtk_box_pack_start (GTK_BOX (vbox4), checkwidescreen, FALSE, FALSE, 0); - - frame5 = gtk_frame_new (NULL); - gtk_widget_show (frame5); - gtk_box_pack_start (GTK_BOX (vbox4), frame5, FALSE, FALSE, 0); - - alignment2 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment2); - gtk_container_add (GTK_CONTAINER (frame5), alignment2); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment2), 0, 0, 12, 0); - - hbox7 = gtk_hbox_new (TRUE, 0); - gtk_widget_show (hbox7); - gtk_container_add (GTK_CONTAINER (alignment2), hbox7); - - radioSize640 = gtk_radio_button_new_with_mnemonic (NULL, _("640x480")); - gtk_widget_show (radioSize640); - gtk_box_pack_start (GTK_BOX (hbox7), radioSize640, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioSize640), radioSize640_group); - radioSize640_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioSize640)); - - radioSize800 = gtk_radio_button_new_with_mnemonic (NULL, _("800x600")); - gtk_widget_show (radioSize800); - gtk_box_pack_start (GTK_BOX (hbox7), radioSize800, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioSize800), radioSize640_group); - radioSize640_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioSize800)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (radioSize800), TRUE); - - radioSize1024 = gtk_radio_button_new_with_mnemonic (NULL, _("1024x768")); - gtk_widget_show (radioSize1024); - gtk_box_pack_start (GTK_BOX (hbox7), radioSize1024, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioSize1024), radioSize640_group); - radioSize640_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioSize1024)); - - radioSize1280 = gtk_radio_button_new_with_mnemonic (NULL, _("1280x960")); - gtk_widget_show (radioSize1280); - gtk_box_pack_start (GTK_BOX (hbox7), radioSize1280, FALSE, FALSE, 0); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (radioSize1280), radioSize640_group); - radioSize640_group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (radioSize1280)); - - label10 = gtk_label_new (_("Default Window Size (no speed impact)")); - gtk_widget_show (label10); - gtk_frame_set_label_widget (GTK_FRAME (frame5), label10); - gtk_label_set_use_markup (GTK_LABEL (label10), TRUE); - - frame6 = gtk_frame_new (NULL); - gtk_widget_show (frame6); - gtk_box_pack_start (GTK_BOX (vbox4), frame6, TRUE, TRUE, 0); - - alignment3 = gtk_alignment_new (0.5, 0.5, 1, 1); - gtk_widget_show (alignment3); - gtk_container_add (GTK_CONTAINER (frame6), alignment3); - gtk_alignment_set_padding (GTK_ALIGNMENT (alignment3), 0, 0, 12, 0); - - scrolledwindow1 = gtk_scrolled_window_new (NULL, NULL); - gtk_widget_show (scrolledwindow1); - gtk_container_add (GTK_CONTAINER (alignment3), scrolledwindow1); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_POLICY_AUTOMATIC, GTK_POLICY_ALWAYS); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolledwindow1), GTK_SHADOW_IN); - - treeview1 = gtk_tree_view_new (); - gtk_widget_show (treeview1); - gtk_container_add (GTK_CONTAINER (scrolledwindow1), treeview1); - - label12 = gtk_label_new (_("Advanced Options")); - gtk_widget_show (label12); - gtk_frame_set_label_widget (GTK_FRAME (frame6), label12); - gtk_label_set_use_markup (GTK_LABEL (label12), TRUE); - - label11 = gtk_label_new (_("Show Frames Per Second (Shift+F7)\n (value is the average over 4-16 PS2 frames)")); - gtk_widget_show (label11); - gtk_box_pack_start (GTK_BOX (vbox4), label11, FALSE, FALSE, 0); - - hbuttonbox1 = gtk_hbutton_box_new (); - gtk_widget_show (hbuttonbox1); - gtk_box_pack_start (GTK_BOX (vbox4), hbuttonbox1, FALSE, FALSE, 0); - gtk_button_box_set_layout (GTK_BUTTON_BOX (hbuttonbox1), GTK_BUTTONBOX_SPREAD); - gtk_box_set_spacing (GTK_BOX (hbuttonbox1), 30); - - button1 = gtk_button_new_with_mnemonic (_("Ok")); - gtk_widget_show (button1); - gtk_container_add (GTK_CONTAINER (hbuttonbox1), button1); - GTK_WIDGET_SET_FLAGS (button1, GTK_CAN_DEFAULT); - - button2 = gtk_button_new_with_mnemonic (_("Cancel")); - gtk_widget_show (button2); - gtk_container_add (GTK_CONTAINER (hbuttonbox1), button2); - GTK_WIDGET_SET_FLAGS (button2, GTK_CAN_DEFAULT); - - g_signal_connect ((gpointer) button1, "clicked", - G_CALLBACK (OnConf_Ok), - NULL); - g_signal_connect ((gpointer) button2, "clicked", - G_CALLBACK (OnConf_Cancel), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (Config, Config, "Config"); - GLADE_HOOKUP_OBJECT (Config, vbox4, "vbox4"); - GLADE_HOOKUP_OBJECT (Config, frame7, "frame7"); - GLADE_HOOKUP_OBJECT (Config, alignment4, "alignment4"); - GLADE_HOOKUP_OBJECT (Config, hbox8, "hbox8"); - GLADE_HOOKUP_OBJECT (Config, radionointerlace, "radionointerlace"); - GLADE_HOOKUP_OBJECT (Config, radiointerlace0, "radiointerlace0"); - GLADE_HOOKUP_OBJECT (Config, radiointerlace1, "radiointerlace1"); - GLADE_HOOKUP_OBJECT (Config, label13, "label13"); - GLADE_HOOKUP_OBJECT (Config, checkBilinear, "checkBilinear"); - GLADE_HOOKUP_OBJECT (Config, frame4, "frame4"); - GLADE_HOOKUP_OBJECT (Config, alignment1, "alignment1"); - GLADE_HOOKUP_OBJECT (Config, hbox6, "hbox6"); - GLADE_HOOKUP_OBJECT (Config, radioAANone, "radioAANone"); - GLADE_HOOKUP_OBJECT (Config, radioAA2X, "radioAA2X"); - GLADE_HOOKUP_OBJECT (Config, radioAA4X, "radioAA4X"); - GLADE_HOOKUP_OBJECT (Config, radioAA8X, "radioAA8X"); - GLADE_HOOKUP_OBJECT (Config, radioAA16X, "radioAA16X"); - GLADE_HOOKUP_OBJECT (Config, label9, "label9"); - GLADE_HOOKUP_OBJECT (Config, checkWireframe, "checkWireframe"); - GLADE_HOOKUP_OBJECT (Config, checkAVI, "checkAVI"); - GLADE_HOOKUP_OBJECT (Config, checkTGA, "checkTGA"); - GLADE_HOOKUP_OBJECT (Config, checkfullscreen, "checkfullscreen"); - GLADE_HOOKUP_OBJECT (Config, checkwidescreen, "checkwidescreen"); - GLADE_HOOKUP_OBJECT (Config, frame5, "frame5"); - GLADE_HOOKUP_OBJECT (Config, alignment2, "alignment2"); - GLADE_HOOKUP_OBJECT (Config, hbox7, "hbox7"); - GLADE_HOOKUP_OBJECT (Config, radioSize640, "radioSize640"); - GLADE_HOOKUP_OBJECT (Config, radioSize800, "radioSize800"); - GLADE_HOOKUP_OBJECT (Config, radioSize1024, "radioSize1024"); - GLADE_HOOKUP_OBJECT (Config, radioSize1280, "radioSize1280"); - GLADE_HOOKUP_OBJECT (Config, label10, "label10"); - GLADE_HOOKUP_OBJECT (Config, frame6, "frame6"); - GLADE_HOOKUP_OBJECT (Config, alignment3, "alignment3"); - GLADE_HOOKUP_OBJECT (Config, scrolledwindow1, "scrolledwindow1"); - GLADE_HOOKUP_OBJECT (Config, treeview1, "treeview1"); - GLADE_HOOKUP_OBJECT (Config, label12, "label12"); - GLADE_HOOKUP_OBJECT (Config, label11, "label11"); - GLADE_HOOKUP_OBJECT (Config, hbuttonbox1, "hbuttonbox1"); - GLADE_HOOKUP_OBJECT (Config, button1, "button1"); - GLADE_HOOKUP_OBJECT (Config, button2, "button2"); - - return Config; -} - -GtkWidget* -create_About (void) -{ - GtkWidget *About; - GtkWidget *vbox2; - GtkWidget *label2; - GtkWidget *label3; - GtkWidget *label4; - GtkWidget *hbuttonbox2; - GtkWidget *button3; - - About = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_container_set_border_width (GTK_CONTAINER (About), 5); - gtk_window_set_title (GTK_WINDOW (About), _("ZZogl About")); - - vbox2 = gtk_vbox_new (FALSE, 5); - gtk_widget_show (vbox2); - gtk_container_add (GTK_CONTAINER (About), vbox2); - gtk_container_set_border_width (GTK_CONTAINER (vbox2), 5); - - label2 = gtk_label_new (_("OpenGL version")); - gtk_widget_show (label2); - gtk_box_pack_start (GTK_BOX (vbox2), label2, FALSE, FALSE, 0); - gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_CENTER); - - label3 = gtk_label_new (_("Author: Zeydlitz(@gmail.com)")); - gtk_widget_show (label3); - gtk_box_pack_start (GTK_BOX (vbox2), label3, FALSE, FALSE, 0); - - label4 = gtk_label_new (_("Many thanks to the Pcsx2 testing team")); - gtk_widget_show (label4); - gtk_box_pack_start (GTK_BOX (vbox2), label4, FALSE, FALSE, 0); - - hbuttonbox2 = gtk_hbutton_box_new (); - gtk_widget_show (hbuttonbox2); - gtk_box_pack_start (GTK_BOX (vbox2), hbuttonbox2, TRUE, TRUE, 0); - gtk_box_set_spacing (GTK_BOX (hbuttonbox2), 30); - - button3 = gtk_button_new_with_mnemonic (_("Ok")); - gtk_widget_show (button3); - gtk_container_add (GTK_CONTAINER (hbuttonbox2), button3); - GTK_WIDGET_SET_FLAGS (button3, GTK_CAN_DEFAULT); - - g_signal_connect ((gpointer) button3, "clicked", - G_CALLBACK (OnAbout_Ok), - NULL); - - /* Store pointers to all widgets, for use by lookup_widget(). */ - GLADE_HOOKUP_OBJECT_NO_REF (About, About, "About"); - GLADE_HOOKUP_OBJECT (About, vbox2, "vbox2"); - GLADE_HOOKUP_OBJECT (About, label2, "label2"); - GLADE_HOOKUP_OBJECT (About, label3, "label3"); - GLADE_HOOKUP_OBJECT (About, label4, "label4"); - GLADE_HOOKUP_OBJECT (About, hbuttonbox2, "hbuttonbox2"); - GLADE_HOOKUP_OBJECT (About, button3, "button3"); - - return About; -} - diff --git a/plugins/zzogl-pg/opengl/Linux/interface.h b/plugins/zzogl-pg/opengl/Linux/interface.h deleted file mode 100644 index 69c303ba3b..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/interface.h +++ /dev/null @@ -1,6 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -GtkWidget* create_Config (void); -GtkWidget* create_About (void); diff --git a/plugins/zzogl-pg/opengl/Linux/support.c b/plugins/zzogl-pg/opengl/Linux/support.c deleted file mode 100644 index 00aff29822..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/support.c +++ /dev/null @@ -1,144 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include -#include -#include -#include -#include - -#include - -#include "support.h" - -GtkWidget* -lookup_widget (GtkWidget *widget, - const gchar *widget_name) -{ - GtkWidget *parent, *found_widget; - - for (;;) - { - if (GTK_IS_MENU (widget)) - parent = gtk_menu_get_attach_widget (GTK_MENU (widget)); - else - parent = widget->parent; - if (!parent) - parent = (GtkWidget*) g_object_get_data (G_OBJECT (widget), "GladeParentKey"); - if (parent == NULL) - break; - widget = parent; - } - - found_widget = (GtkWidget*) g_object_get_data (G_OBJECT (widget), - widget_name); - if (!found_widget) - g_warning ("Widget not found: %s", widget_name); - return found_widget; -} - -static GList *pixmaps_directories = NULL; - -/* Use this function to set the directory containing installed pixmaps. */ -void -add_pixmap_directory (const gchar *directory) -{ - pixmaps_directories = g_list_prepend (pixmaps_directories, - g_strdup (directory)); -} - -/* This is an internally used function to find pixmap files. */ -static gchar* -find_pixmap_file (const gchar *filename) -{ - GList *elem; - - /* We step through each of the pixmaps directory to find it. */ - elem = pixmaps_directories; - while (elem) - { - gchar *pathname = g_strdup_printf ("%s%s%s", (gchar*)elem->data, - G_DIR_SEPARATOR_S, filename); - if (g_file_test (pathname, G_FILE_TEST_EXISTS)) - return pathname; - g_free (pathname); - elem = elem->next; - } - return NULL; -} - -/* This is an internally used function to create pixmaps. */ -GtkWidget* -create_pixmap (GtkWidget *widget, - const gchar *filename) -{ - gchar *pathname = NULL; - GtkWidget *pixmap; - - if (!filename || !filename[0]) - return gtk_image_new (); - - pathname = find_pixmap_file (filename); - - if (!pathname) - { - g_warning (_("Couldn't find pixmap file: %s"), filename); - return gtk_image_new (); - } - - pixmap = gtk_image_new_from_file (pathname); - g_free (pathname); - return pixmap; -} - -/* This is an internally used function to create pixmaps. */ -GdkPixbuf* -create_pixbuf (const gchar *filename) -{ - gchar *pathname = NULL; - GdkPixbuf *pixbuf; - GError *error = NULL; - - if (!filename || !filename[0]) - return NULL; - - pathname = find_pixmap_file (filename); - - if (!pathname) - { - g_warning (_("Couldn't find pixmap file: %s"), filename); - return NULL; - } - - pixbuf = gdk_pixbuf_new_from_file (pathname, &error); - if (!pixbuf) - { - fprintf (stderr, "Failed to load pixbuf file: %s: %s\n", - pathname, error->message); - g_error_free (error); - } - g_free (pathname); - return pixbuf; -} - -/* This is used to set ATK action descriptions. */ -void -glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description) -{ - gint n_actions, i; - - n_actions = atk_action_get_n_actions (action); - for (i = 0; i < n_actions; i++) - { - if (!strcmp (atk_action_get_name (action, i), action_name)) - atk_action_set_description (action, i, description); - } -} - diff --git a/plugins/zzogl-pg/opengl/Linux/support.h b/plugins/zzogl-pg/opengl/Linux/support.h deleted file mode 100644 index a32649e53c..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/support.h +++ /dev/null @@ -1,69 +0,0 @@ -/* - * DO NOT EDIT THIS FILE - it is generated by Glade. - */ - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -/* - * Standard gettext macros. - */ -#ifdef ENABLE_NLS -# include -# undef _ -# define _(String) dgettext (PACKAGE, String) -# define Q_(String) g_strip_context ((String), gettext (String)) -# ifdef gettext_noop -# define N_(String) gettext_noop (String) -# else -# define N_(String) (String) -# endif -#else -# define textdomain(String) (String) -# define gettext(String) (String) -# define dgettext(Domain,Message) (Message) -# define dcgettext(Domain,Message,Type) (Message) -# define bindtextdomain(Domain,Directory) (Domain) -# define _(String) (String) -# define Q_(String) g_strip_context ((String), (String)) -# define N_(String) (String) -#endif - - -/* - * Public Functions. - */ - -/* - * This function returns a widget in a component created by Glade. - * Call it with the toplevel widget in the component (i.e. a window/dialog), - * or alternatively any widget in the component, and the name of the widget - * you want returned. - */ -GtkWidget* lookup_widget (GtkWidget *widget, - const gchar *widget_name); - - -/* Use this function to set the directory containing installed pixmaps. */ -void add_pixmap_directory (const gchar *directory); - - -/* - * Private Functions. - */ - -/* This is used to create the pixmaps used in the interface. */ -GtkWidget* create_pixmap (GtkWidget *widget, - const gchar *filename); - -/* This is used to create the pixbufs used in the interface. */ -GdkPixbuf* create_pixbuf (const gchar *filename); - -/* This is used to set ATK action descriptions. */ -void glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description); - diff --git a/plugins/zzogl-pg/opengl/Linux/zerogs.glade b/plugins/zzogl-pg/opengl/Linux/zerogs.glade deleted file mode 100644 index bc5980493f..0000000000 --- a/plugins/zzogl-pg/opengl/Linux/zerogs.glade +++ /dev/null @@ -1,812 +0,0 @@ - - - - - - - 5 - True - ZeroOGS Configuration - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - True - False - 0 - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - False - 0 - - - - True - True - Interlace Off - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Interlace 0 - True - GTK_RELIEF_NORMAL - True - False - False - True - radionointerlace - - - 0 - False - False - - - - - - True - True - Interlace 1 - True - GTK_RELIEF_NORMAL - True - False - False - True - radionointerlace - - - 0 - False - False - - - - - - - - - - True - <b>Interlacing (F5 to toggle)</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - Bilinear Filtering (Shift+F5) - Best quality is on, turn off for speed - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - True - 0 - - - - True - True - None - True - GTK_RELIEF_NORMAL - True - True - False - True - - - 0 - False - False - - - - - - True - True - 2X - True - GTK_RELIEF_NORMAL - True - False - False - True - radioAANone - - - 0 - False - False - - - - - - True - True - 4X - True - GTK_RELIEF_NORMAL - True - False - False - True - radioAANone - - - 0 - False - False - - - - - - True - True - 8X - True - GTK_RELIEF_NORMAL - True - False - False - True - radioAANone - - - 0 - False - False - - - - - - True - True - 16X - True - GTK_RELIEF_NORMAL - True - False - False - True - radioAANone - - - 0 - False - False - - - - - - - - - - True - <b>Anti-aliasing for higher quality (F6)</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - True - Wireframe rendering (Shift+F6) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Capture Avi (zerogs.avi)(F7) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Save Snapshots as TGAs (default is JPG) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - Fullscreen (Alt+Enter) - to get out press Alt+Enter again (or ESC) - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - True - 0 - - - - True - True - 640x480 - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - False - False - - - - - - True - True - 800x600 - True - GTK_RELIEF_NORMAL - True - True - False - True - radioSize640 - - - 0 - False - False - - - - - - True - True - 1024x768 - True - GTK_RELIEF_NORMAL - True - False - False - True - radioSize640 - - - 0 - False - False - - - - - - True - True - 1280x960 - True - GTK_RELIEF_NORMAL - True - False - False - True - radioSize640 - - - 0 - False - False - - - - - - - - - - True - <b>Default Window Size (no speed impact)</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - False - False - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - 0.5 - 0.5 - 1 - 1 - 0 - 0 - 12 - 0 - - - - True - True - GTK_POLICY_AUTOMATIC - GTK_POLICY_ALWAYS - GTK_SHADOW_IN - GTK_CORNER_TOP_LEFT - - - - True - True - True - False - False - True - False - False - False - - - - - - - - - - True - <b>Advanced Options</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - Show Frames Per Second (Shift+F7) - (value is the average over 4-16 PS2 frames) - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_SPREAD - 30 - - - - True - True - True - Ok - True - GTK_RELIEF_NORMAL - True - - - - - - - True - True - True - Cancel - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - False - False - - - - - - - - 5 - True - ZeroGS KOSMOS About - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - False - False - GDK_WINDOW_TYPE_HINT_NORMAL - GDK_GRAVITY_NORTH_WEST - True - False - - - - 5 - True - False - 5 - - - - True - OpenGL version - False - False - GTK_JUSTIFY_CENTER - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Author: zerofrog(@gmail.com) - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - Many thanks to the Pcsx2 testing team - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - False - False - - - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 30 - - - - True - True - True - Ok - True - GTK_RELIEF_NORMAL - True - - - - - - 0 - True - True - - - - - - - diff --git a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp index 93529022a9..181c3212eb 100644 --- a/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp +++ b/plugins/zzogl-pg/opengl/Linux/zzogl-pg/zzogl-pg.cbp @@ -74,15 +74,6 @@ - - - - - - -