git-svn-id: https://pcsxr.svn.codeplex.com/svn/pcsxr@64521 e17a0e51-4ae3-4d35-97c3-1a29b211df97

4 files changed, 68 insertions, 10 deletions

diff --git a/plugins/bladesio1/Makefile.am b/plugins/bladesio1/Makefile.am
index f61ab6df..f6d4e5a3 100644
--- a/plugins/bladesio1/Makefile.am
+++ b/plugins/bladesio1/Makefile.am
@@ -8,13 +8,13 @@ libBladeSio1_la_LDFLAGS = -module -avoid-version
 
 AM_CPPFLAGS = -DLOCALE_DIR=\"${datadir}/locale/\" \
 	-DDATADIR=\"${datadir}/psemu/\" \
-	$(GTK2_CFLAGS) $(GLADE2_CFLAGS) \
+	$(GTK2_CFLAGS) \
 	-I../../libpcsxcore -I../../include
 
 bin_PROGRAMS = cfgBladeSio1
 cfgBladeSio1_SOURCES = gui.c
-cfgBladeSio1_LDADD = $(GTK2_LIBS) $(GLADE2_LIBS)
+cfgBladeSio1_LDADD = $(GTK2_LIBS)
 
-glade_DATA = sio1.glade2
+glade_DATA = sio1.ui
 gladedir = $(datadir)/psemu/
 EXTRA_DIST = $(glade_DATA)
diff --git a/plugins/bladesio1/gui.c b/plugins/bladesio1/gui.c
index 342d1d55..9bd1e852 100644
--- a/plugins/bladesio1/gui.c
+++ b/plugins/bladesio1/gui.c
@@ -4,10 +4,63 @@
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
-#include <glade/glade.h>
+
+#include "settings.h"
+#include "sio1.h"
+
+/******************************************************************************/
+
+Settings settings;
+
+/******************************************************************************/
 
 long CFGopen()
 {
+	GtkBuilder *builder;
+	GtkWidget *widget, *MainWindow;
+	
+	//settingsRead();
+
+	builder = gtk_builder_new();
+
+	if (!gtk_builder_add_from_file(builder, DATADIR "sio1.ui", NULL)) {
+		g_warning("We could not load the interface!");
+		return 0;
+	}
+
+	MainWindow = gtk_builder_get_object(builder, "dlgStart");
+	gtk_window_set_title(GTK_WINDOW(MainWindow), _("Link cable"));
+
+	if (settings.player == 1) {
+		widget = gtk_builder_get_object(builder, "rbServer");
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+	} else {
+		widget = gtk_builder_get_object(builder, "rbClient");
+		gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(widget), TRUE);
+	}
+	
+	if (gtk_dialog_run(GTK_DIALOG(MainWindow)) == GTK_RESPONSE_OK) {
+		widget = gtk_builder_get_object(builder, "tbServerIP");
+		strncpy(settings.ip, gtk_entry_get_text(GTK_ENTRY(widget)), sizeof(settings.ip) - 1);
+
+		widget = gtk_builder_get_object(builder, "tbPort");
+		settings.port = atoi(gtk_entry_get_text(GTK_ENTRY(widget)));
+
+		widget = gtk_builder_get_object(builder, "rbServer");
+		if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(widget))) {
+			settings.player = 1;
+		} else {
+			settings.player = 2;
+		}
+
+		//settingsWrite();
+		
+		gtk_widget_destroy(MainWindow);
+		return 1;
+	}
+
+	gtk_widget_destroy(MainWindow);
+
 	return 0;
 }
 
@@ -23,10 +76,15 @@ int main( int argc, char *argv[] )
 	gtk_set_locale();
 	gtk_init( &argc, &argv );
 
-	if( !strcmp(argv[1], "open") )
-    {
-		return CFGopen();
+	if( argc > 1 )
+	{
+		if( !strcmp(argv[1], "open") )
+		{
+			return CFGopen();
+		}
 	}
 	
 	return 0;
 }
+
+/******************************************************************************/
diff --git a/plugins/bladesio1/sio1.c b/plugins/bladesio1/sio1.c
index 9a43afc4..39ea98cc 100644
--- a/plugins/bladesio1/sio1.c
+++ b/plugins/bladesio1/sio1.c
@@ -48,10 +48,10 @@ long CALLBACK SIO1shutdown()
 
 /******************************************************************************/
 
-long CALLBACK SIOopen( unsigned long *gpuDisp )
+long CALLBACK SIO1open( unsigned long *gpuDisp )
 {
     settingsRead();
-    
+
 	return 0;
 }
 
diff --git a/plugins/bladesio1/sio1.h b/plugins/bladesio1/sio1.h
index 6638de68..973adb28 100644
--- a/plugins/bladesio1/sio1.h
+++ b/plugins/bladesio1/sio1.h
@@ -20,7 +20,7 @@
 #ifndef _SIO1_H_
 #define _SIO1_H_
 
-//#include "config.h"
+#include "config.h"
 
 /******************************************************************************/