Separate the GTK application and the GTK main window.

6 files changed, 368 insertions, 2 deletions

diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 4197989..5ec43d2 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -29,7 +29,9 @@ libgui_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS)
 libgui4_la_SOURCES =						\
 	panel-int.h								\
 	panel.h panel.c							\
-	resources.h resources.c
+	resources.h resources.c					\
+	window-int.h							\
+	window.h window.c
 
 libgui4_la_LIBADD =							\
 	core/libguicore4.la						\
@@ -47,7 +49,8 @@ SUBDIRS = core panels # dialogs menus panels tb
 
 
 RES_FILES = 								\
-	style.css
+	style.css								\
+	window.ui
 
 resources.c: gresource.xml $(RES_FILES)
 	glib-compile-resources --target=$@ --sourcedir=$(srcdir) --generate-source --c-name gui gresource.xml
diff --git a/src/gui/gresource.xml b/src/gui/gresource.xml
index 437ec51..91d9bc9 100644
--- a/src/gui/gresource.xml
+++ b/src/gui/gresource.xml
@@ -2,6 +2,7 @@
 <gresources>
     <gresource prefix="/re/chrysalide/framework/gui">
         <file compressed="true">style.css</file>
+        <file compressed="true">window.ui</file>
     </gresource>
     <gresource prefix="/re/chrysalide/framework/images">
         <file compressed="true" alias="chrysalide-logo.svg">../../pixmaps/chrysalide-logo.svg</file>
diff --git a/src/gui/window-int.h b/src/gui/window-int.h
new file mode 100644
index 0000000..d79e189
--- /dev/null
+++ b/src/gui/window-int.h
@@ -0,0 +1,57 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * window.h - prototypes internes pour la construction d'une fenêtre graphique principale
+ *
+ * Copyright (C) 2024 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 Chrysalide.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _GUI_WINDOW_INT_H
+#define _GUI_WINDOW_INT_H
+
+
+#include "window.h"
+#include "../gtkext/grid.h"
+
+
+
+/* Définition de l'application principale graphique (instance) */
+struct _GtkFrameworkWindow
+{
+    GtkApplicationWindow parent;            /* A laisser en premier        */
+
+    GSettings *settings;                    /* Paramètres globaux          */
+
+    GtkStack *grid;                         /* Réceptacle de panneaux      */
+
+};
+
+/* Définition de l'application principale graphique (classe) */
+struct _GtkFrameworkWindowClass
+{
+    GtkApplicationWindowClass parent;       /* A laisser en premier        */
+
+};
+
+
+/* Met en place une fenêtre principale pour Chrysalide. */
+bool gtk_framework_window_create(GtkFrameworkWindow *, GtkApplication *);
+
+
+
+#endif  /* _GUI_WINDOW_INT_H */
diff --git a/src/gui/window.c b/src/gui/window.c
new file mode 100644
index 0000000..dcdd4d1
--- /dev/null
+++ b/src/gui/window.c
@@ -0,0 +1,235 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * window.c - construction d'une fenêtre graphique principale
+ *
+ * Copyright (C) 2024 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 "window.h"
+
+
+#include "window-int.h"
+#include "core/panels.h"
+#include "panels/welcome.h"
+
+
+
+/* Initialise la classe des applications majeures de Chrysalide. */
+static void gtk_framework_window_class_init(GtkFrameworkWindowClass *);
+
+/* Initialise une application principale pour Chrysalide. */
+static void gtk_framework_window_init(GtkFrameworkWindow *);
+
+/* Supprime toutes les références externes. */
+static void gtk_framework_window_dispose(GtkFrameworkWindow *);
+
+/* Procède à la libération totale de la mémoire. */
+static void gtk_framework_window_finalize(GtkFrameworkWindow *);
+
+
+
+/* Indique le type défini pour une fenêtre graphique principale de Chrysalide. */
+G_DEFINE_TYPE(GtkFrameworkWindow, gtk_framework_window, GTK_TYPE_APPLICATION_WINDOW);
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : class = classe à initialiser.                                *
+*                                                                             *
+*  Description : Initialise la classe des applications majeures de Chrysalide.*
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static void gtk_framework_window_class_init(GtkFrameworkWindowClass *class)
+{
+    GObjectClass *object;                   /* Plus haut niveau équivalent */
+    GtkWidgetClass *widget;                 /* Classe de haut niveau       */
+
+    object = G_OBJECT_CLASS(class);
+
+    object->dispose = (GObjectFinalizeFunc/* ! */)gtk_framework_window_dispose;
+    object->finalize = (GObjectFinalizeFunc)gtk_framework_window_finalize;
+
+    widget = GTK_WIDGET_CLASS(class);
+
+    //g_type_ensure(GTK_TYPE_TILING_GRID);
+
+    gtk_widget_class_set_template_from_resource(widget, "/re/chrysalide/framework/gui/window.ui");
+
+    gtk_widget_class_bind_template_child(widget, GtkFrameworkWindow, grid);
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : window = instance à initialiser.                             *
+*                                                                             *
+*  Description : Initialise une application principale pour Chrysalide.       *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static void gtk_framework_window_init(GtkFrameworkWindow *window)
+{
+    gtk_widget_init_template(GTK_WIDGET(window));
+
+    window->settings = g_settings_new(FRAMEWORK_WINDOW_ID);
+
+    g_settings_bind(window->settings, "window-width", G_OBJECT(window), "default-width", G_SETTINGS_BIND_DEFAULT);
+    g_settings_bind(window->settings, "window-height", G_OBJECT(window), "default-height", G_SETTINGS_BIND_DEFAULT);
+    g_settings_bind(window->settings, "window-maximized", G_OBJECT(window), "maximized", G_SETTINGS_BIND_DEFAULT);
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : window = instance d'objet GLib à traiter.                    *
+*                                                                             *
+*  Description : Supprime toutes les références externes.                     *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static void gtk_framework_window_dispose(GtkFrameworkWindow *window)
+{
+    gtk_widget_dispose_template(GTK_WIDGET(window), GTK_TYPE_FRAMEWORK_WINDOW);
+
+    g_clear_object(&window->settings);
+
+    G_OBJECT_CLASS(gtk_framework_window_parent_class)->dispose(G_OBJECT(window));
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : window = instance d'objet GLib à traiter.                    *
+*                                                                             *
+*  Description : Procède à la libération totale de la mémoire.                *
+*                                                                             *
+*  Retour      : -                                                            *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+static void gtk_framework_window_finalize(GtkFrameworkWindow *window)
+{
+    G_OBJECT_CLASS(gtk_framework_window_parent_class)->finalize(G_OBJECT(window));
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : app = application GTK de rattachement.                       *
+*                                                                             *
+*  Description : Crée une nouvelle application principale pour Chrysalide.    *
+*                                                                             *
+*  Retour      : Mécanismes mis en place.                                     *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+GtkApplicationWindow *gtk_framework_window_new(GtkApplication *app)
+{
+    GtkApplicationWindow *result;           /* Instance à retourner        */
+
+    result = g_object_new(GTK_TYPE_FRAMEWORK_WINDOW, NULL);
+
+    if (!gtk_framework_window_create(GTK_FRAMEWORK_WINDOW(result), app))
+        g_clear_object(&result);
+
+    return result;
+
+}
+
+
+/******************************************************************************
+*                                                                             *
+*  Paramètres  : window = instance de fenêtre principale à remplir.           *
+*                app    = application GTK de rattachement.                    *
+*                                                                             *
+*  Description : Met en place une fenêtre principale pour Chrysalide.         *
+*                                                                             *
+*  Retour      : Bilan de l'opération.                                        *
+*                                                                             *
+*  Remarques   : -                                                            *
+*                                                                             *
+******************************************************************************/
+
+bool gtk_framework_window_create(GtkFrameworkWindow *window, GtkApplication *app)
+{
+    bool result;                            /* Bilan à retourner           */
+    GPanelItem *item;                       /* Définition de panneau       */
+    GtkTiledPanel *panel;                   /* Panneau d'affichage         */
+    GtkCssProvider *css;                    /* Feuille de style maison     */
+
+    result = true;
+
+    gtk_window_set_application(GTK_WINDOW(window), app);
+
+    /* Inclusion d'un écran d'accueil */
+
+    item = find_item_panel_by_type(G_TYPE_WELCOME_PANEL);
+
+    panel = g_panel_item_get_panel(item);
+    gtk_stack_add_child(window->grid, GTK_WIDGET(panel));
+
+    unref_object(item);
+
+    /* Chargement des extensions de thème */
+
+    css = gtk_css_provider_new();
+
+    gtk_css_provider_load_from_resource(css, "/re/chrysalide/framework/gtkext/hexview.css");
+
+    gtk_style_context_add_provider_for_display(gtk_widget_get_display(GTK_WIDGET(window)),
+                                               GTK_STYLE_PROVIDER(css), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+    unref_object(css);
+
+    css = gtk_css_provider_new();
+
+    gtk_css_provider_load_from_resource(css, "/re/chrysalide/framework/gui/style.css");
+
+    gtk_style_context_add_provider_for_display(gtk_widget_get_display(GTK_WIDGET(window)),
+                                               GTK_STYLE_PROVIDER(css), GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+
+    unref_object(css);
+
+    /* Fin des chargements */
+
+    return result;
+
+}
diff --git a/src/gui/window.h b/src/gui/window.h
new file mode 100644
index 0000000..4e73a76
--- /dev/null
+++ b/src/gui/window.h
@@ -0,0 +1,51 @@
+
+/* Chrysalide - Outil d'analyse de fichiers binaires
+ * window.h - prototypes pour la construction d'une fenêtre graphique principale
+ *
+ * Copyright (C) 2024 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 Chrysalide.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+
+#ifndef _GUI_WINDOW_H
+#define _GUI_WINDOW_H
+
+
+#include <gtk/gtk.h>
+
+
+#include "../glibext/helpers.h"
+
+
+
+/* Définition d'un identifiant unique */
+#define FRAMEWORK_WINDOW_ID "re.chrysalide.framework.gui"
+
+
+
+#define GTK_TYPE_FRAMEWORK_WINDOW (gtk_framework_window_get_type())
+
+DECLARE_GTYPE(GtkFrameworkWindow, gtk_framework_window, GTK, FRAMEWORK_WINDOW);
+
+
+
+/* Crée une nouvelle application principale pour Chrysalide. */
+GtkApplicationWindow *gtk_framework_window_new(GtkApplication *);
+
+
+
+#endif  /* _GUI_WINDOW_H */
diff --git a/src/gui/window.ui b/src/gui/window.ui
new file mode 100644
index 0000000..d9ca32c
--- /dev/null
+++ b/src/gui/window.ui
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+    <template class="GtkFrameworkWindow" parent="GtkApplicationWindow">
+        <property name="title" translatable="no">Chrysalide</property>
+        <property name="default-width">800</property>
+        <property name="default-height">600</property>
+        <property name="icon-name">chrysalide-logo</property>
+        <child>
+            <object class="GtkBox">
+                <property name="orientation">vertical</property>
+                <child>
+                    <object class="GtkStack" id="grid">
+                        <property name="vexpand">TRUE</property>
+                    </object>
+                </child>
+            </object>
+        </child>
+    </template>
+</interface>