From aa295feb0d95d75f10f4ac097fdb1139428e1220 Mon Sep 17 00:00:00 2001 From: Stelios Tsampas Date: Mon, 17 Jul 2017 16:43:15 +0300 Subject: * Bring main Linux(gtk) UI up to date to remove deprecated warnings. --- gui/AboutDlg.c | 10 +- gui/Cheat.c | 38 +- gui/ConfDlg.c | 6 +- gui/DebugMemory.c | 46 ++- gui/GtkGui.c | 37 +- gui/Makefile.am | 50 ++- gui/MemcardDlg.c | 13 +- gui/data/Makefile.am | 6 +- gui/data/pcsxr.ui | 558 ++++++++++++------------------ gui/data/pixmaps/Makefile.am | 18 +- gui/data/pixmaps/pcsxr-about.png | Bin 0 -> 294 bytes gui/data/pixmaps/pcsxr-cheats-browse.png | Bin 0 -> 316 bytes gui/data/pixmaps/pcsxr-cheats-search.png | Bin 0 -> 397 bytes gui/data/pixmaps/pcsxr-cheats.png | Bin 0 -> 194 bytes gui/data/pixmaps/pcsxr-cpu.png | Bin 0 -> 427 bytes gui/data/pixmaps/pcsxr-exit.png | Bin 0 -> 372 bytes gui/data/pixmaps/pcsxr-iso-open.png | Bin 3034 -> 1946 bytes gui/data/pixmaps/pcsxr-iso-reopen.png | Bin 1772 -> 435 bytes gui/data/pixmaps/pcsxr-load-state.png | Bin 0 -> 274 bytes gui/data/pixmaps/pcsxr-memory-dump.png | Bin 0 -> 266 bytes gui/data/pixmaps/pcsxr-plugin-netplay.png | Bin 0 -> 283 bytes gui/data/pixmaps/pcsxr-reset.png | Bin 0 -> 308 bytes gui/data/pixmaps/pcsxr-run-bios.png | Bin 0 -> 427 bytes gui/data/pixmaps/pcsxr-run-exe.png | Bin 0 -> 349 bytes gui/data/pixmaps/pcsxr-save-state.png | Bin 0 -> 294 bytes gui/data/pixmaps/pcsxr-settings.png | Bin 0 -> 471 bytes gui/data/pixmaps/pcsxr-shutdown.png | Bin 0 -> 306 bytes gui/data/pixmaps/pcsxr.png | Bin 60106 -> 40920 bytes 28 files changed, 346 insertions(+), 436 deletions(-) create mode 100644 gui/data/pixmaps/pcsxr-about.png create mode 100644 gui/data/pixmaps/pcsxr-cheats-browse.png create mode 100644 gui/data/pixmaps/pcsxr-cheats-search.png create mode 100644 gui/data/pixmaps/pcsxr-cheats.png create mode 100644 gui/data/pixmaps/pcsxr-cpu.png create mode 100644 gui/data/pixmaps/pcsxr-exit.png create mode 100644 gui/data/pixmaps/pcsxr-load-state.png create mode 100644 gui/data/pixmaps/pcsxr-memory-dump.png create mode 100644 gui/data/pixmaps/pcsxr-plugin-netplay.png create mode 100644 gui/data/pixmaps/pcsxr-reset.png create mode 100644 gui/data/pixmaps/pcsxr-run-bios.png create mode 100644 gui/data/pixmaps/pcsxr-run-exe.png create mode 100644 gui/data/pixmaps/pcsxr-save-state.png create mode 100644 gui/data/pixmaps/pcsxr-settings.png create mode 100644 gui/data/pixmaps/pcsxr-shutdown.png (limited to 'gui') diff --git a/gui/AboutDlg.c b/gui/AboutDlg.c index f701c1c9..4f5d02ae 100755 --- a/gui/AboutDlg.c +++ b/gui/AboutDlg.c @@ -19,11 +19,12 @@ #include "Linux.h" #include -#define ABOUT_VERSION "svn" +#define ABOUT_VERSION "git" void RunAboutDialog(void) { GtkBuilder *builder; GtkWidget *AboutDlg; + GdkPixbuf *logo; const gchar *authors[] = { "PCSX-Reloaded Team:", @@ -87,9 +88,11 @@ void RunAboutDialog(void) { "You should have received a copy of the GNU General Public License " "along with this program. If not, see ."); + logo = gdk_pixbuf_new_from_resource("/org/pcsxr/gui/pixmaps/pcsxr-icon.png", NULL); + builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -109,6 +112,9 @@ void RunAboutDialog(void) { gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG (AboutDlg), _("A PlayStation emulator.")); gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(AboutDlg), _(license)); gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(AboutDlg), TRUE); + gtk_about_dialog_set_logo(GTK_ABOUT_DIALOG(AboutDlg), logo); + + g_object_unref(G_OBJECT(logo)); gtk_dialog_run(GTK_DIALOG(AboutDlg)); gtk_widget_destroy(AboutDlg); diff --git a/gui/Cheat.c b/gui/Cheat.c index 497970ae..3ecb6468 100755 --- a/gui/Cheat.c +++ b/gui/Cheat.c @@ -49,7 +49,6 @@ static void LoadCheatListItems(int index) { gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE); gtk_tree_view_set_search_column(GTK_TREE_VIEW(widget), 1); gtk_widget_show(widget); @@ -99,8 +98,8 @@ static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) { GtkWidget *box, *scroll, *label, *descr_edit, *code_edit; dlg = gtk_dialog_new_with_buttons(_("Add New Cheat"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350); @@ -125,7 +124,7 @@ static void OnCheatListDlg_AddClicked(GtkWidget *widget, gpointer user_data) { gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), code_edit); + gtk_container_add(GTK_CONTAINER(scroll), code_edit); gtk_widget_show(code_edit); gtk_box_pack_start(GTK_BOX(box), scroll, TRUE, TRUE, 5); @@ -183,8 +182,8 @@ static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) { gtk_tree_path_free(path); dlg = gtk_dialog_new_with_buttons(_("Edit Cheat"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); gtk_window_set_default_size(GTK_WINDOW(dlg), 350, 350); @@ -220,7 +219,7 @@ static void OnCheatListDlg_EditClicked(GtkWidget *widget, gpointer user_data) { gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scroll), GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_add_with_viewport(GTK_SCROLLED_WINDOW(scroll), code_edit); + gtk_container_add(GTK_CONTAINER(scroll), code_edit); gtk_widget_show(code_edit); gtk_box_pack_start(GTK_BOX(box), scroll, TRUE, TRUE, 5); @@ -311,8 +310,8 @@ static void OnCheatListDlg_OpenClicked(GtkWidget *widget, gpointer user_data) { GtkFileFilter *filter; chooser = gtk_file_chooser_dialog_new (_("Open Cheat File"), - NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + NULL, GTK_FILE_CHOOSER_ACTION_OPEN, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_OK, NULL); filename = g_build_filename(getenv("HOME"), CHEATS_DIR, NULL); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (chooser), filename); @@ -355,8 +354,8 @@ static void OnCheatListDlg_SaveClicked(GtkWidget *widget, gpointer user_data) { GtkFileFilter *filter; chooser = gtk_file_chooser_dialog_new(_("Save Cheat File"), - NULL, GTK_FILE_CHOOSER_ACTION_SAVE, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, NULL); + NULL, GTK_FILE_CHOOSER_ACTION_SAVE, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_OK, NULL); filename = g_build_filename(getenv("HOME"), CHEATS_DIR, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(chooser), filename); @@ -424,7 +423,7 @@ void RunCheatListDialog() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -621,7 +620,6 @@ static void UpdateCheatSearchDialog() { gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE); gtk_widget_show(widget); } @@ -659,8 +657,8 @@ static void OnCheatSearchDlg_FreezeClicked(GtkWidget *widget, gpointer user_data addr = SearchResults[GetSelectedResultIndex()]; dlg = gtk_dialog_new_with_buttons(_("Freeze value"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + GTK_DIALOG_MODAL, "_OK", GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); @@ -672,7 +670,7 @@ static void OnCheatSearchDlg_FreezeClicked(GtkWidget *widget, gpointer user_data gtk_box_pack_start(GTK_BOX(box), descr_edit, FALSE, FALSE, 10); gtk_widget_show(descr_edit); - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 15); label = gtk_label_new(_("Value:")); @@ -758,11 +756,11 @@ static void OnCheatSearchDlg_ModifyClicked(GtkWidget *widget, gpointer user_data addr = SearchResults[GetSelectedResultIndex()]; dlg = gtk_dialog_new_with_buttons(_("Modify value"), GTK_WINDOW(CheatListDlg), - GTK_DIALOG_MODAL, GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, NULL); + GTK_DIALOG_MODAL, "_OK", GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); - hbox = gtk_hbox_new(FALSE, 0); + hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0); gtk_box_pack_start(GTK_BOX(box), hbox, FALSE, FALSE, 5); label = gtk_label_new(_("New value:")); @@ -1136,7 +1134,7 @@ void RunCheatSearchDialog() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } diff --git a/gui/ConfDlg.c b/gui/ConfDlg.c index 25c107eb..30d3df1f 100755 --- a/gui/ConfDlg.c +++ b/gui/ConfDlg.c @@ -101,7 +101,7 @@ void ConfigurePlugins() { UpdatePluginsBIOS(); builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -213,7 +213,7 @@ void OnConf_Net() { } builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -958,7 +958,7 @@ void OnConf_Cpu() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } diff --git a/gui/DebugMemory.c b/gui/DebugMemory.c index 3c7939ab..096b6c5c 100755 --- a/gui/DebugMemory.c +++ b/gui/DebugMemory.c @@ -86,7 +86,6 @@ static void UpdateMemViewDlg() { gtk_tree_view_set_model(GTK_TREE_VIEW(widget), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(widget), TRUE); gtk_widget_show(widget); } @@ -150,30 +149,32 @@ static void MemView_Dump() { char buf[10]; dlg = gtk_dialog_new_with_buttons(_("Memory Dump"), GTK_WINDOW(MemViewDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); - table = gtk_table_new(2, 2, FALSE); + table = gtk_grid_new(); + gtk_grid_set_row_spacing(GTK_GRID(table), 5); + gtk_grid_set_column_spacing(GTK_GRID(table), 5); label = gtk_label_new(_("Start Address (Hexadecimal):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); gtk_widget_show(label); start_edit = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(start_edit), 8); sprintf(buf, "%.8X", MemViewAddress | 0x80000000); gtk_entry_set_text(GTK_ENTRY(start_edit), buf); - gtk_table_attach(GTK_TABLE(table), start_edit, 1, 2, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), start_edit, 1, 0, 1, 1); gtk_widget_show(start_edit); label = gtk_label_new(_("Length (Decimal):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1); gtk_widget_show(label); length_edit = gtk_entry_new(); - gtk_table_attach(GTK_TABLE(table), length_edit, 1, 2, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), length_edit, 1, 1, 1, 1); gtk_widget_show(length_edit); gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5); @@ -196,8 +197,8 @@ static void MemView_Dump() { if (length > 0) { GtkWidget *file_chooser = gtk_file_chooser_dialog_new(_("Dump to File"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, NULL); + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), getenv("HOME")); @@ -228,32 +229,34 @@ static void MemView_Patch() { char buf[12]; dlg = gtk_dialog_new_with_buttons(_("Memory Patch"), GTK_WINDOW(MemViewDlg), - GTK_DIALOG_MODAL, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_ACCEPT, NULL); + GTK_DIALOG_MODAL, "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_ACCEPT, NULL); box = GTK_WIDGET(gtk_dialog_get_content_area(GTK_DIALOG(dlg))); - table = gtk_table_new(2, 2, FALSE); + table = gtk_grid_new(); + gtk_grid_set_row_spacing(GTK_GRID(table), 5); + gtk_grid_set_column_spacing(GTK_GRID(table), 5); label = gtk_label_new(_("Address (Hexadecimal):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 0, 1, 1); gtk_widget_show(label); addr_edit = gtk_entry_new(); gtk_entry_set_max_length(GTK_ENTRY(addr_edit), 8); sprintf(buf, "%.8X", MemViewAddress | 0x80000000); gtk_entry_set_text(GTK_ENTRY(addr_edit), buf); - gtk_table_attach(GTK_TABLE(table), addr_edit, 1, 2, 0, 1, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), addr_edit, 1, 0, 1, 1); gtk_widget_show(addr_edit); label = gtk_label_new(_("Value (Hexa string):")); - gtk_table_attach(GTK_TABLE(table), label, 0, 1, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), label, 0, 1, 1, 1); gtk_widget_show(label); val_edit = gtk_entry_new(); sprintf(buf, "%.2X", MemViewValue); gtk_entry_set_text(GTK_ENTRY(val_edit), buf); - gtk_table_attach(GTK_TABLE(table), val_edit, 1, 2, 1, 2, 0, 0, 5, 5); + gtk_grid_attach(GTK_GRID(table), val_edit, 1, 1, 1, 1); gtk_widget_show(val_edit); gtk_box_pack_start(GTK_BOX(box), table, FALSE, FALSE, 5); @@ -303,12 +306,11 @@ void RunDebugMemoryDialog() { GtkWidget *widget; GtkCellRenderer *renderer; GtkTreeViewColumn *column; - PangoFontDescription *pfd; int i; builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -343,12 +345,6 @@ void RunDebugMemoryDialog() { renderer, "text", 17, NULL); gtk_tree_view_append_column(GTK_TREE_VIEW(widget), column); - pfd = pango_font_description_from_string("Bitstream Vera Sans Mono, " - "DejaVu Sans Mono, Liberation Mono, FreeMono, Sans Mono 9"); - - gtk_widget_override_font(widget, pfd); - - pango_font_description_free(pfd); UpdateMemViewDlg(); diff --git a/gui/GtkGui.c b/gui/GtkGui.c index 17f1422f..970be43b 100755 --- a/gui/GtkGui.c +++ b/gui/GtkGui.c @@ -28,6 +28,7 @@ #include #include #include +#include #include "Linux.h" @@ -320,9 +321,13 @@ void StartGui() { gtk_window_present (GTK_WINDOW (Window)); return; }*/ + GtkIconTheme *itheme = gtk_icon_theme_get_default(); + gtk_icon_theme_add_resource_path(itheme,"/org/pcsxr/gui"); + gtk_icon_theme_add_resource_path(itheme,"/org/pcsxr/gui/pixmaps/"); + builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } @@ -331,8 +336,8 @@ void StartGui() { gtk_widget_show(GTK_WIDGET(Window)); gtk_window_set_title(GTK_WINDOW(Window), "PCSXR"); - gtk_window_set_icon_from_file(GTK_WINDOW(Window), PIXMAPDIR "pcsxr-icon.png", NULL); - gtk_window_set_default_icon_from_file(PIXMAPDIR "pcsxr-icon.png", NULL); + gtk_window_set_icon(GTK_WINDOW(Window), gdk_pixbuf_new_from_resource("/org/pcsxr/gui/pixmaps/pcsxr-icon.png", NULL)); + gtk_window_set_default_icon(gdk_pixbuf_new_from_resource("/org/pcsxr/gui/pixmaps/pcsxr-icon.png", NULL)); ResetMenuSlots(); // Set up callbacks @@ -462,9 +467,11 @@ void StartGui() { G_CALLBACK(OnConf_Sio1), NULL, NULL, G_CONNECT_AFTER); #endif widget = GTK_WIDGET(gtk_builder_get_object(builder, "cpu1")); - g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER); + g_signal_connect_data(G_OBJECT(widget), "activate", + G_CALLBACK(OnConf_Cpu), NULL, NULL, G_CONNECT_AFTER); widget = GTK_WIDGET(gtk_builder_get_object(builder, "pgxp1")); - g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Pgxp), NULL, NULL, G_CONNECT_AFTER); + g_signal_connect_data(G_OBJECT(widget), "activate", + G_CALLBACK(OnConf_Pgxp), NULL, NULL, G_CONNECT_AFTER); widget = GTK_WIDGET(gtk_builder_get_object(builder, "memory_cards1")); g_signal_connect_data(G_OBJECT(widget), "activate", G_CALLBACK(OnConf_Mcds), NULL, NULL, G_CONNECT_AFTER); @@ -572,8 +579,8 @@ void OnFile_RunExe() { } else { file_chooser = gtk_file_chooser_dialog_new(_("Select PSX EXE File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); // Add file filters GtkFileFilter *exefilter = gtk_file_filter_new (); @@ -709,8 +716,8 @@ static gchar *Open_Iso_Proc() { static char current_folder[MAXPATHLEN] = ""; chooser = gtk_file_chooser_dialog_new (_("Open PSX Disc Image File"), - NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OK, GTK_RESPONSE_OK, + NULL, GTK_FILE_CHOOSER_ACTION_OPEN, "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); if (stat(Config.IsoImgDir, &sb) == 0 && S_ISDIR(sb.st_mode)) { @@ -747,7 +754,7 @@ static gchar *Open_Iso_Proc() { gtk_file_filter_set_name(allfilter, _("All Files")); gtk_file_chooser_add_filter(GTK_FILE_CHOOSER (chooser), allfilter); - if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_OK) { + if (gtk_dialog_run(GTK_DIALOG(chooser)) == GTK_RESPONSE_ACCEPT) { gchar *path = gtk_file_chooser_get_current_folder(GTK_FILE_CHOOSER(chooser)); /* Workaround: @@ -1084,8 +1091,8 @@ void on_states_load_other() { SStateFile = g_strconcat(getenv("HOME"), STATES_DIR, NULL); file_chooser = gtk_file_chooser_dialog_new(_("Select State File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Open", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER (file_chooser), SStateFile); g_free(SStateFile); @@ -1113,8 +1120,8 @@ void on_states_save_other() { file_chooser = gtk_file_chooser_dialog_new(_("Select State File"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_OK, NULL); gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(file_chooser), SStateFile); g_free(SStateFile); @@ -1155,7 +1162,7 @@ void SysMessage(const char *fmt, ...) { } MsgDlg = gtk_dialog_new_with_buttons(_("Notice"), NULL, - GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_OK, GTK_RESPONSE_NONE, NULL); + GTK_DIALOG_DESTROY_WITH_PARENT, "_OK", GTK_RESPONSE_NONE, NULL); gtk_window_set_position (GTK_WINDOW(MsgDlg), GTK_WIN_POS_CENTER); diff --git a/gui/Makefile.am b/gui/Makefile.am index 5feb39ea..ebae1d48 100644 --- a/gui/Makefile.am +++ b/gui/Makefile.am @@ -24,7 +24,55 @@ pcsxr_SOURCES = \ DebugMemory.c \ DebugMemory.h \ AboutDlg.c \ - AboutDlg.h + AboutDlg.h \ + GtkResources.c \ + GtkResources.h + +# gresource.xml is dynamically generated in CMake. Mirror that here in a static way. +define gresource_xml = + + + + pcsxr.ui + pixmaps/pcsxr-about.png + pixmaps/pcsxr-cd-open.png + pixmaps/pcsxr-cheats-browse.png + pixmaps/pcsxr-cheats-search.png + pixmaps/pcsxr-cheats.png + pixmaps/pcsxr-cpu.png + pixmaps/pcsxr-exit.png + pixmaps/pcsxr-icon.png + pixmaps/pcsxr-iso-open.png + pixmaps/pcsxr-iso-reopen.png + pixmaps/pcsxr-load-state.png + pixmaps/pcsxr-memcard.png + pixmaps/pcsxr-memory-dump.png + pixmaps/pcsxr-play.png + pixmaps/pcsxr-plugin-cdr.png + pixmaps/pcsxr-plugin-gpu.png + pixmaps/pcsxr-plugin-netplay.png + pixmaps/pcsxr-plugin-pad.png + pixmaps/pcsxr-plugin-sio1.png + pixmaps/pcsxr-plugin-spu.png + pixmaps/pcsxr-reset.png + pixmaps/pcsxr-run-bios.png + pixmaps/pcsxr-run-exe.png + pixmaps/pcsxr-save-state.png + pixmaps/pcsxr-settings.png + pixmaps/pcsxr-shutdown.png + pixmaps/pcsxr.png + + +endef + +pcsxr.gresource.xml: + $(file >$@,$(gresource_xml)) +pcsxr_gresource: pcsxr.gresource.xml + $(shell $(GLIB_COMPILE_RESOURCES) --sourcedir=$(srcdir)/data --generate-dependencies $(srcdir)/$<) +GtkResources.c: pcsxr.gresource.xml $(pcsxr_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate-source --c-name pcsxr $< +GtkResources.h: pcsxr.gresource.xml $(pcsxr_gresource) + $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir)/data --generate-header --c-name pcsxr $< pcsxr_LDADD = \ ../libpcsxcore/libpcsxcore.a \ diff --git a/gui/MemcardDlg.c b/gui/MemcardDlg.c index b9f2dab0..fada33ff 100755 --- a/gui/MemcardDlg.c +++ b/gui/MemcardDlg.c @@ -236,7 +236,6 @@ static void LoadListItems(int mcd, boolean newstore) { if (newstore) { gtk_tree_view_set_model(GTK_TREE_VIEW(List), GTK_TREE_MODEL(store)); g_object_unref(G_OBJECT(store)); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(List), TRUE); } else { OnTreeSelectionChanged(gtk_tree_view_get_selection(GTK_TREE_VIEW(List)), GINT_TO_POINTER(mcd)); } @@ -308,8 +307,8 @@ static void OnMcd_FileChange(GtkWidget *widget, gpointer user_data) { // Ask for name of memory card chooser = gtk_file_chooser_dialog_new(_("Select A File"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_OK, + "_Cancel", GTK_RESPONSE_CANCEL, + "_OK", GTK_RESPONSE_OK, NULL); if (memcard == 1) @@ -350,7 +349,7 @@ static void OnMcd_Format(GtkWidget *widget, gpointer user_data) { gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(message_dialog), _("If you format the memory card, the card will be empty, and any existing data overwritten.")); gtk_dialog_add_buttons(GTK_DIALOG(message_dialog), - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + "_Cancel", GTK_RESPONSE_CANCEL, _("Format card"), GTK_RESPONSE_YES, NULL); result = gtk_dialog_run(GTK_DIALOG(message_dialog)); @@ -375,8 +374,8 @@ static void OnMcd_New(GtkWidget *widget, gpointer user_data) { // Ask for name of new memory card chooser = gtk_file_chooser_dialog_new(_("Create a new Memory Card"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + "_Cancel", GTK_RESPONSE_CANCEL, + "_Save", GTK_RESPONSE_OK, NULL); // Card should be put into $HOME/.pcsxr/memcards @@ -709,7 +708,7 @@ void OnConf_Mcds() { builder = gtk_builder_new(); - if (!gtk_builder_add_from_file(builder, PACKAGE_DATA_DIR "pcsxr.ui", NULL)) { + if (!gtk_builder_add_from_resource(builder, "/org/pcsxr/gui/pcsxr.ui", NULL)) { g_warning("Error: interface could not be loaded!"); return; } diff --git a/gui/data/Makefile.am b/gui/data/Makefile.am index 8f1ce6a2..07966973 100644 --- a/gui/data/Makefile.am +++ b/gui/data/Makefile.am @@ -1,7 +1,7 @@ -glade_DATA = pcsxr.ui -gladedir = $(datadir)/pcsxr +#glade_DATA = pcsxr.ui +#gladedir = $(datadir)/pcsxr desktopdir = $(datadir)/applications desktop_DATA = pcsxr.desktop -EXTRA_DIST = $(glade_DATA) pcsxr.desktop +EXTRA_DIST = $(glade_DATA) $(desktop_DATA) diff --git a/gui/data/pcsxr.ui b/gui/data/pcsxr.ui index 2d8f2ddf..6cc4b24f 100644 --- a/gui/data/pcsxr.ui +++ b/gui/data/pcsxr.ui @@ -1,21 +1,7 @@ - + - - - - - - - - - - - - - - - + False 5 @@ -87,7 +73,7 @@ - + True False 15 @@ -131,9 +117,10 @@ - + True False + vertical 5 @@ -268,10 +255,11 @@ - + True False 5 + vertical 3 @@ -284,74 +272,64 @@ False 5 - + True False - 7 - 5 - 5 5 + 5 True False - generated-icon-gpu-png + pcsxr-plugin-gpu - GTK_FILL - GTK_FILL + 0 + 0 True False - generated-icon-cdr-png + pcsxr-plugin-cdr + 0 4 - 5 - GTK_FILL - GTK_FILL True False - generated-icon-pad-png + pcsxr-plugin-pad + 0 3 - 4 - GTK_FILL - GTK_FILL True False - generated-icon-pad-png + pcsxr-plugin-pad + 0 2 - 3 - GTK_FILL - GTK_FILL True False - generated-icon-spu-png + pcsxr-plugin-spu + 0 1 - 2 - GTK_FILL - GTK_FILL @@ -370,9 +348,7 @@ 3 - 4 - GTK_FILL - + 0 @@ -382,10 +358,7 @@ 2 - 3 4 - 5 - GTK_FILL @@ -395,10 +368,7 @@ 2 - 3 3 - 4 - GTK_FILL @@ -412,10 +382,7 @@ 2 - 3 2 - 3 - GTK_FILL @@ -425,10 +392,7 @@ 2 - 3 1 - 2 - GTK_FILL @@ -438,8 +402,7 @@ 2 - 3 - GTK_FILL + 0 @@ -458,11 +421,7 @@ 4 - 5 1 - 2 - - @@ -481,11 +440,7 @@ 4 - 5 2 - 3 - - @@ -504,11 +459,7 @@ 4 - 5 3 - 4 - - @@ -527,11 +478,7 @@ 4 - 5 4 - 5 - - @@ -550,11 +497,7 @@ 3 - 4 4 - 5 - - @@ -573,11 +516,7 @@ 3 - 4 3 - 4 - - @@ -596,11 +535,7 @@ 3 - 4 2 - 3 - - @@ -619,89 +554,67 @@ 3 - 4 1 - 2 - - True False - 0 Graphics: + 0 1 - 2 - GTK_FILL - + 0 True False - 0 Sound: + 0 1 - 2 1 - 2 - GTK_FILL - True False - 0 Controller 1: + 0 1 - 2 2 - 3 - GTK_FILL - True False - 0 Controller 2: + 0 1 - 2 3 - 4 - GTK_FILL - True False - 0 CD-ROM: + 0 1 - 2 4 - 5 - GTK_FILL - @@ -720,9 +633,7 @@ 4 - 5 - - + 0 @@ -732,26 +643,20 @@ gtk-find + 0 6 - 7 - GTK_FILL - GTK_FILL True False - 0 Search in: + 0 1 - 2 6 - 7 - GTK_FILL - @@ -776,38 +681,30 @@ 2 - 5 6 - 7 True False - generated-icon-sio1-png + pcsxr-plugin-sio1 + 0 5 - 6 - GTK_FILL - GTK_FILL True False - 0 Link cable: + 0 1 - 2 5 - 6 - GTK_FILL - @@ -817,10 +714,7 @@ 2 - 3 5 - 6 - GTK_FILL @@ -839,11 +733,7 @@ 3 - 4 5 - 6 - - @@ -862,13 +752,15 @@ 4 - 5 5 - 6 - - + + + + + + @@ -920,8 +812,8 @@ True False - 0 BIOS: + 0 1 @@ -943,8 +835,8 @@ True False - 0 Search in: + 0 1 @@ -1040,6 +932,7 @@ True False + vertical True @@ -1069,7 +962,7 @@ - + True False @@ -1079,10 +972,11 @@ 5 0 - + True False 6 + vertical 6 @@ -1108,7 +1002,7 @@ - + True False 5 @@ -1127,7 +1021,7 @@ 0 0 - + True False 2 @@ -1147,9 +1041,9 @@ True False - 0 New True + 0 False @@ -1182,7 +1076,7 @@ 0 0 - + True False 2 @@ -1202,9 +1096,9 @@ True False - 0 Format True + 0 False @@ -1237,7 +1131,7 @@ 0 0 - + True False 2 @@ -1257,9 +1151,9 @@ True False - 0 Un/Delete True + 0 False @@ -1291,7 +1185,7 @@ True True - + True False 3 @@ -1322,7 +1216,7 @@ - + True False @@ -1356,7 +1250,7 @@ - + True False @@ -1389,11 +1283,12 @@ 27 132 - + True False + vertical 6 - spread + center True @@ -1408,7 +1303,7 @@ 0 0 - + True False 2 @@ -1428,9 +1323,9 @@ True False - 0 Copy True + 0 False @@ -1463,7 +1358,7 @@ 0 0 - + True False 2 @@ -1483,9 +1378,9 @@ True False - 0 Copy True + 0 False @@ -1520,10 +1415,11 @@ 5 0 - + True False 6 + vertical 6 @@ -1549,7 +1445,7 @@ - + True False 5 @@ -1568,7 +1464,7 @@ 0 0 - + True False 2 @@ -1588,9 +1484,9 @@ True False - 0 New True + 0 False @@ -1623,7 +1519,7 @@ 0 0 - + True False 2 @@ -1643,9 +1539,9 @@ True False - 0 Format True + 0 False @@ -1678,7 +1574,7 @@ 0 0 - + True False 2 @@ -1698,9 +1594,9 @@ True False - 0 Un/Delete True + 0 False @@ -1732,7 +1628,7 @@ True True - + True False 3 @@ -1763,7 +1659,7 @@ - + True False @@ -1797,7 +1693,7 @@ - + True False @@ -1878,12 +1774,12 @@ - + True False 13 - + True False 10 @@ -1891,8 +1787,8 @@ True False - 0 Address (Hexadecimal): + 0 False @@ -1923,7 +1819,7 @@ - + True False 10 @@ -2001,6 +1897,9 @@ + @@ -2011,7 +1910,7 @@ - + True False 20 @@ -2022,7 +1921,7 @@ True True - + True False @@ -2041,8 +1940,8 @@ True False - 0 Raw Dump... + 0 True @@ -2065,7 +1964,7 @@ True True - + True False @@ -2084,8 +1983,8 @@ True False - 0 Patch Memory... + 0 True @@ -2156,9 +2055,10 @@ - + True False + vertical True @@ -2171,7 +2071,7 @@ False 5 - + True False 5 @@ -2273,176 +2173,177 @@ True False - gtk-open + pcsxr-load-state 1 True False - gtk-revert-to-saved + pcsxr-load-state 1 True False - gtk-preferences + pcsxr-settings 1 True False - gtk-properties + pcsxr-cpu 1 True False - gtk-floppy + pcsxr-memcard 1 True False - gtk-properties + pcsxr-plugin-netplay 1 True False - gtk-indent + pcsxr-cheats 1 True False - gtk-index + pcsxr-cheats-browse 1 True False - gtk-find + pcsxr-cheats-search 1 True False - gtk-about + pcsxr-about 1 True False - gtk-save-as + pcsxr-save-state 1 True False 0.49000000953674316 - gtk-cdrom + pcsxr-cd-open 1 True False - gtk-stop + pcsxr-shutdown 1 True False - gtk-select-color + pcsxr-plugin-gpu 1 True False - gtk-convert + pcsxr-plugin-spu 1 True False - gtk-cdrom + pcsxr-plugin-cdr 1 True False - gtk-execute + pcsxr-plugin-pad 1 True False - gtk-quit + pcsxr-exit 1 True False - gtk-open + pcsxr-iso-open 1 True False - gtk-revert-to-saved + pcsxr-memory-dump 1 True False - gtk-convert + pcsxr-run-bios 1 True False - gtk-execute + pcsxr-plugin-sio1 1 True False - gtk-execute + pcsxr-run-exe 1 True False - gtk-go-forward + pcsxr-play 1 True False - gtk-refresh + pcsxr-reset 1 True False - gtk-open + pcsxr-iso-reopen 1 True False - gtk-save-as + pcsxr-save-state 1 - + False PCSXR False pcsxr-icon.png - + True False + vertical True @@ -3045,11 +2946,9 @@ - + True False - 5 - 11 True @@ -3057,8 +2956,12 @@ True Run CD True - generated-icon-cd-png + pcsxr-cd-open + + False + True + @@ -3067,11 +2970,11 @@ True Run ISO Image True - generated-icon-iso-open-png + pcsxr-iso-open - 1 - 2 + False + True @@ -3080,8 +2983,8 @@ False - 2 - 3 + False + False @@ -3091,11 +2994,11 @@ True Continue Emulation True - generated-icon-play-png + pcsxr-play - 3 - 4 + False + True @@ -3105,11 +3008,11 @@ True Switch ISO Image True - generated-icon-iso-reopen-png + pcsxr-iso-reopen - 4 - 5 + False + True @@ -3118,8 +3021,8 @@ False - 5 - 6 + False + False @@ -3129,11 +3032,11 @@ True Configure Memory Cards True - generated-icon-memcard-png + pcsxr-memcard - 6 - 7 + False + True @@ -3143,11 +3046,11 @@ True Configure Graphics True - generated-icon-gpu-png + pcsxr-plugin-gpu - 7 - 8 + False + True @@ -3157,11 +3060,11 @@ True Configure Sound True - generated-icon-spu-png + pcsxr-plugin-spu - 8 - 9 + False + True @@ -3171,11 +3074,11 @@ True Configure CD-ROM True - generated-icon-cdr-png + pcsxr-plugin-cdr - 9 - 10 + False + True @@ -3185,11 +3088,11 @@ True Configure Controllers True - generated-icon-pad-png + pcsxr-plugin-pad - 10 - 11 + False + True @@ -3203,7 +3106,7 @@ True False - pcsxr.png + pixmaps/pcsxr.png True @@ -3360,18 +3263,17 @@ 5 5 - + True False + vertical 5 - + True False - 3 - 4 - 5 5 + 5 True @@ -3386,42 +3288,43 @@ 1 - 2 1 - 2 - True False - 0 Search For: + 0 + + 0 + 0 + True False - 0 Data Type: + 0 + 0 1 - 2 True False - 0 Value: + 0 + 0 2 - 3 @@ -3432,9 +3335,7 @@ 2 - 3 1 - 2 @@ -3451,8 +3352,7 @@ 1 - 2 - + 0 @@ -3464,10 +3364,7 @@ 1 - 2 2 - 3 - @@ -3484,10 +3381,7 @@ 3 - 4 1 - 2 - @@ -3498,14 +3392,9 @@ 2 - 3 2 - 3 - - - True @@ -3515,14 +3404,15 @@ 3 - 4 2 - 3 + + + False @@ -3531,7 +3421,7 @@ - + True False @@ -3562,9 +3452,10 @@ - + True False + vertical 10 start @@ -3573,7 +3464,7 @@ True True - + True False @@ -3593,8 +3484,8 @@ True False - 0 Freeze + 0 True @@ -3617,7 +3508,7 @@ True True - + True False @@ -3637,8 +3528,8 @@ True False - 0 Modify + 0 True @@ -3661,7 +3552,7 @@ True True - + True False @@ -3681,8 +3572,8 @@ True False - 0 Copy + 0 True @@ -3718,10 +3609,10 @@ True False - 0 - 0 label_resultsfound True + 0 + 0 False @@ -3730,7 +3621,7 @@ - + True False 20 @@ -3741,7 +3632,7 @@ True True - + True False @@ -3761,8 +3652,8 @@ True False - 0 Search + 0 True @@ -3785,7 +3676,7 @@ True True - + True False @@ -3805,8 +3696,8 @@ True False - 0 Restart + 0 True @@ -3912,10 +3803,11 @@ - + True False 5 + vertical 5 @@ -3923,14 +3815,11 @@ False 0 - + True False 5 - 12 - - - + vertical SPU IRQ Always Enabled @@ -3942,10 +3831,8 @@ True + 0 2 - 3 - GTK_FILL - @@ -3959,10 +3846,8 @@ True + 0 3 - 4 - GTK_FILL - @@ -3976,10 +3861,8 @@ True + 0 1 - 2 - GTK_FILL - @@ -3993,8 +3876,8 @@ True - GTK_FILL - + 0 + 0 @@ -4008,10 +3891,8 @@ True + 0 5 - 6 - GTK_FILL - @@ -4025,10 +3906,8 @@ True + 0 7 - 8 - GTK_FILL - @@ -4042,10 +3921,8 @@ True + 0 6 - 7 - GTK_FILL - @@ -4059,10 +3936,8 @@ True + 0 8 - 9 - GTK_FILL - @@ -4076,10 +3951,8 @@ True + 0 9 - 10 - GTK_FILL - @@ -4093,10 +3966,8 @@ True + 0 10 - 11 - GTK_FILL - @@ -4110,10 +3981,8 @@ True + 0 11 - 12 - GTK_FILL - @@ -4127,10 +3996,8 @@ True + 0 12 - 13 - GTK_FILL - @@ -4144,12 +4011,13 @@ True + 0 13 - 14 - GTK_FILL - + + + @@ -4173,7 +4041,7 @@ False 0 - + True False 5 @@ -4224,7 +4092,7 @@ False 0 - + True False 5 @@ -4344,7 +4212,7 @@ False 0 - + True False 5 @@ -4481,7 +4349,7 @@ False 0 - + True False 5 diff --git a/gui/data/pixmaps/Makefile.am b/gui/data/pixmaps/Makefile.am index 904ffe34..f5be2e62 100644 --- a/gui/data/pixmaps/Makefile.am +++ b/gui/data/pixmaps/Makefile.am @@ -1,5 +1,5 @@ -pixmapdir = "$(datadir)/pcsxr" -pixmap_DATA = \ +#pixmapdir = "$(datadir)/pcsxr" +#pixmap_DATA = \ pcsxr-cd-open.png \ pcsxr-iso-open.png \ pcsxr-iso-reopen.png \ @@ -15,16 +15,4 @@ pixmap_DATA = \ icondir = "$(datadir)/pixmaps" icon_DATA = pcsxr-icon.png -EXTRA_DIST = \ - pcsxr-cd-open.png \ - pcsxr-iso-open.png \ - pcsxr-iso-reopen.png \ - pcsxr-memcard.png \ - pcsxr-play.png \ - pcsxr-plugin-cdr.png \ - pcsxr-plugin-gpu.png \ - pcsxr-plugin-pad.png \ - pcsxr-plugin-sio1.png \ - pcsxr-plugin-spu.png \ - pcsxr.png \ - pcsxr-icon.png +EXTRA_DIST = $(pixmap_DATA) $(icon_DATA) diff --git a/gui/data/pixmaps/pcsxr-about.png b/gui/data/pixmaps/pcsxr-about.png new file mode 100644 index 00000000..a23c775c Binary files /dev/null and b/gui/data/pixmaps/pcsxr-about.png differ diff --git a/gui/data/pixmaps/pcsxr-cheats-browse.png b/gui/data/pixmaps/pcsxr-cheats-browse.png new file mode 100644 index 00000000..e309ecb8 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cheats-browse.png differ diff --git a/gui/data/pixmaps/pcsxr-cheats-search.png b/gui/data/pixmaps/pcsxr-cheats-search.png new file mode 100644 index 00000000..e2558a78 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cheats-search.png differ diff --git a/gui/data/pixmaps/pcsxr-cheats.png b/gui/data/pixmaps/pcsxr-cheats.png new file mode 100644 index 00000000..1e814b85 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cheats.png differ diff --git a/gui/data/pixmaps/pcsxr-cpu.png b/gui/data/pixmaps/pcsxr-cpu.png new file mode 100644 index 00000000..55deaa6b Binary files /dev/null and b/gui/data/pixmaps/pcsxr-cpu.png differ diff --git a/gui/data/pixmaps/pcsxr-exit.png b/gui/data/pixmaps/pcsxr-exit.png new file mode 100644 index 00000000..c5f7865c Binary files /dev/null and b/gui/data/pixmaps/pcsxr-exit.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-open.png b/gui/data/pixmaps/pcsxr-iso-open.png index 3daaea2a..80dff9c8 100644 Binary files a/gui/data/pixmaps/pcsxr-iso-open.png and b/gui/data/pixmaps/pcsxr-iso-open.png differ diff --git a/gui/data/pixmaps/pcsxr-iso-reopen.png b/gui/data/pixmaps/pcsxr-iso-reopen.png index 3294074a..20e218d1 100644 Binary files a/gui/data/pixmaps/pcsxr-iso-reopen.png and b/gui/data/pixmaps/pcsxr-iso-reopen.png differ diff --git a/gui/data/pixmaps/pcsxr-load-state.png b/gui/data/pixmaps/pcsxr-load-state.png new file mode 100644 index 00000000..91ddd251 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-load-state.png differ diff --git a/gui/data/pixmaps/pcsxr-memory-dump.png b/gui/data/pixmaps/pcsxr-memory-dump.png new file mode 100644 index 00000000..3b9fde0c Binary files /dev/null and b/gui/data/pixmaps/pcsxr-memory-dump.png differ diff --git a/gui/data/pixmaps/pcsxr-plugin-netplay.png b/gui/data/pixmaps/pcsxr-plugin-netplay.png new file mode 100644 index 00000000..6227d829 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-plugin-netplay.png differ diff --git a/gui/data/pixmaps/pcsxr-reset.png b/gui/data/pixmaps/pcsxr-reset.png new file mode 100644 index 00000000..7edb426b Binary files /dev/null and b/gui/data/pixmaps/pcsxr-reset.png differ diff --git a/gui/data/pixmaps/pcsxr-run-bios.png b/gui/data/pixmaps/pcsxr-run-bios.png new file mode 100644 index 00000000..55deaa6b Binary files /dev/null and b/gui/data/pixmaps/pcsxr-run-bios.png differ diff --git a/gui/data/pixmaps/pcsxr-run-exe.png b/gui/data/pixmaps/pcsxr-run-exe.png new file mode 100644 index 00000000..53907fe4 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-run-exe.png differ diff --git a/gui/data/pixmaps/pcsxr-save-state.png b/gui/data/pixmaps/pcsxr-save-state.png new file mode 100644 index 00000000..8f1d1988 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-save-state.png differ diff --git a/gui/data/pixmaps/pcsxr-settings.png b/gui/data/pixmaps/pcsxr-settings.png new file mode 100644 index 00000000..90d18e80 Binary files /dev/null and b/gui/data/pixmaps/pcsxr-settings.png differ diff --git a/gui/data/pixmaps/pcsxr-shutdown.png b/gui/data/pixmaps/pcsxr-shutdown.png new file mode 100644 index 00000000..781d877a Binary files /dev/null and b/gui/data/pixmaps/pcsxr-shutdown.png differ diff --git a/gui/data/pixmaps/pcsxr.png b/gui/data/pixmaps/pcsxr.png index 8dc59052..92760f9d 100644 Binary files a/gui/data/pixmaps/pcsxr.png and b/gui/data/pixmaps/pcsxr.png differ -- cgit v1.2.3