diff --git a/cold.c b/cold.c
index ec57ad4..b7f1b78 100644
--- a/cold.c
+++ b/cold.c
@@ -26,8 +26,8 @@ GtkBox *get_RUN_STOP_box(){
GtkBox *RUN_STOP_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); // spacing = 2
GtkWidget *RUN_Label = GTK_WIDGET (gtk_label_new (NULL)); // "RUN"));
- const char *str = " RUN\n STOP";
- const char *format = "\%s";
+ const char *str = " RUN-STOP";
+ const char *format = "\%s"; // ^c^v no more...
char *markup;
markup = g_markup_printf_escaped (format, str);
@@ -100,7 +100,48 @@ GtkProgressBar *get_simulation_time_extent_buffer(){
return buffer;
}
-GtkScrolledWindow *get_scrolled_gl_area(){
+GtkBox *get_objects_box(){
+ GtkBox *objects_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" membrane ")));
+ gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" co-enzyme A ")));
+ gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ribosome ")));
+ gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" cytochrome C ")));
+ gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ATP synthase ")));
+ gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" chromosome ")));
+ return objects_box;
+}
+
+GtkBox *get_situations_box(){
+ GtkBox *situations_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
+ gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transcription ")));
+ gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" épissage ")));
+ gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" translation ")));
+ gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transport Na/K ")));
+ gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" ubiquitination ")));
+ gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" rotation du moteur flagellaire ")));
+ return situations_box;
+}
+
+static GtkWidget *get_frame_objects(){
+ GtkWidget *frame_objects = gtk_frame_new (" Objects"); // defines each class of object transparence
+ gtk_widget_set_size_request (frame_objects, 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max
+ gtk_frame_set_child (GTK_FRAME (frame_objects), GTK_WIDGET (get_objects_box()));
+ return frame_objects;
+}
+
+static GtkWidget *get_frame_situations(){
+ GtkWidget *frame_situations = gtk_frame_new (" Situations"); // facilitates each situation identification
+ gtk_widget_set_size_request (GTK_WIDGET (frame_situations), 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max
+ gtk_frame_set_child (GTK_FRAME (frame_situations), GTK_WIDGET (get_situations_box()));
+ return frame_situations;
+}
+
+GtkWidget *get_objects_and_situations_horizontal_pane(){
+ GtkWidget *objects_and_situations_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
+ gtk_paned_set_start_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_objects()));
+ gtk_paned_set_end_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_situations()));
+ return objects_and_situations_horizontal_pane;
+}GtkScrolledWindow *get_scrolled_gl_area(){
GtkScrolledWindow *scrolled = GTK_SCROLLED_WINDOW(gtk_scrolled_window_new());
gtk_scrolled_window_set_min_content_width (scrolled, W_IMAGE);
gtk_scrolled_window_set_min_content_height (scrolled, H_IMAGE);
@@ -121,11 +162,6 @@ GtkScrolledWindow *get_scrolled_gl_area(){
-GtkWidget *get_edit_space_page_new(){
- GtkWidget *xxx_grid = gtk_grid_new();
- return xxx_grid;
-}
-
GtkWidget *get_edit_rules_page_new(){
GtkWidget *xxx_grid = gtk_grid_new();
return xxx_grid;
@@ -222,7 +258,6 @@ GtkWidget *get_run_space_page_new(){
// How to use gtk_separators ?
// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)), 1, 1, 1, 1);
-
return space_grid;
}
diff --git a/cold.o b/cold.o
index 196e8cd..1496661 100644
Binary files a/cold.o and b/cold.o differ
diff --git a/hot.c b/hot.c
index b0b44c8..07a415e 100644
--- a/hot.c
+++ b/hot.c
@@ -7,53 +7,15 @@
// https://docs.gtk.org/gtk4/visual_index.html < widgets gallery
// GTK_ORIENTATION_VERTICAL GTK_ORIENTATION_HORIZONTAL
-GtkWidget *get_scroll_interest_0(){
- GtkAdjustment *interest_adjust = gtk_adjustment_new (0, 0, 100, 1, 0, 0);
- GtkWidget *scroll_interest_0 = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, interest_adjust);
- return scroll_interest_0;
-}
+GtkWidget *get_edit_space_page_new(){
-GtkBox *get_objects_box(){
- GtkBox *objects_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
- gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" membrane ")));
- gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" co-enzyme A ")));
- gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ribosome ")));
- gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" cytochrome C ")));
- gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" ATP synthase ")));
- gtk_box_append (objects_box, GTK_WIDGET (gtk_label_new (" chromosome ")));
- return objects_box;
-}
+ GtkWidget *space_grid = gtk_grid_new();
+ gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 0, 1, 3);
+ gtk_grid_attach (GTK_GRID(space_grid), get_objects_and_situations_horizontal_pane(), 0, 4, 1, 1);
+ gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 0, 1, 2);
+ gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 2, 1, 2);
+// How to use gtk_separators ?
+// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)), 1, 1, 1, 1);
-GtkBox *get_situations_box(){
- GtkBox *situations_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0));
- gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transcription ")));
- gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" épissage ")));
- gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" translation ")));
- gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" transport Na/K ")));
- gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" ubiquitination ")));
- gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" rotation du moteur flagellaire ")));
- return situations_box;
-}
-
-static GtkWidget *get_frame_objects(){
- GtkWidget *frame_objects = gtk_frame_new (" Objects"); // defines each class of object transparence
- gtk_widget_set_size_request (frame_objects, 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max
-// compute_child_allocation (frame_objects, GdkRectangle);
-// gtk_frame_set_child (frame_objects, get_scroll_interest_0());
- gtk_frame_set_child (GTK_FRAME (frame_objects), GTK_WIDGET (get_objects_box()));
- return frame_objects;
-}
-
-static GtkWidget *get_frame_situations(){
- GtkWidget *frame_situations = gtk_frame_new (" Situations"); // facilitates each situation identification
- gtk_widget_set_size_request (GTK_WIDGET (frame_situations), 0, H_STYLES_PANE); // < utile seulement pour la largeur min/max
- gtk_frame_set_child (GTK_FRAME (frame_situations), GTK_WIDGET (get_situations_box()));
- return frame_situations;
-}
-
-GtkWidget *get_objects_and_situations_horizontal_pane(){
- GtkWidget *objects_and_situations_horizontal_pane = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
- gtk_paned_set_start_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_objects()));
- gtk_paned_set_end_child (GTK_PANED(objects_and_situations_horizontal_pane), GTK_WIDGET (get_frame_situations()));
- return objects_and_situations_horizontal_pane;
+ return space_grid;
}
diff --git a/hot.o b/hot.o
index 2d1eed0..5cdd778 100644
Binary files a/hot.o and b/hot.o differ
diff --git a/myprogram b/myprogram
index 8d95fb6..82f3af4 100755
Binary files a/myprogram and b/myprogram differ