diff options
38 files changed, 56 insertions, 212 deletions
diff --git a/configure.ac b/configure.ac index d1a14a2..39ec70d 100644 --- a/configure.ac +++ b/configure.ac @@ -444,7 +444,6 @@ AC_CONFIG_FILES([Makefile plugins/pychrysalide/gtkext/graph/Makefile plugins/pychrysalide/gui/Makefile plugins/pychrysalide/gui/core/Makefile - plugins/pychrysalide/gui/panels/Makefile plugins/pychrysalide/mangling/Makefile plugins/python/Makefile plugins/python/apkfiles/Makefile diff --git a/plugins/elf/Makefile.am b/plugins/elf/Makefile.am index 7b243db..35ab3fe 100644 --- a/plugins/elf/Makefile.am +++ b/plugins/elf/Makefile.am @@ -1,4 +1,6 @@ +DEFAULT_INCLUDES = -idirafter. -I$(top_builddir) + lib_LTLIBRARIES = libelf.la libdir = $(pluginslibdir) diff --git a/plugins/pychrysalide/gui/Makefile.am b/plugins/pychrysalide/gui/Makefile.am index 2579887..f471a60 100644 --- a/plugins/pychrysalide/gui/Makefile.am +++ b/plugins/pychrysalide/gui/Makefile.am @@ -3,11 +3,11 @@ noinst_LTLIBRARIES = libpychrysagui.la libpychrysagui_la_SOURCES = \ editem.h editem.c \ - module.h module.c + module.h module.c \ + panel.h panel.c libpychrysagui_la_LIBADD = \ - core/libpychrysaguicore.la \ - panels/libpychrysaguipanels.la + core/libpychrysaguicore.la libpychrysagui_la_LDFLAGS = @@ -22,4 +22,4 @@ AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJE AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) -SUBDIRS = core panels +SUBDIRS = core diff --git a/plugins/pychrysalide/gui/core/panels.c b/plugins/pychrysalide/gui/core/panels.c index 3b88b18..3a3001c 100644 --- a/plugins/pychrysalide/gui/core/panels.c +++ b/plugins/pychrysalide/gui/core/panels.c @@ -32,9 +32,9 @@ #include <gui/core/panels.h> +#include "../panel.h" #include "../../access.h" #include "../../helpers.h" -#include "../panels/panel.h" diff --git a/plugins/pychrysalide/gui/module.c b/plugins/pychrysalide/gui/module.c index abd9c0a..59fb39f 100644 --- a/plugins/pychrysalide/gui/module.c +++ b/plugins/pychrysalide/gui/module.c @@ -30,8 +30,8 @@ #include "editem.h" +#include "panel.h" #include "core/module.h" -#include "panels/module.h" #include "../helpers.h" @@ -69,7 +69,6 @@ bool add_gui_module(PyObject *super) result = (module != NULL); if (result) result = add_gui_core_module(module); - if (result) result = add_gui_panels_module(module); if (!result) Py_XDECREF(module); @@ -98,9 +97,9 @@ bool populate_gui_module(void) result = true; if (result) result = ensure_python_editor_item_is_registered(); + if (result) result = ensure_python_panel_item_is_registered(); if (result) result = populate_gui_core_module(); - if (result) result = populate_gui_panels_module(); assert(result); diff --git a/plugins/pychrysalide/gui/panels/panel.c b/plugins/pychrysalide/gui/panel.c index 2d0b562..ccc4dc5 100644 --- a/plugins/pychrysalide/gui/panels/panel.c +++ b/plugins/pychrysalide/gui/panel.c @@ -30,15 +30,15 @@ #include <i18n.h> #include <core/params.h> +#include <gui/panel-int.h> #include <gui/core/panels.h> -#include <gui/panels/panel-int.h> #include <plugins/dt.h> -#include "../editem.h" -#include "../../access.h" -#include "../../helpers.h" -#include "../../gtkext/dockable.h" +#include "editem.h" +#include "../access.h" +#include "../helpers.h" +#include "../gtkext/dockable.h" @@ -291,7 +291,7 @@ PyTypeObject *get_python_panel_item_type(void) PyVarObject_HEAD_INIT(NULL, 0) - .tp_name = "pychrysalide.gui.panels.PanelItem", + .tp_name = "pychrysalide.gui.PanelItem", .tp_basicsize = sizeof(PyGObject), .tp_flags = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE, @@ -364,7 +364,7 @@ bool ensure_python_panel_item_is_registered(void) if (!PyType_HasFeature(type, Py_TPFLAGS_READY)) { - module = get_access_to_python_module("pychrysalide.gui.panels"); + module = get_access_to_python_module("pychrysalide.gui"); dict = PyModule_GetDict(module); diff --git a/plugins/pychrysalide/gui/panels/panel.h b/plugins/pychrysalide/gui/panel.h index 907c650..9cd73eb 100644 --- a/plugins/pychrysalide/gui/panels/panel.h +++ b/plugins/pychrysalide/gui/panel.h @@ -1,6 +1,6 @@ /* Chrysalide - Outil d'analyse de fichiers binaires - * panel.h - prototypes pour l'équivalent Python du fichier "gui/panels/panel.h" + * panel.h - prototypes pour l'équivalent Python du fichier "gui/panel.h" * * Copyright (C) 2012-2017 Cyrille Bagard * @@ -22,8 +22,8 @@ */ -#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H -#define _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H +#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANEL_H +#define _PLUGINS_PYCHRYSALIDE_GUI_PANEL_H #include <Python.h> @@ -34,7 +34,7 @@ /* Fournit un accès à une définition de type à diffuser. */ PyTypeObject *get_python_panel_item_type(void); -/* Prend en charge l'objet 'pychrysalide.gui.panels.PanelItem'. */ +/* Prend en charge l'objet 'pychrysalide.gui.PanelItem'. */ bool ensure_python_panel_item_is_registered(void); /* Tente de convertir en panneau pour GUI. */ @@ -42,4 +42,4 @@ int convert_to_panel_item(PyObject *, void *); -#endif /* _PLUGINS_PYCHRYSALIDE_GUI_PANELS_PANEL_H */ +#endif /* _PLUGINS_PYCHRYSALIDE_GUI_PANEL_H */ diff --git a/plugins/pychrysalide/gui/panels/Makefile.am b/plugins/pychrysalide/gui/panels/Makefile.am deleted file mode 100644 index ec5522f..0000000 --- a/plugins/pychrysalide/gui/panels/Makefile.am +++ /dev/null @@ -1,19 +0,0 @@ - -noinst_LTLIBRARIES = libpychrysaguipanels.la - -libpychrysaguipanels_la_SOURCES = \ - module.h module.c \ - panel.h panel.c - -libpychrysaguipanels_la_LDFLAGS = - - -devdir = $(includedir)/chrysalide-$(subdir) - -dev_HEADERS = $(libpychrysaguipanels_la_SOURCES:%c=) - - -AM_CPPFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) $(LIBPYTHON_CFLAGS) $(LIBPYGOBJECT_CFLAGS) \ - -I$(top_srcdir)/src - -AM_CFLAGS = $(DEBUG_CFLAGS) $(WARNING_FLAGS) $(COMPLIANCE_FLAGS) diff --git a/plugins/pychrysalide/gui/panels/module.c b/plugins/pychrysalide/gui/panels/module.c deleted file mode 100644 index dd6b91e..0000000 --- a/plugins/pychrysalide/gui/panels/module.c +++ /dev/null @@ -1,97 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * module.c - intégration du répertoire panels en tant que module - * - * Copyright (C) 2012-2017 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * Chrysalide is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * Chrysalide is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#include "module.h" - - -#include <assert.h> - - -#include "panel.h" -#include "../../helpers.h" - - - -/****************************************************************************** -* * -* Paramètres : super = module dont la définition est à compléter. * -* * -* Description : Ajoute le module 'gui.panels' à un module Python. * -* * -* Retour : Bilan de l'opération. * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool add_gui_panels_module(PyObject *super) -{ - bool result; /* Bilan à retourner */ - PyObject *module; /* Sous-module mis en place */ - - static PyModuleDef py_chrysalide_gui_panels_module = { - - .m_base = PyModuleDef_HEAD_INIT, - - .m_name = "pychrysalide.gui.panels", - .m_doc = "Python module for Chrysalide.gui.panels", - - .m_size = -1, - - }; - - module = build_python_module(super, &py_chrysalide_gui_panels_module); - - result = (module != NULL); - - return result; - -} - - -/****************************************************************************** -* * -* Paramètres : - * -* * -* Description : Intègre les objets du module 'gui.panels'. * -* * -* Retour : Bilan de l'opération. * -* * -* Remarques : - * -* * -******************************************************************************/ - -bool populate_gui_panels_module(void) -{ - bool result; /* Bilan à retourner */ - - result = true; - - if (result) result = ensure_python_panel_item_is_registered(); - - assert(result); - - return result; - -} diff --git a/plugins/pychrysalide/gui/panels/module.h b/plugins/pychrysalide/gui/panels/module.h deleted file mode 100644 index 559a8c4..0000000 --- a/plugins/pychrysalide/gui/panels/module.h +++ /dev/null @@ -1,42 +0,0 @@ - -/* Chrysalide - Outil d'analyse de fichiers binaires - * module.h - prototypes pour l'intégration du répertoire panels en tant que module - * - * Copyright (C) 2012-2017 Cyrille Bagard - * - * This file is part of Chrysalide. - * - * Chrysalide is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * Chrysalide is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - */ - - -#ifndef _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H -#define _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H - - -#include <Python.h> -#include <stdbool.h> - - - -/* Ajoute le module 'gui.panels' à un module Python. */ -bool add_gui_panels_module(PyObject *); - -/* Intègre les objets du module 'gui.panels'. */ -bool populate_gui_panels_module(void); - - - -#endif /* _PLUGINS_PYCHRYSALIDE_GUI_PANELS_MODULE_H */ diff --git a/src/gtkext/tiledgrid.h b/src/gtkext/tiledgrid.h index 70429e5..a31f200 100644 --- a/src/gtkext/tiledgrid.h +++ b/src/gtkext/tiledgrid.h @@ -30,7 +30,7 @@ #include "gtkdockstation.h" #include "../glibext/configuration.h" -#include "../gui/panels/panel.h" +#include "../gui/panel.h" diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am index 5adc0f9..879b42d 100644 --- a/src/gui/Makefile.am +++ b/src/gui/Makefile.am @@ -6,6 +6,8 @@ libgui_la_SOURCES = \ editem-int.h \ editem.h editem.c \ editor.h editor.c \ + panel-int.h \ + panel.h panel.c \ status.h status.c libgui_la_LIBADD = \ diff --git a/src/gui/core/panels.c b/src/gui/core/panels.c index 71aee86..3fe8a86 100644 --- a/src/gui/core/panels.c +++ b/src/gui/core/panels.c @@ -27,13 +27,13 @@ #include "global.h" #include "items.h" +#include "../panel-int.h" #include "../panels/bintree.h" #include "../panels/bookmarks.h" #include "../panels/errors.h" #include "../panels/glance.h" #include "../panels/history.h" #include "../panels/log.h" -#include "../panels/panel-int.h" #include "../panels/regedit.h" #include "../panels/strings.h" #include "../panels/symbols.h" diff --git a/src/gui/core/panels.h b/src/gui/core/panels.h index 5344f3d..ee61d14 100644 --- a/src/gui/core/panels.h +++ b/src/gui/core/panels.h @@ -29,7 +29,7 @@ #include <stdbool.h> -#include "../panels/panel.h" +#include "../panel.h" #include "../../glibext/configuration.h" diff --git a/src/gui/panels/panel-int.h b/src/gui/panel-int.h index 07aafc1..a301fac 100644 --- a/src/gui/panels/panel-int.h +++ b/src/gui/panel-int.h @@ -32,9 +32,9 @@ #include <gtk/gtk.h> -#include "../editem-int.h" -#include "../../common/dllist.h" -#include "../../glibext/delayed.h" +#include "editem-int.h" +#include "../common/dllist.h" +#include "../glibext/delayed.h" diff --git a/src/gui/panels/panel.c b/src/gui/panel.c index a0965f1..843018e 100644 --- a/src/gui/panels/panel.c +++ b/src/gui/panel.c @@ -30,9 +30,9 @@ #include "panel-int.h" -#include "../../common/extstr.h" -#include "../../core/params.h" -#include "../../gtkext/gtkdockable-int.h" +#include "../common/extstr.h" +#include "../core/params.h" +#include "../gtkext/gtkdockable-int.h" diff --git a/src/gui/panels/panel.h b/src/gui/panel.h index 4a92409..5614728 100644 --- a/src/gui/panels/panel.h +++ b/src/gui/panel.h @@ -29,8 +29,8 @@ #include <stdbool.h> -#include "../editem.h" -#include "../../glibext/configuration.h" +#include "editem.h" +#include "../glibext/configuration.h" diff --git a/src/gui/panels/Makefile.am b/src/gui/panels/Makefile.am index 8b63b24..457e507 100644 --- a/src/gui/panels/Makefile.am +++ b/src/gui/panels/Makefile.am @@ -1,4 +1,6 @@ +DEFAULT_INCLUDES = -idirafter. -I$(top_builddir) + BUILT_SOURCES = resources.h resources.c noinst_LTLIBRARIES = libguipanels.la @@ -22,8 +24,6 @@ libguipanels_la_SOURCES = \ glance.h glance.c \ history.h history.c \ log.h log.c \ - panel-int.h \ - panel.h panel.c \ regedit.h regedit.c \ resources.h resources.c \ strings.h strings.c \ diff --git a/src/gui/panels/bintree.c b/src/gui/panels/bintree.c index ffecd6e..434aa94 100644 --- a/src/gui/panels/bintree.c +++ b/src/gui/panels/bintree.c @@ -33,9 +33,9 @@ #include <i18n.h> -#include "panel-int.h" #include "updating-int.h" #include "../agroup.h" +#include "../panel-int.h" #include "../core/global.h" #include "../../core/queue.h" #include "../../gtkext/gtkdisplaypanel.h" diff --git a/src/gui/panels/bintree.h b/src/gui/panels/bintree.h index 8168481..dd8e8fd 100644 --- a/src/gui/panels/bintree.h +++ b/src/gui/panels/bintree.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/bookmarks.c b/src/gui/panels/bookmarks.c index c141ff3..112afe9 100644 --- a/src/gui/panels/bookmarks.c +++ b/src/gui/panels/bookmarks.c @@ -35,7 +35,7 @@ #include <gtk/gtk.h> -#include "panel-int.h" +#include "../panel-int.h" #include "../core/global.h" #include "../../analysis/db/items/bookmark.h" #include "../../common/cpp.h" diff --git a/src/gui/panels/bookmarks.h b/src/gui/panels/bookmarks.h index 311868c..eb0c354 100644 --- a/src/gui/panels/bookmarks.h +++ b/src/gui/panels/bookmarks.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/errors.c b/src/gui/panels/errors.c index b258ecf..67551e2 100644 --- a/src/gui/panels/errors.c +++ b/src/gui/panels/errors.c @@ -33,8 +33,8 @@ #include <i18n.h> -#include "panel-int.h" #include "updating-int.h" +#include "../panel-int.h" #include "../core/global.h" #include "../../core/global.h" #include "../../core/paths.h" diff --git a/src/gui/panels/errors.h b/src/gui/panels/errors.h index 02451ee..b1dfe8b 100644 --- a/src/gui/panels/errors.h +++ b/src/gui/panels/errors.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/glance.c b/src/gui/panels/glance.c index 9b2c088..fa4df51 100644 --- a/src/gui/panels/glance.c +++ b/src/gui/panels/glance.c @@ -29,7 +29,7 @@ #include <gtk/gtk.h> -#include "panel-int.h" +#include "../panel-int.h" diff --git a/src/gui/panels/glance.h b/src/gui/panels/glance.h index a7deee6..2e42f21 100644 --- a/src/gui/panels/glance.h +++ b/src/gui/panels/glance.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/history.c b/src/gui/panels/history.c index 9edd32e..4b694c7 100644 --- a/src/gui/panels/history.c +++ b/src/gui/panels/history.c @@ -32,7 +32,7 @@ #include <i18n.h> -#include "panel-int.h" +#include "../panel-int.h" #include "../../analysis/binary.h" #include "../../glibext/chrysamarshal.h" #include "../../glibext/signal.h" diff --git a/src/gui/panels/history.h b/src/gui/panels/history.h index 61934cd..68261db 100644 --- a/src/gui/panels/history.h +++ b/src/gui/panels/history.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/log.c b/src/gui/panels/log.c index ffe8b42..213a726 100644 --- a/src/gui/panels/log.c +++ b/src/gui/panels/log.c @@ -32,7 +32,7 @@ #include <gtk/gtk.h> -#include "panel-int.h" +#include "../panel-int.h" #include "../core/panels.h" #include "../../gtkext/easygtk.h" diff --git a/src/gui/panels/log.h b/src/gui/panels/log.h index 67b7160..724f263 100644 --- a/src/gui/panels/log.h +++ b/src/gui/panels/log.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" #include "../../core/logs.h" diff --git a/src/gui/panels/regedit.c b/src/gui/panels/regedit.c index db98f28..aa749f9 100644 --- a/src/gui/panels/regedit.c +++ b/src/gui/panels/regedit.c @@ -35,8 +35,8 @@ #include <gtk/gtk.h> -#include "panel-int.h" #include "../agroup.h" +#include "../panel-int.h" #include "../../core/params.h" #include "../../common/cpp.h" #include "../../common/extstr.h" diff --git a/src/gui/panels/regedit.h b/src/gui/panels/regedit.h index 1ce4290..636e6cf 100644 --- a/src/gui/panels/regedit.h +++ b/src/gui/panels/regedit.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/strings.c b/src/gui/panels/strings.c index 8248c08..7fd0ffc 100644 --- a/src/gui/panels/strings.c +++ b/src/gui/panels/strings.c @@ -31,8 +31,8 @@ #include <string.h> -#include "panel-int.h" #include "updating-int.h" +#include "../panel-int.h" #include "../core/global.h" #include "../dialogs/gotox.h" #include "../../common/extstr.h" diff --git a/src/gui/panels/strings.h b/src/gui/panels/strings.h index c2e2332..1856d12 100644 --- a/src/gui/panels/strings.h +++ b/src/gui/panels/strings.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/symbols.c b/src/gui/panels/symbols.c index e0a5857..6ea7a72 100644 --- a/src/gui/panels/symbols.c +++ b/src/gui/panels/symbols.c @@ -36,9 +36,9 @@ #include <gdk/gdkkeysyms.h> -#include "panel-int.h" #include "updating-int.h" #include "../agroup.h" +#include "../panel-int.h" #include "../core/global.h" #include "../../common/extstr.h" #include "../../core/paths.h" diff --git a/src/gui/panels/symbols.h b/src/gui/panels/symbols.h index b7e12fc..942aa6c 100644 --- a/src/gui/panels/symbols.h +++ b/src/gui/panels/symbols.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" diff --git a/src/gui/panels/welcome.c b/src/gui/panels/welcome.c index 8b74f78..6812125 100644 --- a/src/gui/panels/welcome.c +++ b/src/gui/panels/welcome.c @@ -36,7 +36,7 @@ #include <i18n.h> -#include "panel-int.h" +#include "../panel-int.h" #include "../core/global.h" #include "../../common/cpp.h" #include "../../common/io.h" diff --git a/src/gui/panels/welcome.h b/src/gui/panels/welcome.h index aa018f5..45f465b 100644 --- a/src/gui/panels/welcome.h +++ b/src/gui/panels/welcome.h @@ -29,7 +29,7 @@ #include <i18n.h> -#include "panel.h" +#include "../panel.h" |