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

1 files changed, 22 insertions, 15 deletions

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