diff --git a/gui/Makefile b/gui/Makefile
index 7f9f684..7308a14 100644
--- a/gui/Makefile
+++ b/gui/Makefile
@@ -1,8 +1,11 @@
OBJ=main.o
BIN=goxf
-CFLAGS=`pkg-config gladeui-1.0 libglade-2.0 --cflags`
-LDFLAGS=`pkg-config gladeui-1.0 libglade-2.0 --libs`
+CFLAGS=`pkg-config gladeui-1.0 libglade-2.0 gmodule-2.0 --cflags`
+LDFLAGS=`pkg-config gladeui-1.0 libglade-2.0 gmodule-2.0 --libs`
all: ${OBJ}
${CC} ${LDFLAGS} ${OBJ} -o ${BIN}
+
+clean:
+ -rm -f ${BIN} ${OBJ}
diff --git a/gui/g0xFFFF.glade b/gui/g0xFFFF.glade
index f6fbdf3..d6ba2be 100644
--- a/gui/g0xFFFF.glade
+++ b/gui/g0xFFFF.glade
@@ -21,7 +21,7 @@
True
0
- n770/n800
+ n770/n800/n810
HERMflasher
@@ -30,17 +30,7 @@ HERMflasher
-
- 32
- True
- True
- >
-
-
- False
- False
- 1
-
+
@@ -55,10 +45,11 @@ HERMflasher
True
+ False
GTK_POLICY_AUTOMATIC
GTK_POLICY_AUTOMATIC
-
+
True
@@ -70,14 +61,14 @@ HERMflasher
3
2
-
+
False
-
+
0
0
0
@@ -100,12 +91,18 @@ xloader
True
Remove
+ 0
+
+
True
Add
+ 0
+
+
1
@@ -118,9 +115,10 @@ xloader
-
+
True
USB host mode
+ 0
True
@@ -130,9 +128,10 @@ xloader
-
+
True
R&D mode
+ 0
True
@@ -145,6 +144,7 @@ xloader
True
Reboot
+ 0
True
@@ -171,7 +171,7 @@ xloader
True
6
-
+
True
True
@@ -184,6 +184,9 @@ xloader
True
gtk-dialog-info
True
+ 0
+
+
False
@@ -195,6 +198,9 @@ xloader
True
gtk-execute
True
+ 0
+
+
False
@@ -220,4 +226,54 @@ xloader
+
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 5
+ About Glade
+ False
+ GTK_WIN_POS_CENTER_ON_PARENT
+ GDK_WINDOW_TYPE_HINT_DIALOG
+ False
+ Glade
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 2
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ GTK_POLICY_AUTOMATIC
+ GTK_POLICY_AUTOMATIC
+
+
+ True
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ 2
+ False
+ False
+
+
+
+
+ 2
+
+
+
+
+ True
+ GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK
+ GTK_BUTTONBOX_END
+
+
+ False
+ GTK_PACK_END
+
+
+
+
+
diff --git a/gui/main.c b/gui/main.c
index d92e1a3..08f379a 100644
--- a/gui/main.c
+++ b/gui/main.c
@@ -21,10 +21,10 @@
#define U(x) printf("%d\n",x); fflush(stdout);
+ GladeXML *xml;
int main(int argc, char **argv)
{
GtkWidget *w;
- GladeXML *xml;
gtk_init(&argc, &argv);
@@ -40,6 +40,11 @@ int main(int argc, char **argv)
w = glade_xml_get_widget(xml, "main_window");
gtk_signal_connect(GTK_OBJECT(w), "destroy",
GTK_SIGNAL_FUNC(gtk_main_quit),NULL);
+{
+ GtkComboBox *piece = GTK_COMBO_BOX(glade_xml_get_widget(xml, "piece"));
+ gtk_combo_box_set_active(piece, 0);
+}
+
gtk_widget_show_all(w);
gtk_object_unref(GTK_OBJECT(xml));
@@ -47,3 +52,26 @@ int main(int argc, char **argv)
gtk_main();
return 0;
}
+extern void gui_run();
+extern void gui_run()
+{
+ printf("run\n");
+}
+
+extern void gui_add();
+extern void gui_add()
+{
+ GtkTreeView *tree = glade_xml_get_widget(xml, "tree");
+ GtkFileChooser *file = GTK_FILE_CHOOSER(glade_xml_get_widget(xml, "file"));
+ GtkComboBox *piece = GTK_COMBO_BOX(glade_xml_get_widget(xml, "piece"));
+
+ printf("ADD %s\n", gtk_file_chooser_get_filename(file));
+ printf("ADD %d\n", gtk_combo_box_get_active(piece));
+}
+
+extern void gui_information();
+void gui_information()
+{
+ printf("FUCKMENOT!\n");
+ fflush(stdout);
+}