diff --git a/gfceu.glade b/gfceu.glade
index 2a9c0fc5..80cb8cf5 100644
--- a/gfceu.glade
+++ b/gfceu.glade
@@ -124,17 +124,30 @@
5
5
-
+
True
True
- Gamepad _3
+ Gamepad _1
True
0
- 1
- 2
+
+
+
+
+
+ True
+ True
+ Gamepad _2
+ True
+ 0
+
+
+
+ 1
+ 2
@@ -156,30 +169,17 @@
-
+
True
True
- Gamepad _2
- True
- 0
-
-
-
- 1
- 2
-
-
-
-
-
- True
- True
- Gamepad _1
+ Gamepad _3
True
0
+ 1
+ 2
@@ -582,28 +582,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
5
5
-
+
True
- True
+ 0
+ Port:
- 1
- 2
- 1
- 2
-
-
-
-
-
- True
- True
- 4046 1 65536 1 10 10
- 1
-
-
- 1
- 2
+ GTK_FILL
@@ -621,13 +606,28 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
-
+
True
- 0
- Port:
+ True
+ 4046 1 65536 1 10 10
+ 1
- GTK_FILL
+ 1
+ 2
+
+
+
+
+
+ True
+ True
+
+
+ 1
+ 2
+ 1
+ 2
@@ -678,54 +678,13 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
3
5
-
+
True
True
- 4046 1 65536 1 10 10
- 1
1
2
- 1
- 2
-
-
-
-
-
- True
- 0
- Password:
-
-
- 2
- 3
- GTK_FILL
-
-
-
-
-
- True
- 0
- Server Port:
-
-
- 1
- 2
- GTK_FILL
-
-
-
-
-
- True
- 0
- Server Address:
-
-
- GTK_FILL
@@ -745,13 +704,54 @@ Invalid options may cause GFCE Ultra to perform incorrectly.
-
+
+ True
+ 0
+ Server Address:
+
+
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Server Port:
+
+
+ 1
+ 2
+ GTK_FILL
+
+
+
+
+
+ True
+ 0
+ Password:
+
+
+ 2
+ 3
+ GTK_FILL
+
+
+
+
+
True
True
+ 4046 1 65536 1 10 10
+ 1
1
2
+ 1
+ 2
@@ -922,4 +922,216 @@ Artwork for old versions (< 0.2.7):
+
+
+
+ True
+
+
+ True
+ 0
+ GTK_SHADOW_NONE
+
+
+ True
+ 12
+
+
+ True
+ 3
+ 3
+
+
+ True
+ True
+ True
+ Right
+ 0
+
+
+ 2
+ 3
+ 1
+ 2
+
+
+
+
+ True
+ True
+ True
+ Down
+ 0
+
+
+ 1
+ 2
+ 2
+ 3
+
+
+
+
+ True
+ True
+ True
+ Left
+ 0
+
+
+ 1
+ 2
+
+
+
+
+ True
+ True
+ True
+ Up
+ 0
+
+
+ 1
+ 2
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ True
+ <b>D-Pad</b>
+ True
+
+
+ label_item
+
+
+
+
+
+
+ True
+ 0
+ GTK_SHADOW_NONE
+
+
+ True
+ 12
+
+
+ True
+
+
+ True
+ True
+ True
+ Select
+ 0
+
+
+
+
+ True
+ True
+ True
+ Start
+ 0
+
+
+ 1
+
+
+
+
+
+
+
+
+ True
+ <b>Essentials</b>
+ True
+
+
+ label_item
+
+
+
+
+ 1
+
+
+
+
+ True
+ 0
+ GTK_SHADOW_NONE
+
+
+ True
+ 12
+
+
+ True
+
+
+ True
+ True
+ True
+ B
+ 0
+
+
+
+
+ True
+ True
+ True
+ A
+ 0
+
+
+ 1
+
+
+
+
+
+
+
+
+ True
+ <b>Alpha and Beta</b>
+ True
+
+
+ label_item
+
+
+
+
+ 2
+
+
+
+
+
diff --git a/mockup_test.py b/mockup_test.py
new file mode 100644
index 00000000..3eb75e94
--- /dev/null
+++ b/mockup_test.py
@@ -0,0 +1,17 @@
+#!/usr/bin/env python
+# displays mockup of gamepad config
+import gtk, gtk.glade
+
+class WidgetsWrapper:
+ def __init__(self):
+ self.widgets = gtk.glade.XML ('gfceu.glade', "gamepad_config_window")
+ self.widgets.signal_autoconnect(GladeHandlers.__dict__)
+ # Gives us the ability to do: widgets['widget_name'].action()
+ def __getitem__(self, key):
+ return self.widgets.get_widget(key)
+
+widgets = WidgetsWrapper()
+
+widgets['gamepad_config_window'].show_all()
+gtk.main ()
+