Restored a fully functional access to the log panel.

git-svn-id: svn://svn.gna.org/svn/chrysalide/trunk@328 abbe820e-26c8-41b2-8c08-b7b2b41f8b0a

4 files changed, 234 insertions, 0 deletions

diff --git a/plugins/pychrysa/gui/panels/Makefile.am b/plugins/pychrysa/gui/panels/Makefile.am
index b383293..20e7f66 100644
--- a/plugins/pychrysa/gui/panels/Makefile.am
+++ b/plugins/pychrysa/gui/panels/Makefile.am
@@ -2,6 +2,7 @@
 noinst_LTLIBRARIES = libpychrysaguipanels.la
 
 libpychrysaguipanels_la_SOURCES =		\
+	log.h log.c							\
 	module.h module.c					\
 	panel.h panel.c
 
diff --git a/plugins/pychrysa/gui/panels/log.c b/plugins/pychrysa/gui/panels/log.c
new file mode 100644
index 0000000..5822c85
--- /dev/null
+++ b/plugins/pychrysa/gui/panels/log.c
@@ -0,0 +1,190 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * log.c - équivalent Python du fichier "gui/panels/log.c"
+ *
+ * Copyright (C) 2009-2013 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA 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.
+ *
+ *  OpenIDA 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 "log.h"
+
+
+
+#include <pygobject.h>
+
+
+#include "../../quirks.h"
+
+
+
+/* Affiche un message dans le journal des messages système. */
+static PyObject *py_log_panel_log_message(PyObject *, PyObject *);
+
+/* Définit les constantes pour les types de message. */
+static bool define_python_log_constants(PyObject *);
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : self = classe assurant le lien avec l'éditeur de messages.   *
+*                args = arguments fournis à l'appel.                          *
+*                                                                             *
+*  Description : Affiche un message dans le journal des messages système.     *
+*                                                                             *
+*  Retour      : Rien en équivalent Python.                                   *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static PyObject *py_log_panel_log_message(PyObject *self, PyObject *args)
+{
+    PyObject *result;                       /* Bilan à retourner           */
+    LogMessageType type;                    /* Espèce du message           */
+    const char *msg;                        /* Contenu du message          */
+
+    if (!PyArg_ParseTuple(args, "ls", &type, &msg))
+        return NULL;
+
+    switch (type)
+    {
+        case LMT_INFO:
+        case LMT_BAD_BINARY:
+        case LMT_PROCESS:
+        case LMT_ERROR:
+        case LMT_WARNING:
+            log_simple_message(type, msg);
+            result = Py_None;
+            Py_INCREF(result);
+            break;
+
+        default:
+            PyErr_SetString(PyExc_ValueError, 
+                            _("Invalid type of message"));
+            result = NULL;
+            break;
+
+    }
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : dict = dictionnaire à compléter.                             *
+*                                                                             *
+*  Description : Définit les constantes pour les types de message.            *
+*                                                                             *
+*  Retour      : true en cas de succès de l'opération, false sinon.           *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static bool define_python_log_constants(PyObject *dict)
+{
+    int ret;                                /* Bilan d'un ajout            */
+
+    ret = PyDict_SetItemString(dict, "LMT_INFO", PyInt_FromLong(LMT_INFO));
+    if (ret == -1) return false;
+
+    ret = PyDict_SetItemString(dict, "LMT_BAD_BINARY", PyInt_FromLong(LMT_BAD_BINARY));
+    if (ret == -1) return false;
+
+    ret = PyDict_SetItemString(dict, "LMT_PROCESS", PyInt_FromLong(LMT_PROCESS));
+    if (ret == -1) return false;
+
+    ret = PyDict_SetItemString(dict, "LMT_ERROR", PyInt_FromLong(LMT_ERROR));
+    if (ret == -1) return false;
+
+    ret = PyDict_SetItemString(dict, "LMT_WARNING", PyInt_FromLong(LMT_WARNING));
+    if (ret == -1) return false;
+
+    return true;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : module = module dont la définition est à compléter.          *
+*                                                                             *
+*  Description : Prend en charge l'objet 'pychrysalide.gui.panels.LogPanel'.  *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool register_python_log_panel(PyObject *module)
+{
+    //PyObject *parent_mod;                   /* Module Python-EditorItem    */
+    int ret;                                /* Bilan d'un appel            */
+
+    static PyMethodDef py_log_panel_methods[] = {
+        {
+            "log_message", (PyCFunction)py_log_panel_log_message,
+            METH_VARARGS | METH_STATIC,
+            "Display a message in the log window."
+        },
+        { NULL }
+    };
+
+    static PyGetSetDef py_log_panel_getseters[] = {
+        { NULL }
+    };
+
+    static PyTypeObject py_log_panel_type = {
+
+        PyObject_HEAD_INIT(NULL)
+
+        .tp_name        = "pychrysalide.gui.panels.LogPanel",
+        .tp_basicsize   = sizeof(PyObject),
+
+        .tp_flags       = Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,
+
+        .tp_doc         = "PyChrysalide log panel",
+
+        .tp_methods     = py_log_panel_methods,
+        .tp_getset      = py_log_panel_getseters,
+
+    };
+    /*
+    parent_mod = PyImport_ImportModule("pychrysalide.gui.panels");
+    if (parent_mod == NULL) return false;
+
+    py_log_panel_type.tp_base = (PyTypeObject *)PyObject_GetAttrString(parent_mod, "PanelItem");
+    Py_DECREF(parent_mod);
+    */
+    if (PyType_Ready(&py_log_panel_type) < 0)
+        return false;
+
+    if (!define_python_log_constants(py_log_panel_type.tp_dict))
+        return false;
+
+    Py_INCREF(&py_log_panel_type);
+    ret = PyModule_AddObject(module, "LogPanel", (PyObject *)&py_log_panel_type);
+
+    return (ret == 0);
+
+}
diff --git a/plugins/pychrysa/gui/panels/log.h b/plugins/pychrysa/gui/panels/log.h
new file mode 100644
index 0000000..80aea31
--- /dev/null
+++ b/plugins/pychrysa/gui/panels/log.h
@@ -0,0 +1,41 @@
+
+/* OpenIDA - Outil d'analyse de fichiers binaires
+ * log.h - prototypes pour l'équivalent Python du fichier "gui/panels/log.h"
+ *
+ * Copyright (C) 2009-2013 Cyrille Bagard
+ *
+ *  This file is part of OpenIDA.
+ *
+ *  OpenIDA 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.
+ *
+ *  OpenIDA 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_PYCHRYSA_GUI_PANELS_LOG_H
+#define _PLUGINS_PYCHRYSA_GUI_PANELS_LOG_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+#include <gui/panels/log.h>
+
+
+
+/* Prend en charge l'objet 'pychrysalide.gui.panels.LogPanel'. */
+bool register_python_log_panel(PyObject *module);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSA_GUI_PANELS_LOG_H */
diff --git a/plugins/pychrysa/gui/panels/module.c b/plugins/pychrysa/gui/panels/module.c
index 9427f22..4ddab1c 100644
--- a/plugins/pychrysa/gui/panels/module.c
+++ b/plugins/pychrysa/gui/panels/module.c
@@ -25,6 +25,7 @@
 #include "module.h"
 
 
+#include "log.h"
 #include "panel.h"
 
 
@@ -62,6 +63,7 @@ bool add_gui_panels_module_to_python_module(PyObject *super)
     if (ret != 0) /* ... */;
 
     result &= register_python_panel_item(module);
+    result &= register_python_log_panel(module);
 
     return true;