Moved all files related to the GUI into the 'gui' directory.

28 files changed, 74 insertions, 75 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 4940a6d..159c71f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -87,7 +87,6 @@ libchrysaplugin_la_LIBADD =						\
 ############################################################
 
 chrysalide_SOURCES = 					\
-	editor.h editor.c					\
 	main.c
 
 
@@ -102,8 +101,7 @@ chrysalide_LDFLAGS = $(LIBGTK_LIBS) -L/usr/X11R6/lib -ldl -lm $(LIBXML_LIBS) `pk
 	-Lplugins/.libs -lplugins
 
 
-chrysalide_LDADD = $(LIBINTL) 				\
-	dialogs/libdialogs.la
+chrysalide_LDADD = $(LIBINTL)
 
 
 
@@ -113,6 +111,6 @@ chrysalide_LDADD = $(LIBINTL) 				\
 
 # glibext doit être traité en premier, à cause des marshals GLib
 
-SUBDIRS = core glibext gtkext analysis arch format common debug decomp dialogs gui plugins
+SUBDIRS = core glibext gtkext analysis arch format common debug decomp gui plugins
 
 # TODO: rm -rf panels 
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 196bb87..8c6311b 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -4,9 +4,11 @@ noinst_LTLIBRARIES  = libgui.la
 libgui_la_SOURCES =						\
 	editem-int.h						\
 	editem.h editem.c					\
+	editor.h editor.c					\
 	status.h status.c
 
 libgui_la_LIBADD =						\
+	dialogs/libdialogs.la				\
 	menus/libguimenus.la				\
 	panels/libguipanels.la				\
 	tb/libguitb.la
@@ -18,4 +20,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 
 AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS)
 
-SUBDIRS = menus panels tb
+SUBDIRS = dialogs menus panels tb
diff --git a/src/dialogs/Makefile.am b/src/gui/dialogs/Makefile.am
index 1fe821a..1fe821a 100644
--- a/src/dialogs/Makefile.am
+++ b/src/gui/dialogs/Makefile.am
diff --git a/src/dialogs/about.c b/src/gui/dialogs/about.c
index 70062cc..0605b39 100644
--- a/src/dialogs/about.c
+++ b/src/gui/dialogs/about.c
@@ -33,8 +33,8 @@
 #include <i18n.h>
 
 
-#include "../gtkext/easygtk.h"
-#include "../gtkext/support.h"
+#include "../../gtkext/easygtk.h"
+#include "../../gtkext/support.h"
 
 
 
diff --git a/src/dialogs/about.h b/src/gui/dialogs/about.h
index 900f14c..6be0560 100644
--- a/src/dialogs/about.h
+++ b/src/gui/dialogs/about.h
@@ -21,8 +21,8 @@
  */
 
 
-#ifndef _DIALOGS_ABOUT_H
-#define _DIALOGS_ABOUT_H
+#ifndef _GUI_DIALOGS_ABOUT_H
+#define _GUI_DIALOGS_ABOUT_H
 
 
 #include <gtk/gtk.h>
@@ -34,4 +34,4 @@ GtkWidget *create_about_dialog(GtkWindow *);
 
 
 
-#endif  /* _DIALOGS_ABOUT_H */
+#endif  /* _GUI_DIALOGS_ABOUT_H */
diff --git a/src/dialogs/bookmark.c b/src/gui/dialogs/bookmark.c
index b171087..4a5757a 100644
--- a/src/dialogs/bookmark.c
+++ b/src/gui/dialogs/bookmark.c
@@ -31,8 +31,8 @@
 #include <i18n.h>
 
 
-#include "..//analysis/db/items/bookmark.h"
-#include "../gtkext/easygtk.h"
+#include "../../analysis/db/items/bookmark.h"
+#include "../../gtkext/easygtk.h"
 
 
 
diff --git a/src/dialogs/bookmark.h b/src/gui/dialogs/bookmark.h
index 0afdb4c..78ce45e 100644
--- a/src/dialogs/bookmark.h
+++ b/src/gui/dialogs/bookmark.h
@@ -21,15 +21,15 @@
  */
 
 
-#ifndef _DIALOGS_BOOKMARK_H
-#define _DIALOGS_BOOKMARK_H
+#ifndef _GUI_DIALOGS_BOOKMARK_H
+#define _GUI_DIALOGS_BOOKMARK_H
 
 
 #include <gtk/gtk.h>
 
 
-#include "../arch/vmpa.h"
-#include "../analysis/db/item.h"
+#include "../../arch/vmpa.h"
+#include "../../analysis/db/item.h"
 
 
 
@@ -41,4 +41,4 @@ GDbItem *get_item_from_bookmark_dialog(GtkWidget *);
 
 
 
-#endif  /* _DIALOGS_BOOKMARK_H */
+#endif  /* _GUI_DIALOGS_BOOKMARK_H */
diff --git a/src/dialogs/export.c b/src/gui/dialogs/export.c
index 726b16d..33fd0c5 100644
--- a/src/dialogs/export.c
+++ b/src/gui/dialogs/export.c
@@ -34,8 +34,8 @@
 #include <i18n.h>
 
 
-#include "../common/extstr.h"
-#include "../gtkext/easygtk.h"
+#include "../../common/extstr.h"
+#include "../../gtkext/easygtk.h"
 
 
 
diff --git a/src/dialogs/export.h b/src/gui/dialogs/export.h
index 9db624d..9989971 100644
--- a/src/dialogs/export.h
+++ b/src/gui/dialogs/export.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _DIALOGS_EXPORT_H
-#define _DIALOGS_EXPORT_H
+#ifndef _GUI_DIALOGS_EXPORT_H
+#define _GUI_DIALOGS_EXPORT_H
 
 
 #include <gtk/gtk.h>
 
 
-#include "../analysis/binary.h"
+#include "../../analysis/binary.h"
 
 
 
@@ -37,4 +37,4 @@ void run_export_assistant(GLoadedBinary *, GtkWindow *);
 
 
 
-#endif  /* _DIALOGS_EXPORT_H */
+#endif  /* _GUI_DIALOGS_EXPORT_H */
diff --git a/src/dialogs/goto.c b/src/gui/dialogs/goto.c
index 847fa9a..8eb6411 100644
--- a/src/dialogs/goto.c
+++ b/src/gui/dialogs/goto.c
@@ -30,7 +30,7 @@
 #include <i18n.h>
 
 
-#include "../gtkext/easygtk.h"
+#include "../../gtkext/easygtk.h"
 
 
 
diff --git a/src/dialogs/goto.h b/src/gui/dialogs/goto.h
index 7bb57b5..7d8cd54 100644
--- a/src/dialogs/goto.h
+++ b/src/gui/dialogs/goto.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _DIALOGS_GOTO_H
-#define _DIALOGS_GOTO_H
+#ifndef _GUI_DIALOGS_GOTO_H
+#define _GUI_DIALOGS_GOTO_H
 
 
 #include <gtk/gtk.h>
 
 
-#include "../arch/vmpa.h"
+#include "../../arch/vmpa.h"
 
 
 
@@ -40,4 +40,4 @@ vmpa2t *get_address_from_goto_dialog(GtkWidget *);
 
 
 
-#endif  /* _DIALOGS_GOTO_H */
+#endif  /* _GUI_DIALOGS_GOTO_H */
diff --git a/src/dialogs/gotox.c b/src/gui/dialogs/gotox.c
index 00c4fd0..fd05100 100644
--- a/src/dialogs/gotox.c
+++ b/src/gui/dialogs/gotox.c
@@ -31,8 +31,8 @@
 #include <i18n.h>
 
 
-#include "../gtkext/easygtk.h"
-#include "../gtkext/support.h"
+#include "../../gtkext/easygtk.h"
+#include "../../gtkext/support.h"
 
 
 
diff --git a/src/dialogs/gotox.h b/src/gui/dialogs/gotox.h
index 88d1fc9..ab17d42 100644
--- a/src/dialogs/gotox.h
+++ b/src/gui/dialogs/gotox.h
@@ -21,15 +21,15 @@
  */
 
 
-#ifndef _DIALOGS_GOTOX_H
-#define _DIALOGS_GOTOX_H
+#ifndef _GUI_DIALOGS_GOTOX_H
+#define _GUI_DIALOGS_GOTOX_H
 
 
 #include <gtk/gtk.h>
 
 
-#include "../analysis/binary.h"
-#include "../arch/vmpa.h"
+#include "../../analysis/binary.h"
+#include "../../arch/vmpa.h"
 
 
 
@@ -44,4 +44,4 @@ vmpa2t *get_address_from_gotox_dialog(GtkWidget *);
 
 
 
-#endif  /* _DIALOGS_GOTOX_H */
+#endif  /* _GUI_DIALOGS_GOTOX_H */
diff --git a/src/dialogs/plugins.c b/src/gui/dialogs/plugins.c
index 09a3e26..68e6011 100644
--- a/src/dialogs/plugins.c
+++ b/src/gui/dialogs/plugins.c
@@ -27,7 +27,7 @@
 #include <i18n.h>
 
 
-#include "../gtkext/easygtk.h"
+#include "../../gtkext/easygtk.h"
 
 
 
diff --git a/src/dialogs/plugins.h b/src/gui/dialogs/plugins.h
index e0a53a6..44e1d48 100644
--- a/src/dialogs/plugins.h
+++ b/src/gui/dialogs/plugins.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _DIALOGS_PLUGINS_H
-#define _DIALOGS_PLUGINS_H
+#ifndef _GUI_DIALOGS_PLUGINS_H
+#define _GUI_DIALOGS_PLUGINS_H
 
 
 #include <gtk/gtk.h>
 
 
-#include "../analysis/binary.h"
+#include "../../analysis/binary.h"
 
 
 
@@ -37,4 +37,4 @@ GtkWidget *create_plugins_selection_dialog(GLoadedBinary *, GtkWindow *);
 
 
 
-#endif  /* _DIALOGS_PLUGINS_H */
+#endif  /* _GUI_DIALOGS_PLUGINS_H */
diff --git a/src/dialogs/shellcode.c b/src/gui/dialogs/shellcode.c
index 36146d1..8466ab2 100644
--- a/src/dialogs/shellcode.c
+++ b/src/gui/dialogs/shellcode.c
@@ -33,12 +33,12 @@
 #include <string.h>
 
 
-#include "../gtkext/easygtk.h"
+#include "../../gtkext/easygtk.h"
 
 
 
 
-#include "../analysis/roptions.h"     // A garder ?
+#include "../../analysis/roptions.h"     // A garder ?
 
 
 
diff --git a/src/dialogs/shellcode.h b/src/gui/dialogs/shellcode.h
index d3bb422..776b7a6 100644
--- a/src/dialogs/shellcode.h
+++ b/src/gui/dialogs/shellcode.h
@@ -21,11 +21,11 @@
  */
 
 
-#ifndef _DIALOGS_EXPORT_H
-#define _DIALOGS_EXPORT_H
+#ifndef _GUI_DIALOGS_EXPORT_H
+#define _GUI_DIALOGS_EXPORT_H
 
 
-#include "../analysis/project.h"
+#include "../../analysis/project.h"
 
 
 
@@ -34,4 +34,4 @@ void run_shellcode_assistant(GStudyProject *, GtkWindow *);
 
 
 
-#endif  /* _DIALOGS_EXPORT_H */
+#endif  /* _GUI_DIALOGS_EXPORT_H */
diff --git a/src/dialogs/storage.c b/src/gui/dialogs/storage.c
index 2bf1e2e..2e97ca2 100644
--- a/src/dialogs/storage.c
+++ b/src/gui/dialogs/storage.c
@@ -27,9 +27,9 @@
 #include <i18n.h>
 
 
-#include "../analysis/db/protocol.h"
-#include "../common/cpp.h"
-#include "../gtkext/easygtk.h"
+#include "../../analysis/db/protocol.h"
+#include "../../common/cpp.h"
+#include "../../gtkext/easygtk.h"
 
 
 
diff --git a/src/dialogs/storage.h b/src/gui/dialogs/storage.h
index b5b451d..5cca73b 100644
--- a/src/dialogs/storage.h
+++ b/src/gui/dialogs/storage.h
@@ -21,14 +21,14 @@
  */
 
 
-#ifndef _DIALOGS_STORAGE_H
-#define _DIALOGS_STORAGE_H
+#ifndef _GUI_DIALOGS_STORAGE_H
+#define _GUI_DIALOGS_STORAGE_H
 
 
 #include <gtk/gtk.h>
 
 
-#include "../analysis/binary.h"
+#include "../../analysis/binary.h"
 
 
 
@@ -37,4 +37,4 @@ GtkWidget *create_storage_dialog(GLoadedBinary *, GtkWindow *);
 
 
 
-#endif  /* _DIALOGS_STORAGE_H */
+#endif  /* _GUI_DIALOGS_STORAGE_H */
diff --git a/src/editor.c b/src/gui/editor.c
index 63b467b..1742596 100644
--- a/src/editor.c
+++ b/src/gui/editor.c
@@ -28,16 +28,16 @@
 #include <i18n.h>
 
 
-#include "analysis/project.h"
-#include "core/params.h"
-#include "gtkext/easygtk.h"
-#include "gtkext/gtkdockstation.h"
-#include "gtkext/support.h"
-#include "gui/status.h"
-#include "gui/menus/menubar.h"
-#include "gui/panels/panel.h"
-#include "gui/tb/portions.h"
-#include "gui/tb/source.h"
+#include "status.h"
+#include "menus/menubar.h"
+#include "panels/panel.h"
+#include "tb/portions.h"
+#include "tb/source.h"
+#include "../analysis/project.h"
+#include "../core/params.h"
+#include "../gtkext/easygtk.h"
+#include "../gtkext/gtkdockstation.h"
+#include "../gtkext/support.h"
 
 
 
diff --git a/src/editor.h b/src/gui/editor.h
index c9feb67..c9feb67 100644
--- a/src/editor.h
+++ b/src/gui/editor.h
diff --git a/src/gui/menus/Makefile.am b/src/gui/menus/Makefile.am
index d932141..014f098 100644
--- a/src/gui/menus/Makefile.am
+++ b/src/gui/menus/Makefile.am
@@ -14,8 +14,7 @@ libguimenus_la_SOURCES =				\
 
 libguimenus_la_LDFLAGS = 
 
-libguimenus_la_LIBADD = $(LIBINTL) 		\
-	../../dialogs/libdialogs.la
+libguimenus_la_LIBADD = $(LIBINTL)
 
 
 AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
diff --git a/src/gui/menus/binary.c b/src/gui/menus/binary.c
index c93ad57..8058799 100644
--- a/src/gui/menus/binary.c
+++ b/src/gui/menus/binary.c
@@ -29,9 +29,9 @@
 
 
 #include "../editem-int.h"
-#include "../../dialogs/export.h"
-#include "../../dialogs/gotox.h"
-#include "../../dialogs/storage.h"
+#include "../dialogs/export.h"
+#include "../dialogs/gotox.h"
+#include "../dialogs/storage.h"
 #include "../../gtkext/easygtk.h"
 
 
diff --git a/src/gui/menus/edition.c b/src/gui/menus/edition.c
index bc55478..9e4077d 100644
--- a/src/gui/menus/edition.c
+++ b/src/gui/menus/edition.c
@@ -31,11 +31,11 @@
 #include <i18n.h>
 
 
+#include "../dialogs/bookmark.h"
+#include "../dialogs/goto.h"
+#include "../dialogs/gotox.h"
 #include "../../analysis/db/items/switcher.h"
 #include "../../arch/target.h"
-#include "../../dialogs/bookmark.h"
-#include "../../dialogs/goto.h"
-#include "../../dialogs/gotox.h"
 #include "../../gtkext/easygtk.h"
 #include "../../gtkext/gtkbufferview.h"
 
diff --git a/src/gui/menus/help.c b/src/gui/menus/help.c
index 45e68a3..321311c 100644
--- a/src/gui/menus/help.c
+++ b/src/gui/menus/help.c
@@ -28,7 +28,7 @@
 #include <i18n.h>
 
 
-#include "../../dialogs/about.h"
+#include "../dialogs/about.h"
 #include "../../gtkext/easygtk.h"
 
 
diff --git a/src/gui/menus/project.c b/src/gui/menus/project.c
index a85e78f..f4f6233 100644
--- a/src/gui/menus/project.c
+++ b/src/gui/menus/project.c
@@ -32,8 +32,8 @@
 
 
 #include "../editem-int.h"
+#include "../dialogs/shellcode.h"
 #include "../../analysis/contents/file.h"
-#include "../../dialogs/shellcode.h"
 #include "../../gtkext/easygtk.h"
 
 
diff --git a/src/gui/panels/strings.c b/src/gui/panels/strings.c
index ff6bf05..a6ff7ca 100644
--- a/src/gui/panels/strings.c
+++ b/src/gui/panels/strings.c
@@ -29,9 +29,9 @@
 
 
 #include "panel-int.h"
+#include "../dialogs/gotox.h"
 #include "../../common/extstr.h"
 #include "../../core/params.h"
-#include "../../dialogs/gotox.h"
 #include "../../gtkext/easygtk.h"
 #include "../../gtkext/gtkdockable-int.h"
 
diff --git a/src/main.c b/src/main.c
index 2ab0c5c..67feabc 100644
--- a/src/main.c
+++ b/src/main.c
@@ -29,7 +29,6 @@
 #include <config.h>
 #include <i18n.h>
 
-#include "editor.h"
 #include "analysis/project.h"
 #include "analysis/db/server.h"
 #include "core/core.h"
@@ -37,6 +36,7 @@
 #include "glibext/delayed.h"
 #include "glibext/gbinportion.h"
 #include "gtkext/theme.h"
+#include "gui/editor.h"
 #include "plugins/pglist.h"