Updated the Python API to use properly handled constants.

4 files changed, 117 insertions, 34 deletions

diff --git a/plugins/pychrysalide/gtkext/graph/Makefile.am b/plugins/pychrysalide/gtkext/graph/Makefile.am
index c30c07c..3b43ffd 100644
--- a/plugins/pychrysalide/gtkext/graph/Makefile.am
+++ b/plugins/pychrysalide/gtkext/graph/Makefile.am
@@ -2,6 +2,7 @@
 noinst_LTLIBRARIES = libpychrysagtkextgraph.la
 
 libpychrysagtkextgraph_la_SOURCES =		\
+	constants.h constants.c				\
 	cluster.h cluster.c					\
 	edge.h edge.c						\
 	module.h module.c
diff --git a/plugins/pychrysalide/gtkext/graph/constants.c b/plugins/pychrysalide/gtkext/graph/constants.c
new file mode 100644
index 0000000..9545354
--- /dev/null
+++ b/plugins/pychrysalide/gtkext/graph/constants.c
@@ -0,0 +1,75 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * constants.c - ajout des constantes de base pour les extensions à la GLib
+ *
+ * Copyright (C) 2020 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 "constants.h"
+
+
+#include <i18n.h>
+#include <gtkext/graph/edge.h>
+
+
+#include "../../helpers.h"
+
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : type = type dont le dictionnaire est à compléter.            *
+*                                                                             *
+*  Description : Définit les constantes relatives aux liens de graphiques.    *
+*                                                                             *
+*  Retour      : true en cas de succès de l'opération, false sinon.           *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool define_graph_edge_constants(PyTypeObject *type)
+{
+    bool result;                            /* Bilan à retourner           */
+    PyObject *values;                       /* Groupe de valeurs à établir */
+
+    values = PyDict_New();
+
+    result = add_const_to_group(values, "DEFAULT", EGC_DEFAULT);
+    if (result) result = add_const_to_group(values, "GREEN", EGC_GREEN);
+    if (result) result = add_const_to_group(values, "RED", EGC_RED);
+    if (result) result = add_const_to_group(values, "BLUE", EGC_BLUE);
+    if (result) result = add_const_to_group(values, "DASHED_GRAY", EGC_DASHED_GRAY);
+    if (result) result = add_const_to_group(values, "COUNT", EGC_COUNT);
+
+    if (!result)
+    {
+        Py_DECREF(values);
+        goto exit;
+    }
+
+    result = attach_constants_group_to_type(type, false, "EdgeColor", values,
+                                            "Rendering color for graphical edges.");
+
+ exit:
+
+    return result;
+
+}
diff --git a/plugins/pychrysalide/gtkext/graph/constants.h b/plugins/pychrysalide/gtkext/graph/constants.h
new file mode 100644
index 0000000..3c76602
--- /dev/null
+++ b/plugins/pychrysalide/gtkext/graph/constants.h
@@ -0,0 +1,39 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * constants.h - prototypes pour l'ajout des constantes de base pour les graphiques
+ *
+ * Copyright (C) 2020 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_GTKEXT_GRAPH_CONSTANTS_H
+#define _PLUGINS_PYCHRYSALIDE_GTKEXT_GRAPH_CONSTANTS_H
+
+
+#include <Python.h>
+#include <stdbool.h>
+
+
+
+/* Définit les constantes relatives aux liens de graphiques. */
+bool define_graph_edge_constants(PyTypeObject *);
+
+
+
+#endif  /* _PLUGINS_PYCHRYSALIDE_GTKEXT_GRAPH_CONSTANTS_H */
diff --git a/plugins/pychrysalide/gtkext/graph/edge.c b/plugins/pychrysalide/gtkext/graph/edge.c
index 60d5bb7..ce20ce9 100644
--- a/plugins/pychrysalide/gtkext/graph/edge.c
+++ b/plugins/pychrysalide/gtkext/graph/edge.c
@@ -33,6 +33,7 @@
 #include <plugins/dt.h>
 
 
+#include "constants.h"
 #include "../../access.h"
 #include "../../helpers.h"
 
@@ -47,9 +48,6 @@ static PyObject *py_graph_edge_get_color(PyObject *, void *);
 /* Fournit l'ensemble des points constituant un lien graphique. */
 static PyObject *py_graph_edge_get_points(PyObject *, void *);
 
-/* Définit les constantes pour les liens graphiques. */
-static bool py_graph_edge_define_constants(PyTypeObject *);
-
 
 
 /******************************************************************************
@@ -184,36 +182,6 @@ static PyObject *py_graph_edge_get_points(PyObject *self, void *closure)
 
 /******************************************************************************
 *                                                                             *
-*  Paramètres  : obj_type = type dont le dictionnaire est à compléter.        *
-*                                                                             *
-*  Description : Définit les constantes pour les liens graphiques.            *
-*                                                                             *
-*  Retour      : true en cas de succès de l'opération, false sinon.           *
-*                                                                             *
-*  Remarques   : -                                                            *
-*                                                                             *
-******************************************************************************/
-
-static bool py_graph_edge_define_constants(PyTypeObject *obj_type)
-{
-    bool result;                            /* Bilan à retourner           */
-
-    result = true;
-
-    if (result) result = PyDict_AddULongMacro(obj_type, EGC_DEFAULT);
-    if (result) result = PyDict_AddULongMacro(obj_type, EGC_GREEN);
-    if (result) result = PyDict_AddULongMacro(obj_type, EGC_RED);
-    if (result) result = PyDict_AddULongMacro(obj_type, EGC_BLUE);
-    if (result) result = PyDict_AddULongMacro(obj_type, EGC_DASHED_GRAY);
-    if (result) result = PyDict_AddULongMacro(obj_type, EGC_COUNT);
-
-    return result;
-
-}
-
-
-/******************************************************************************
-*                                                                             *
 *  Paramètres  : -                                                            *
 *                                                                             *
 *  Description : Fournit un accès à une définition de type à diffuser.        *
@@ -302,7 +270,7 @@ bool ensure_python_graph_edge_is_registered(void)
         if (!register_class_for_pygobject(dict, G_TYPE_GRAPH_EDGE, type, &PyGObject_Type))
             return false;
 
-        if (!py_graph_edge_define_constants(type))
+        if (!define_graph_edge_constants(type))
             return false;
 
     }