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

Fix a few spelling errors, make the Ok and Cancel buttons consistant in appearance on the gtk port, add some preliminary code for two dialogs, and get rid of the abomination that is a global variable named 'Window'. 

git-svn-id: http://pcsx2-playground.googlecode.com/svn/trunk@191 a6443dda-0b58-4228-96e9-037be469359c
This commit is contained in:
arcum42 2008-10-12 06:20:23 +00:00 committed by Gregory Hainaut
parent 1d23c27200
commit 09cf85f57d
7 changed files with 9607 additions and 8126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
pcsx2/Linux/GtkGui.c
View File

@ -31,24 +31,24 @@ void StartGui() {
int i; int i;
add_pixmap_directory(".pixmaps"); add_pixmap_directory(".pixmaps");
Window = create_MainWindow(); MainWindow = create_MainWindow();
#ifdef PCSX2_VIRTUAL_MEM #ifdef PCSX2_VIRTUAL_MEM
gtk_window_set_title(GTK_WINDOW(Window), "PCSX2 "PCSX2_VERSION" Watermoose VM"); gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" Watermoose VM");
#else #else
gtk_window_set_title(GTK_WINDOW(Window), "PCSX2 "PCSX2_VERSION" Watermoose"); gtk_window_set_title(GTK_WINDOW(MainWindow), "PCSX2 "PCSX2_VERSION" Watermoose");
#endif #endif
// status bar // status bar
pStatusBar = gtk_statusbar_new (); pStatusBar = gtk_statusbar_new ();
gtk_box_pack_start (GTK_BOX(lookup_widget(Window, "status_box")), pStatusBar, TRUE, TRUE, 0); gtk_box_pack_start (GTK_BOX(lookup_widget(MainWindow, "status_box")), pStatusBar, TRUE, TRUE, 0);
gtk_widget_show (pStatusBar); gtk_widget_show (pStatusBar);
gtk_statusbar_push(GTK_STATUSBAR(pStatusBar),0, gtk_statusbar_push(GTK_STATUSBAR(pStatusBar),0,
"F1 - save, F2 - next state, Shift+F2 - prev state, F3 - load, F8 - snapshot"); "F1 - save, F2 - next state, Shift+F2 - prev state, F3 - load, F8 - snapshot");
// add all the languages // add all the languages
Item = lookup_widget(Window, "GtkMenuItem_Language"); Item = lookup_widget(MainWindow, "GtkMenuItem_Language");
Menu = gtk_menu_new(); Menu = gtk_menu_new();
gtk_menu_item_set_submenu(GTK_MENU_ITEM(Item), Menu); gtk_menu_item_set_submenu(GTK_MENU_ITEM(Item), Menu);
@ -66,16 +66,15 @@ void StartGui() {
} }
// check the appropriate menu items // check the appropriate menu items
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(Window, "enable_console1")), Config.PsxOut); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(MainWindow, "enable_console1")), Config.PsxOut);
gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(Window, "enable_patches1")), Config.Patch); gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(lookup_widget(MainWindow, "enable_patches1")), Config.Patch);
// disable anything not implemented or not working properly. // disable anything not implemented or not working properly.
gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(Window, "patch_browser1")), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(MainWindow, "patch_browser1")), FALSE);
gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(Window, "patch_finder2")), FALSE); gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(MainWindow, "patch_finder2")), FALSE);
//gtk_widget_set_sensitive(GTK_WIDGET(lookup_widget(Window, "GtkMenuItem_Advanced")), FALSE);
gtk_widget_show_all(Window); gtk_widget_show_all(MainWindow);
gtk_window_activate_focus(GTK_WINDOW(Window)); gtk_window_activate_focus(GTK_WINDOW(MainWindow));
gtk_main(); gtk_main();
} }
@ -92,7 +91,7 @@ int Pcsx2Configure() {
return 0; return 0;
configuringplug = TRUE; configuringplug = TRUE;
Window = NULL; MainWindow = NULL;
OnConf_Conf(NULL, 0); OnConf_Conf(NULL, 0);
configuringplug = FALSE; configuringplug = FALSE;
@ -102,7 +101,7 @@ int Pcsx2Configure() {
void OnLanguage(GtkMenuItem *menuitem, gpointer user_data) { void OnLanguage(GtkMenuItem *menuitem, gpointer user_data) {
ChangeLanguage(langs[(int)(uptr)user_data].lang); ChangeLanguage(langs[(int)(uptr)user_data].lang);
destroy = TRUE; destroy = TRUE;
gtk_widget_destroy(Window); gtk_widget_destroy(MainWindow);
destroy = FALSE; destroy = FALSE;
gtk_main_quit(); gtk_main_quit();
while (gtk_events_pending()) gtk_main_iteration(); while (gtk_events_pending()) gtk_main_iteration();
@ -121,7 +120,7 @@ void RunExecute(int run)
} }
destroy= TRUE; destroy= TRUE;
gtk_widget_destroy(Window); gtk_widget_destroy(MainWindow);
destroy=FALSE; destroy=FALSE;
gtk_main_quit(); gtk_main_quit();
while (gtk_events_pending()) gtk_main_iteration(); while (gtk_events_pending()) gtk_main_iteration();
@ -249,7 +248,7 @@ void OnEmu_Reset(GtkMenuItem *menuitem, gpointer user_data)
for (i=0; i<5; i++) { for (i=0; i<5; i++) {
sprintf(str, "GtkMenuItem_LoadSlot%d", i+1); sprintf(str, "GtkMenuItem_LoadSlot%d", i+1);
Item = lookup_widget(Window, str); Item = lookup_widget(MainWindow, str);
if (Slots[i] == -1) if (Slots[i] == -1)
gtk_widget_set_sensitive(Item, FALSE); gtk_widget_set_sensitive(Item, FALSE);
else else
@ -392,13 +391,13 @@ void OnArguments_Ok(GtkButton *button, gpointer user_data) {
memcpy(args, str, 256); memcpy(args, str, 256);
gtk_widget_destroy(CmdLine); gtk_widget_destroy(CmdLine);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
void OnArguments_Cancel(GtkButton* button, gpointer user_data) { void OnArguments_Cancel(GtkButton* button, gpointer user_data) {
gtk_widget_destroy(CmdLine); gtk_widget_destroy(CmdLine);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
@ -413,7 +412,7 @@ void OnEmu_Arguments(GtkMenuItem *menuitem, gpointer user_data) {
gtk_entry_set_text(GTK_ENTRY(widgetCmdLine), args); gtk_entry_set_text(GTK_ENTRY(widgetCmdLine), args);
//args exported by ElfHeader.h //args exported by ElfHeader.h
gtk_widget_show_all(CmdLine); gtk_widget_show_all(CmdLine);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
//------------------- //-------------------
@ -424,10 +423,10 @@ void OnConf_Gs(GtkMenuItem *menuitem, gpointer user_data)
getcwd(file, ARRAYSIZE(file)); getcwd(file, ARRAYSIZE(file));
chdir(Config.PluginsDir); chdir(Config.PluginsDir);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
GSconfigure(); GSconfigure();
chdir(file); chdir(file);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
} }
void OnConf_Pads(GtkMenuItem *menuitem, gpointer user_data) { void OnConf_Pads(GtkMenuItem *menuitem, gpointer user_data) {
@ -435,11 +434,11 @@ void OnConf_Pads(GtkMenuItem *menuitem, gpointer user_data) {
getcwd(file, ARRAYSIZE(file)); getcwd(file, ARRAYSIZE(file));
chdir(Config.PluginsDir); chdir(Config.PluginsDir);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
PAD1configure(); PAD1configure();
if (strcmp(Config.PAD1, Config.PAD2)) PAD2configure(); if (strcmp(Config.PAD1, Config.PAD2)) PAD2configure();
chdir(file); chdir(file);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
} }
void OnConf_Spu2(GtkMenuItem *menuitem, gpointer user_data) { void OnConf_Spu2(GtkMenuItem *menuitem, gpointer user_data) {
@ -447,9 +446,9 @@ void OnConf_Spu2(GtkMenuItem *menuitem, gpointer user_data) {
getcwd(file, ARRAYSIZE(file)); getcwd(file, ARRAYSIZE(file));
chdir(Config.PluginsDir); chdir(Config.PluginsDir);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
SPU2configure(); SPU2configure();
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
chdir(file); chdir(file);
} }
@ -458,9 +457,9 @@ void OnConf_Cdvd(GtkMenuItem *menuitem, gpointer user_data) {
getcwd(file, ARRAYSIZE(file)); getcwd(file, ARRAYSIZE(file));
chdir(Config.PluginsDir); chdir(Config.PluginsDir);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
CDVDconfigure(); CDVDconfigure();
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
chdir(file); chdir(file);
} }
@ -469,9 +468,9 @@ void OnConf_Dev9(GtkMenuItem *menuitem, gpointer user_data) {
getcwd(file, ARRAYSIZE(file)); getcwd(file, ARRAYSIZE(file));
chdir(Config.PluginsDir); chdir(Config.PluginsDir);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
DEV9configure(); DEV9configure();
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
chdir(file); chdir(file);
} }
@ -480,9 +479,9 @@ void OnConf_Usb(GtkMenuItem *menuitem, gpointer user_data) {
getcwd(file, ARRAYSIZE(file)); getcwd(file, ARRAYSIZE(file));
chdir(Config.PluginsDir); chdir(Config.PluginsDir);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
USBconfigure(); USBconfigure();
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
chdir(file); chdir(file);
} }
@ -491,9 +490,9 @@ void OnConf_Fw(GtkMenuItem *menuitem, gpointer user_data) {
getcwd(file, ARRAYSIZE(file)); getcwd(file, ARRAYSIZE(file));
chdir(Config.PluginsDir); chdir(Config.PluginsDir);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
FWconfigure(); FWconfigure();
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
chdir(file); chdir(file);
} }
@ -542,13 +541,13 @@ void OnCpu_Ok(GtkButton *button, gpointer user_data) {
cpuRestartCPU(); cpuRestartCPU();
gtk_widget_destroy(CpuDlg); gtk_widget_destroy(CpuDlg);
if (Window) gtk_widget_set_sensitive(Window, TRUE); if (MainWindow) gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
void OnCpu_Cancel(GtkButton *button, gpointer user_data) { void OnCpu_Cancel(GtkButton *button, gpointer user_data) {
gtk_widget_destroy(CpuDlg); gtk_widget_destroy(CpuDlg);
if (Window) gtk_widget_set_sensitive(Window, TRUE); if (MainWindow) gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
@ -594,7 +593,7 @@ void OnConf_Cpu(GtkMenuItem *menuitem, gpointer user_data)
gtk_label_set_text(GTK_LABEL(lookup_widget(CpuDlg, "GtkLabel_Features")), str); gtk_label_set_text(GTK_LABEL(lookup_widget(CpuDlg, "GtkLabel_Features")), str);
gtk_widget_show_all(CpuDlg); gtk_widget_show_all(CpuDlg);
if (Window) gtk_widget_set_sensitive(Window, FALSE); if (MainWindow) gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
@ -665,14 +664,14 @@ void OnConfConf_Ok(GtkButton *button, gpointer user_data) {
needReset = TRUE; needReset = TRUE;
gtk_widget_destroy(ConfDlg); gtk_widget_destroy(ConfDlg);
if (Window) gtk_widget_set_sensitive(Window, TRUE); if (MainWindow) gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
applychanges = TRUE; applychanges = TRUE;
} }
void OnConfConf_Cancel(GtkButton *button, gpointer user_data) { void OnConfConf_Cancel(GtkButton *button, gpointer user_data) {
gtk_widget_destroy(ConfDlg); gtk_widget_destroy(ConfDlg);
if (Window) gtk_widget_set_sensitive(Window, TRUE); if (MainWindow) gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
applychanges = FALSE; applychanges = FALSE;
} }
@ -906,7 +905,7 @@ void OnConf_Conf(GtkMenuItem *menuitem, gpointer user_data) {
UpdateConfDlg(); UpdateConfDlg();
gtk_widget_show_all(ConfDlg); gtk_widget_show_all(ConfDlg);
if (Window) gtk_widget_set_sensitive(Window, FALSE); if (MainWindow) gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
@ -943,7 +942,7 @@ void OnDebug_Close(GtkButton *button, gpointer user_data) {
ClosePlugins(); ClosePlugins();
gtk_widget_destroy(DebugWnd); gtk_widget_destroy(DebugWnd);
gtk_main_quit(); gtk_main_quit();
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
} }
void OnDebug_ScrollChange(GtkAdjustment *adj) { void OnDebug_ScrollChange(GtkAdjustment *adj) {
@ -1274,7 +1273,7 @@ void OnDebug_Debugger(GtkMenuItem *menuitem, gpointer user_data) {
UpdateDebugger(); UpdateDebugger();
gtk_widget_show_all(DebugWnd); gtk_widget_show_all(DebugWnd);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
@ -1316,13 +1315,13 @@ void OnLogging_Ok(GtkButton *button, gpointer user_data) {
#endif #endif
gtk_widget_destroy(LogDlg); gtk_widget_destroy(LogDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
void OnLogging_Cancel(GtkButton *button, gpointer user_data) { void OnLogging_Cancel(GtkButton *button, gpointer user_data) {
gtk_widget_destroy(LogDlg); gtk_widget_destroy(LogDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
@ -1354,7 +1353,7 @@ void OnDebug_Logging(GtkMenuItem *menuitem, gpointer user_data) {
gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(Btn), Log); gtk_toggle_button_set_state(GTK_TOGGLE_BUTTON(Btn), Log);
gtk_widget_show_all(LogDlg); gtk_widget_show_all(LogDlg);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
@ -1363,7 +1362,7 @@ void OnHelp_Help() {
void OnHelpAbout_Ok(GtkButton *button, gpointer user_data) { void OnHelpAbout_Ok(GtkButton *button, gpointer user_data) {
gtk_widget_destroy(AboutDlg); gtk_widget_destroy(AboutDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
@ -1385,7 +1384,7 @@ void OnHelp_About(GtkMenuItem *menuitem, gpointer user_data) {
gtk_label_set_text(GTK_LABEL(Label), _(LabelGreets)); gtk_label_set_text(GTK_LABEL(Label), _(LabelGreets));
gtk_widget_show_all(AboutDlg); gtk_widget_show_all(AboutDlg);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
@ -1593,13 +1592,13 @@ void on_Game_Fixes(GtkMenuItem *menuitem, gpointer user_data)
set_checked(GameFixDlg, "check_VU_Branch", (Config.GameFixes & FLAG_VU_BRANCH)); set_checked(GameFixDlg, "check_VU_Branch", (Config.GameFixes & FLAG_VU_BRANCH));
gtk_widget_show_all(GameFixDlg); gtk_widget_show_all(GameFixDlg);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
void on_Game_Fix_Cancel(GtkButton *button, gpointer user_data) void on_Game_Fix_Cancel(GtkButton *button, gpointer user_data)
{ {
gtk_widget_destroy(GameFixDlg); gtk_widget_destroy(GameFixDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
void on_Game_Fix_OK(GtkButton *button, gpointer user_data) void on_Game_Fix_OK(GtkButton *button, gpointer user_data)
@ -1613,7 +1612,7 @@ void on_Game_Fix_OK(GtkButton *button, gpointer user_data)
SaveConfig(); SaveConfig();
gtk_widget_destroy(GameFixDlg); gtk_widget_destroy(GameFixDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
@ -1644,7 +1643,7 @@ void on_Speed_Hacks(GtkMenuItem *menuitem, gpointer user_data)
set_checked(SpeedHacksDlg, "check_ESC_Hack", (Config.Hacks & FLAG_ESC)); set_checked(SpeedHacksDlg, "check_ESC_Hack", (Config.Hacks & FLAG_ESC));
gtk_widget_show_all(SpeedHacksDlg); gtk_widget_show_all(SpeedHacksDlg);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
void on_Speed_Hack_Compatability(GtkButton *button, gpointer user_data) void on_Speed_Hack_Compatability(GtkButton *button, gpointer user_data)
@ -1681,7 +1680,7 @@ void on_Speed_Hack_Speed(GtkButton *button, gpointer user_data)
void on_Speed_Hack_Cancel(GtkButton *button, gpointer user_data) void on_Speed_Hack_Cancel(GtkButton *button, gpointer user_data)
{ {
gtk_widget_destroy(SpeedHacksDlg); gtk_widget_destroy(SpeedHacksDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
void on_Speed_Hack_OK(GtkButton *button, gpointer user_data) void on_Speed_Hack_OK(GtkButton *button, gpointer user_data)
@ -1728,7 +1727,7 @@ void on_Speed_Hack_OK(GtkButton *button, gpointer user_data)
SaveConfig(); SaveConfig();
gtk_widget_destroy(SpeedHacksDlg); gtk_widget_destroy(SpeedHacksDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
void setAdvancedOptions() void setAdvancedOptions()
@ -1778,7 +1777,7 @@ void on_Advanced(GtkMenuItem *menuitem, gpointer user_data)
setAdvancedOptions(); setAdvancedOptions();
gtk_widget_show_all(AdvDlg); gtk_widget_show_all(AdvDlg);
gtk_widget_set_sensitive(Window, FALSE); gtk_widget_set_sensitive(MainWindow, FALSE);
gtk_main(); gtk_main();
} }
@ -1792,7 +1791,7 @@ void on_Advanced_Defaults(GtkButton *button, gpointer user_data)
void on_Advanced_Cancel(GtkButton *button, gpointer user_data) void on_Advanced_Cancel(GtkButton *button, gpointer user_data)
{ {
gtk_widget_destroy(AdvDlg); gtk_widget_destroy(AdvDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }
void on_Advanced_OK(GtkButton *button, gpointer user_data) void on_Advanced_OK(GtkButton *button, gpointer user_data)
@ -1821,6 +1820,6 @@ void on_Advanced_OK(GtkButton *button, gpointer user_data)
SaveConfig(); SaveConfig();
gtk_widget_destroy(AdvDlg); gtk_widget_destroy(AdvDlg);
gtk_widget_set_sensitive(Window, TRUE); gtk_widget_set_sensitive(MainWindow, TRUE);
gtk_main_quit(); gtk_main_quit();
} }

2
pcsx2/Linux/GtkGui.h
View File

@ -57,7 +57,7 @@ void OnLanguage(GtkMenuItem *menuitem, gpointer user_data);
void OnHelp_Help(); void OnHelp_Help();
void OnHelp_About(GtkMenuItem *menuitem, gpointer user_data); void OnHelp_About(GtkMenuItem *menuitem, gpointer user_data);
GtkWidget *Window; GtkWidget *MainWindow;
GtkWidget *pStatusBar = NULL, *Status_Box; GtkWidget *pStatusBar = NULL, *Status_Box;
GtkWidget *CmdLine; //2002-09-28 (Florin) GtkWidget *CmdLine; //2002-09-28 (Florin)
GtkWidget *widgetCmdLine; GtkWidget *widgetCmdLine;

560
pcsx2/Linux/callbacks.h
View File

@ -1,6 +1,286 @@
#include <gtk/gtk.h> #include <gtk/gtk.h>
void
on_Advanced_Defaults (GtkButton *button,
gpointer user_data);
void
on_Advanced_OK (GtkButton *button,
gpointer user_data);
void
on_Advanced_Cancel (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_Compatability (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_Speed (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_OK (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_Cancel (GtkButton *button,
gpointer user_data);
void
on_Game_Fix_OK (GtkButton *button,
gpointer user_data);
void
on_Game_Fix_Cancel (GtkButton *button,
gpointer user_data);
void
OnMemWrite32_Ok (GtkButton *button,
gpointer user_data);
void
OnMemWrite32_Cancel (GtkButton *button,
gpointer user_data);
void
OnArguments_Ok (GtkButton *button,
gpointer user_data);
void
OnArguments_Cancel (GtkButton *button,
gpointer user_data);
void
OnLogging_Ok (GtkButton *button,
gpointer user_data);
void
OnLogging_Cancel (GtkButton *button,
gpointer user_data);
void
OnDumpR_Ok (GtkButton *button,
gpointer user_data);
void
OnDumpR_Cancel (GtkButton *button,
gpointer user_data);
void
OnDumpC_Ok (GtkButton *button,
gpointer user_data);
void
OnDumpC_Cancel (GtkButton *button,
gpointer user_data);
void
OnSetBPC_Ok (GtkButton *button,
gpointer user_data);
void
OnSetBPC_Cancel (GtkButton *button,
gpointer user_data);
void
OnSetBPA_Ok (GtkButton *button,
gpointer user_data);
void
OnSetBPA_Cancel (GtkButton *button,
gpointer user_data);
void
OnSetPC_Ok (GtkButton *button,
gpointer user_data);
void
OnSetPC_Cancel (GtkButton *button,
gpointer user_data);
void
OnDebug_EEMode (GtkToggleButton *togglebutton,
gpointer user_data);
void
OnDebug_IOPMode (GtkToggleButton *togglebutton,
gpointer user_data);
void
OnDebug_Step (GtkButton *button,
gpointer user_data);
void
OnDebug_Skip (GtkButton *button,
gpointer user_data);
void
OnDebug_Go (GtkButton *button,
gpointer user_data);
void
OnDebug_Log (GtkButton *button,
gpointer user_data);
void
OnDebug_SetPC (GtkButton *button,
gpointer user_data);
void
OnDebug_SetBPA (GtkButton *button,
gpointer user_data);
void
OnDebug_SetBPC (GtkButton *button,
gpointer user_data);
void
OnDebug_ClearBPs (GtkButton *button,
gpointer user_data);
void
OnDebug_DumpCode (GtkButton *button,
gpointer user_data);
void
OnDebug_RawDump (GtkButton *button,
gpointer user_data);
void
OnDebug_Close (GtkButton *button,
gpointer user_data);
void
OnDebug_memWrite32 (GtkButton *button,
gpointer user_data);
void
OnCpu_Ok (GtkButton *button,
gpointer user_data);
void
OnCpu_Cancel (GtkButton *button,
gpointer user_data);
void
OnConfConf_FWConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_FWTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_FWAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_UsbConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_UsbTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_UsbAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_CdvdConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_CdvdTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_CdvdAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_Dev9Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Dev9Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Dev9About (GtkButton *button,
gpointer user_data);
void
OnConfConf_Spu2Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Spu2Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Spu2About (GtkButton *button,
gpointer user_data);
void
OnConfConf_GsConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_GsTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_GsAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad1Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad1Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad1About (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad2Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad2Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad2About (GtkButton *button,
gpointer user_data);
void
OnConfConf_PluginsPath (GtkButton *button,
gpointer user_data);
void
OnConfConf_BiosPath (GtkButton *button,
gpointer user_data);
void
OnConfConf_Ok (GtkButton *button,
gpointer user_data);
void
OnConfConf_Cancel (GtkButton *button,
gpointer user_data);
void
OnHelpAbout_Ok (GtkButton *button,
gpointer user_data);
void void
OnDestroy (GtkObject *object, OnDestroy (GtkObject *object,
gpointer user_data); gpointer user_data);
@ -152,283 +432,3 @@ OnDebug_Logging (GtkMenuItem *menuitem,
void void
OnHelp_About (GtkMenuItem *menuitem, OnHelp_About (GtkMenuItem *menuitem,
gpointer user_data); gpointer user_data);
void
OnHelpAbout_Ok (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad2Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad2Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad2About (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad1Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad1Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Pad1About (GtkButton *button,
gpointer user_data);
void
OnConfConf_GsConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_GsTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_GsAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_Spu2Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Spu2Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Spu2About (GtkButton *button,
gpointer user_data);
void
OnConfConf_Dev9Conf (GtkButton *button,
gpointer user_data);
void
OnConfConf_Dev9Test (GtkButton *button,
gpointer user_data);
void
OnConfConf_Dev9About (GtkButton *button,
gpointer user_data);
void
OnConfConf_CdvdConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_CdvdTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_CdvdAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_UsbConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_UsbTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_UsbAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_FWConf (GtkButton *button,
gpointer user_data);
void
OnConfConf_FWTest (GtkButton *button,
gpointer user_data);
void
OnConfConf_FWAbout (GtkButton *button,
gpointer user_data);
void
OnConfConf_PluginsPath (GtkButton *button,
gpointer user_data);
void
OnConfConf_BiosPath (GtkButton *button,
gpointer user_data);
void
OnConfConf_Ok (GtkButton *button,
gpointer user_data);
void
OnConfConf_Cancel (GtkButton *button,
gpointer user_data);
void
OnCpu_Ok (GtkButton *button,
gpointer user_data);
void
OnCpu_Cancel (GtkButton *button,
gpointer user_data);
void
OnDebug_EEMode (GtkToggleButton *togglebutton,
gpointer user_data);
void
OnDebug_IOPMode (GtkToggleButton *togglebutton,
gpointer user_data);
void
OnDebug_Step (GtkButton *button,
gpointer user_data);
void
OnDebug_Skip (GtkButton *button,
gpointer user_data);
void
OnDebug_Go (GtkButton *button,
gpointer user_data);
void
OnDebug_Log (GtkButton *button,
gpointer user_data);
void
OnDebug_SetPC (GtkButton *button,
gpointer user_data);
void
OnDebug_SetBPA (GtkButton *button,
gpointer user_data);
void
OnDebug_SetBPC (GtkButton *button,
gpointer user_data);
void
OnDebug_ClearBPs (GtkButton *button,
gpointer user_data);
void
OnDebug_DumpCode (GtkButton *button,
gpointer user_data);
void
OnDebug_RawDump (GtkButton *button,
gpointer user_data);
void
OnDebug_Close (GtkButton *button,
gpointer user_data);
void
OnDebug_memWrite32 (GtkButton *button,
gpointer user_data);
void
OnSetPC_Ok (GtkButton *button,
gpointer user_data);
void
OnSetPC_Cancel (GtkButton *button,
gpointer user_data);
void
OnSetBPA_Ok (GtkButton *button,
gpointer user_data);
void
OnSetBPA_Cancel (GtkButton *button,
gpointer user_data);
void
OnSetBPC_Ok (GtkButton *button,
gpointer user_data);
void
OnSetBPC_Cancel (GtkButton *button,
gpointer user_data);
void
OnDumpC_Ok (GtkButton *button,
gpointer user_data);
void
OnDumpC_Cancel (GtkButton *button,
gpointer user_data);
void
OnDumpR_Ok (GtkButton *button,
gpointer user_data);
void
OnDumpR_Cancel (GtkButton *button,
gpointer user_data);
void
OnLogging_Ok (GtkButton *button,
gpointer user_data);
void
OnLogging_Cancel (GtkButton *button,
gpointer user_data);
void
OnArguments_Ok (GtkButton *button,
gpointer user_data);
void
OnArguments_Cancel (GtkButton *button,
gpointer user_data);
void
OnMemWrite32_Ok (GtkButton *button,
gpointer user_data);
void
OnMemWrite32_Cancel (GtkButton *button,
gpointer user_data);
void
on_Game_Fix_OK (GtkButton *button,
gpointer user_data);
void
on_Game_Fix_Cancel (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_Compatability (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_Speed (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_OK (GtkButton *button,
gpointer user_data);
void
on_Speed_Hack_Cancel (GtkButton *button,
gpointer user_data);
void
on_Advanced_Defaults (GtkButton *button,
gpointer user_data);
void
on_Advanced_OK (GtkButton *button,
gpointer user_data);
void
on_Advanced_Cancel (GtkButton *button,
gpointer user_data);

5891
pcsx2/Linux/interface.c
View File

File diff suppressed because it is too large Load Diff

32
pcsx2/Linux/interface.h
View File

@ -2,19 +2,21 @@
* DO NOT EDIT THIS FILE - it is generated by Glade. * DO NOT EDIT THIS FILE - it is generated by Glade.
*/ */
GtkWidget* create_MainWindow (void);
GtkWidget* create_AboutDlg (void);
GtkWidget* create_ConfDlg (void);
GtkWidget* create_CpuDlg (void);
GtkWidget* create_DebugWnd (void);
GtkWidget* create_SetPCDlg (void);
GtkWidget* create_SetBPADlg (void);
GtkWidget* create_SetBPCDlg (void);
GtkWidget* create_DumpCDlg (void);
GtkWidget* create_DumpRDlg (void);
GtkWidget* create_Logging (void);
GtkWidget* create_CmdLine (void);
GtkWidget* create_MemWrite32 (void);
GtkWidget* create_GameFixDlg (void);
GtkWidget* create_SpeedHacksDlg (void);
GtkWidget* create_AdvDlg (void); GtkWidget* create_AdvDlg (void);
GtkWidget* create_SpeedHacksDlg (void);
GtkWidget* create_GameFixDlg (void);
GtkWidget* create_MemWrite32 (void);
GtkWidget* create_CmdLine (void);
GtkWidget* create_Logging (void);
GtkWidget* create_DumpRDlg (void);
GtkWidget* create_DumpCDlg (void);
GtkWidget* create_SetBPCDlg (void);
GtkWidget* create_SetBPADlg (void);
GtkWidget* create_SetPCDlg (void);
GtkWidget* create_DebugWnd (void);
GtkWidget* create_CpuDlg (void);
GtkWidget* create_ConfDlg (void);
GtkWidget* create_AboutDlg (void);
GtkWidget* create_MainWindow (void);
GtkWidget* create_PatchBrowserWindow (void);
GtkWidget* create_PatchFinderWindow (void);

11133
pcsx2/Linux/pcsx2.glade
View File

File diff suppressed because it is too large Load Diff

6
pcsx2/windows/pcsx2.rc
View File

@ -35,7 +35,7 @@ BEGIN
PUSHBUTTON "Cancel",IDCANCEL,99,37,50,14 PUSHBUTTON "Cancel",IDCANCEL,99,37,50,14
CTEXT "Tip: If you don't know what to write\nleave it blank",IDC_TIP,7,56,172,19,WS_BORDER CTEXT "Tip: If you don't know what to write\nleave it blank",IDC_TIP,7,56,172,19,WS_BORDER
EDITTEXT IDC_CMDLINE,7,17,172,14,ES_AUTOHSCROLL EDITTEXT IDC_CMDLINE,7,17,172,14,ES_AUTOHSCROLL
LTEXT "Fill in the command line arguments for opened program:",IDC_TEXT,7,7,174,8 LTEXT "Fill in the command line arguments for the opened program:",IDC_TEXT,7,7,174,8
END END
@ -1030,7 +1030,7 @@ FONT 8, "Microsoft Sans Serif", 400, 0, 0x0
BEGIN BEGIN
DEFPUSHBUTTON "OK",IDOK,205,250,50,14 DEFPUSHBUTTON "OK",IDOK,205,250,50,14
CTEXT "PCSX2 \nVersion x.x",IDC_PCSX_ABOUT_TEXT,55,10,45,15,0,WS_EX_TRANSPARENT CTEXT "PCSX2 \nVersion x.x",IDC_PCSX_ABOUT_TEXT,55,10,45,15,0,WS_EX_TRANSPARENT
CTEXT "PCSX2 a PS2 Emulator...",IDC_PCSX_ABOUT_AUTHORS,9,36,135,92,0,WS_EX_TRANSPARENT CTEXT "PCSX2: a PS2 Emulator...",IDC_PCSX_ABOUT_AUTHORS,9,36,135,92,0,WS_EX_TRANSPARENT
CTEXT "Greets to...",IDC_PCSX_ABOUT_GREETS,88,158,311,77 CTEXT "Greets to...",IDC_PCSX_ABOUT_GREETS,88,158,311,77
GROUPBOX "",IDC_STATIC,5,29,145,113 GROUPBOX "",IDC_STATIC,5,29,145,113
GROUPBOX "",IDC_STATIC,77,148,333,91 GROUPBOX "",IDC_STATIC,77,148,333,91
@ -1141,7 +1141,7 @@ BEGIN
CONTROL "8bits",IDC_8B,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,54,33,10 CONTROL "8bits",IDC_8B,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,54,33,10
PUSHBUTTON "Close",IDCANCEL,208,192,49,15,NOT WS_TABSTOP PUSHBUTTON "Close",IDCANCEL,208,192,49,15,NOT WS_TABSTOP
PUSHBUTTON "Search",IDC_SEARCH,96,192,49,15,NOT WS_TABSTOP PUSHBUTTON "Search",IDC_SEARCH,96,192,49,15,NOT WS_TABSTOP
GROUPBOX "Comapred to",IDC_STATIC,5,162,86,45 GROUPBOX "Compared to",IDC_STATIC,5,162,86,45
EDITTEXT IDC_VALUE,21,192,65,12,ES_AUTOHSCROLL | NOT WS_TABSTOP EDITTEXT IDC_VALUE,21,192,65,12,ES_AUTOHSCROLL | NOT WS_TABSTOP
CONTROL "Specific Value",IDC_SET,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,182,75,10 CONTROL "Specific Value",IDC_SET,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,182,75,10
CONTROL "Old Value",IDC_OLD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,172,75,10 CONTROL "Old Value",IDC_OLD,"Button",BS_AUTORADIOBUTTON | WS_GROUP,11,172,75,10