* Bring main Linux(gtk) UI up to date to remove deprecated warnings.

configure.ac

@@ -34,6 +34,9 @@ PKG_CHECK_MODULES([SDL2], [sdl2 >= 2.0.0],
     ], AC_MSG_ERROR([*** SDL >= 1.2.12 not found!]))
 ])
 
+AC_PATH_PROG(GLIB_COMPILE_RESOURCES, glib-compile-resources)
+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
+
 AC_SUBST(GLIB2_CFLAGS)
 AC_SUBST(GLIB2_LIBS)
 AC_SUBST(GTK3_CFLAGS)

gui/AboutDlg.c

@@ -19,11 +19,12 @@
 #include "Linux.h"
 #include <gtk/gtk.h>
 
-#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 <http://www.gnu.org/licenses/>.");
 
+	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);

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;
 	}

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;
 	}

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();
 

gui/GtkGui.c

@@ -28,6 +28,7 @@
 #include <signal.h>
 #include <sys/time.h>
 #include <regex.h>
+#include <libintl.h>
 
 #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);
 

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 =
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+  <gresource prefix="/org/pcsxr/gui">
+    <file>pcsxr.ui</file>
+    <file>pixmaps/pcsxr-about.png</file>
+    <file>pixmaps/pcsxr-cd-open.png</file>
+    <file>pixmaps/pcsxr-cheats-browse.png</file>
+    <file>pixmaps/pcsxr-cheats-search.png</file>
+    <file>pixmaps/pcsxr-cheats.png</file>
+    <file>pixmaps/pcsxr-cpu.png</file>
+    <file>pixmaps/pcsxr-exit.png</file>
+    <file>pixmaps/pcsxr-icon.png</file>
+    <file>pixmaps/pcsxr-iso-open.png</file>
+    <file>pixmaps/pcsxr-iso-reopen.png</file>
+    <file>pixmaps/pcsxr-load-state.png</file>
+    <file>pixmaps/pcsxr-memcard.png</file>
+    <file>pixmaps/pcsxr-memory-dump.png</file>
+    <file>pixmaps/pcsxr-play.png</file>
+    <file>pixmaps/pcsxr-plugin-cdr.png</file>
+    <file>pixmaps/pcsxr-plugin-gpu.png</file>
+    <file>pixmaps/pcsxr-plugin-netplay.png</file>
+    <file>pixmaps/pcsxr-plugin-pad.png</file>
+    <file>pixmaps/pcsxr-plugin-sio1.png</file>
+    <file>pixmaps/pcsxr-plugin-spu.png</file>
+    <file>pixmaps/pcsxr-reset.png</file>
+    <file>pixmaps/pcsxr-run-bios.png</file>
+    <file>pixmaps/pcsxr-run-exe.png</file>
+    <file>pixmaps/pcsxr-save-state.png</file>
+    <file>pixmaps/pcsxr-settings.png</file>
+    <file>pixmaps/pcsxr-shutdown.png</file>
+    <file>pixmaps/pcsxr.png</file>
+  </gresource>
+</gresources>
+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 \

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;
 	}

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)

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)