WIP: cleaning <> prêt pour réorganiser selon MVC + DESIGN / OPERATIONS

2024-06-02 13:13:37 +02:00 · 2024-06-02 13:13:37 +02:00 · 3eac53e356
parent 14b0c84e11
commit 3eac53e356
24 changed files with 57 additions and 120 deletions
--- a/callback.c
+++ b/callback.c
@ -6,6 +6,13 @@
 #include "contain.h"
 #include "texts.h"

+void activate (GtkApplication *self, gpointer user_data) {
+  GtkWindow *window = GTK_WINDOW (gtk_application_window_new (self));
+  window_bar (window, "E coli   (with permission from David S. Goodsell, 2009)");
+  two_notebooks_in_two_panes (window);
+  gtk_window_present (GTK_WINDOW (window));
+}
+
 void ui_toggle_run_edit (GtkWidget *btt_run_xor_edit, gpointer   data)
 {
    printf("window.ui_toggle_run_edit()   >>>    mode = %d", get_run_edit_mode ());
--- a/callback.d
+++ b/callback.d
@ -1,3 +0,0 @@
-callback.o: callback.c hot.h warm.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \
- cold.h display.h contain.h texts.h
--- a/callback.h
+++ b/callback.h
@ -1,3 +1,5 @@
+void activate (GtkApplication *app, gpointer user_data);
+
 void ui_enable_action  (const char *name);
 void ui_disable_action (const char *name);

--- a/callback.o
+++ b/callback.o
--- a/cold.d
+++ b/cold.d
@ -1 +0,0 @@
-cold.o: cold.c texts.h
--- a/cold.o
+++ b/cold.o
--- a/contain.c
+++ b/contain.c
@ -96,8 +96,8 @@ GtkWidget *get_edit_space_page_new(){
 GtkWidget *get_selected_rules_vpaned_new(){
  GtkPaned *V_selected_1_vs_2 = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_VERTICAL));

-  GtkWidget *règle_sélectionnée_n_1 = gtk_frame_new ("(1)");
-  GtkWidget *règle_sélectionnée_n_2 = gtk_frame_new ("(2)");
+//  GtkWidget *règle_sélectionnée_n_1 = gtk_frame_new ("(1)");
+//  GtkWidget *règle_sélectionnée_n_2 = gtk_frame_new ("(2)");

  GtkBox *up_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2));
  gtk_box_append (up_box, GTK_WIDGET (get_image_GLUTAMATE()));
@ -120,8 +120,12 @@ GtkWidget *get_selected_rules_vpaned_new(){
 //  gtk_paned_set_start_child (V_selected_1_vs_2, GTK_WIDGET (règle_sélectionnée_n_1));
 //  gtk_paned_set_end_child (V_selected_1_vs_2, GTK_WIDGET (règle_sélectionnée_n_2));

-  gtk_box_append ( GTK_BOX (règle_sélectionnée_n_1), GTK_WIDGET (up_box));//, GTK_WIDGET (get_image_GLUTAMATE()));
-  gtk_box_append ( GTK_BOX (règle_sélectionnée_n_2), GTK_WIDGET (bottom_box));//, GTK_WIDGET (get_image_GLUTAMATE()));
+
+
+//  LES DEUX  'Gtk-CRITICAL **: 12:56:16.886: gtk_box_append: assertion 'GTK_IS_BOX (box)' failed' VIENNENT DES DEUX LIGNES SUIVANTES (2024-06-02)
+//  gtk_box_append ( GTK_BOX (règle_sélectionnée_n_1), GTK_WIDGET (up_box));//, GTK_WIDGET (get_image_GLUTAMATE()));
+//  gtk_box_append ( GTK_BOX (règle_sélectionnée_n_2), GTK_WIDGET (bottom_box));//, GTK_WIDGET (get_image_GLUTAMATE()));
+

  return GTK_WIDGET (V_selected_1_vs_2);
 }
@ -303,10 +307,6 @@ GtkButton *get_btt_run_xor_edit() {
  return run_xor_edit;
 }

-void activate (GtkApplication *self, gpointer user_data) {
-  GtkWindow *window = GTK_WINDOW (gtk_application_window_new (self));
-  window_bar (window, "E coli   (with permission from David S. Goodsell, 2009)");
-  two_notebooks_in_two_panes (window);
-  gtk_window_present (GTK_WINDOW (window));
-}
+//  https://docs.gtk.org/gtk4/getting_started.html   (m'aura bien servi, quand même !)
+

--- a/contain.d
+++ b/contain.d
@ -1,3 +0,0 @@
-contain.o: contain.c hot.h warm.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \
- cold.h display.h contain.h texts.h callback.h
--- a/contain.h
+++ b/contain.h
@ -28,7 +28,7 @@ MyApplication *my_application_new (const char *application_id, GApplicationFlags
 G_END_DECLS
 */

+void two_notebooks_in_two_panes (GtkWindow *window);
 GtkWidget *get_selected_rules_vpaned_new();

-void activate (GtkApplication *app, gpointer user_data);

--- a/contain.o
+++ b/contain.o
--- a/display.d
+++ b/display.d
@ -1,3 +0,0 @@
-display.o: display.c hot.h warm.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \
- cold.h display.h contain.h texts.h
--- a/display.o
+++ b/display.o
--- a/hot.c
+++ b/hot.c
@ -17,7 +17,7 @@ static int run_edit_mode_val = 0;
 void set_run_edit_mode(int prescribed_mode) {run_edit_mode_val = prescribed_mode;}
 int  get_run_edit_mode () {return run_edit_mode_val;}

-static struct TreeNode_t {gchar *text; struct TreeNode_t *child, *next;};
+struct TreeNode_t {gchar *text; struct TreeNode_t *child, *next;};
 static void add_child_node (struct TreeNode_t *parent, struct TreeNode_t *child){
    if (parent->child) {
        struct TreeNode_t *cur = parent->child;
--- a/hot.d
+++ b/hot.d
@ -1,3 +0,0 @@
-hot.o: hot.c warm.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \
- cold.h display.h contain.h texts.h
--- a/hot.o
+++ b/hot.o
--- a/main.c
+++ b/main.c
@ -8,10 +8,7 @@
 /******************************************************************************/

 #include "hot.h"
-#include "warm.h"
-#include "cold.h"
-#include "display.h"
-#include "contain.h"
+#include "callback.h"

 int main (int argc, char **argv)
 {
@ -25,3 +22,37 @@ int main (int argc, char **argv)

  return status;
 }
+
+
+/*
+https://docs.gtk.org/gtk4/class.ApplicationWindow.html
+
+GtkApplication *app = gtk_application_new ("org.gtk.test", 0);
+
+GtkBuilder *builder = gtk_builder_new_from_string (
+    "<interface>"
+    "  <menu id='menubar'>"
+    "    <submenu>"
+    "      <attribute name='label' translatable='yes'>_Edit</attribute>"
+    "      <item>"
+    "        <attribute name='label' translatable='yes'>_Copy</attribute>"
+    "        <attribute name='action'>win.copy</attribute>"
+    "      </item>"
+    "      <item>"
+    "        <attribute name='label' translatable='yes'>_Paste</attribute>"
+    "        <attribute name='action'>win.paste</attribute>"
+    "      </item>"
+    "    </submenu>"
+    "  </menu>"
+    "</interface>",
+    -1);
+
+GMenuModel *menubar = G_MENU_MODEL (gtk_builder_get_object (builder, "menubar"));
+gtk_application_set_menubar (GTK_APPLICATION (app), menubar);
+g_object_unref (builder);
+
+// ...
+
+GtkWidget *window = gtk_application_window_new (app);
+
+*/
--- a/main.d
+++ b/main.d
@ -1,89 +0,0 @@
-main.o: main.c hot.h warm.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/galloca.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gtypes.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/lib/glib-2.0/include/glibconfig.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmacros.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gversionmacros.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/glib-visibility.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/garray.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gasyncqueue.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gthread.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gatomic.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/glib-typeof.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gerror.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gquark.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gutils.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gbacktrace.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gbase64.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gbitlock.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gbookmarkfile.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gdatetime.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gtimezone.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gbytes.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gcharset.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gchecksum.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gconvert.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gdataset.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gdate.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gdir.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/genviron.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gfileutils.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/ggettext.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/ghash.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/glist.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmem.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gnode.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/ghmac.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gchecksum.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/ghook.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/ghostutils.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/giochannel.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmain.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gpoll.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gslist.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gstring.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gunicode.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gstrfuncs.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gkeyfile.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmappedfile.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmarkup.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmessages.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gvariant.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gvarianttype.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/goption.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gpathbuf.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gpattern.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gprimes.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gqsort.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gqueue.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/grand.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/grcbox.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/grefcount.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/grefstring.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmem.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gmacros.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gregex.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gscanner.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gsequence.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gshell.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gslice.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gspawn.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gstringchunk.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gstrvbuilder.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gtestutils.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gthreadpool.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gtimer.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gtrashstack.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gtree.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/guri.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/guuid.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/gversion.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/gallocator.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/gcache.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/gcompletion.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/gmain.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/grel.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/gthread.h \
- /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/glib-autocleanups.h \
- cold.h display.h contain.h
--- a/main.o
+++ b/main.o
--- a/BIN
+++ b/BIN
--- a/texts.d
+++ b/texts.d
@ -1 +0,0 @@
-texts.o: texts.c
--- a/texts.o
+++ b/texts.o
--- a/warm.c
+++ b/warm.c
@ -173,3 +173,4 @@ GtkBox *get_CONTROL_box(){
  return CONTROL_box;
 }
 */
+
--- a/warm.d
+++ b/warm.d
@ -1 +0,0 @@
-warm.o: warm.c cold.h display.h contain.h texts.h
--- a/warm.o
+++ b/warm.o
				`@ -1 +0,0 @@`
				`warm.o: warm.c cold.h display.h contain.h texts.h`