diff --git a/contain.c b/contain.c index 6ce6ce3..f93bf59 100644 --- a/contain.c +++ b/contain.c @@ -11,8 +11,6 @@ // https://docs.gtk.org/gtk4/visual_index.html < widgets gallery - - //typedef anytype = {(int)(*fnct) {printf("typedef {(int)(*fnct) {printf("");}");} GtkModelFnct; @@ -148,7 +146,7 @@ GtkWidget *get_selected_rules_vpaned_new(){ -GtkWidget *get_run_space_top_box(){ +GtkWidget *get_TIME_EXEC_controls_box(){ GtkBox *top_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); gtk_box_append (top_box, GTK_WIDGET (get_ELAPSED_TIME_ProgressBar())); gtk_box_append (top_box, GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_VERTICAL))); @@ -156,6 +154,20 @@ GtkWidget *get_run_space_top_box(){ return GTK_WIDGET (top_box); } +GtkWidget *get_SPACE_VIEW_box(){ + GtkBox *right_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); + gtk_box_append (right_box, GTK_WIDGET (get_XYZ_box())); + gtk_box_append (right_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + gtk_box_append (right_box, GTK_WIDGET (get_ZOOM_box())); + + GtkBox *middle_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); + gtk_box_append (middle_box, GTK_WIDGET (get_image_ALL_SPACE())); + gtk_box_append (middle_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_VERTICAL))); + gtk_box_append (middle_box, GTK_WIDGET (right_box)); + return GTK_WIDGET (middle_box); +} + +/* GtkWidget *get_run_space_left_box(){ GtkBox *left_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); gtk_box_append (left_box, GTK_WIDGET (get_image_ALL_SPACE())); @@ -179,12 +191,15 @@ GtkWidget *get_run_space_bottom_box(){ gtk_box_append (bottom_box, GTK_WIDGET (get_run_space_right_box())); return GTK_WIDGET (bottom_box); } - +*/ GtkWidget *get_run_space_page_new(){ GtkBox *page_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); - gtk_box_append (page_box, GTK_WIDGET (get_run_space_top_box())); - gtk_box_append (page_box, GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); - gtk_box_append (page_box, GTK_WIDGET (get_run_space_bottom_box())); + gtk_box_append (page_box, GTK_WIDGET (get_OBJECTS_and_SITUATIONS())); + gtk_box_append (page_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + gtk_box_append (page_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + gtk_box_append (page_box, GTK_WIDGET (get_SPACE_VIEW_box())); + gtk_box_append (page_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + gtk_box_append (page_box, GTK_WIDGET (get_TIME_EXEC_controls_box())); return GTK_WIDGET (page_box); } diff --git a/display.c b/display.c index d17a59d..936c56c 100644 --- a/display.c +++ b/display.c @@ -15,7 +15,7 @@ GtkWidget *get_image_ALL_SPACE(){ // and GtkPicture if you want to display a (maybe) scaled picture. image = gtk_image_new_from_file("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/aXoris.png"); image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/gg sketch.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/E coli (Goodsell).png"); + image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/image/E coli (Goodsell) 2.png"); gtk_widget_set_size_request (GTK_WIDGET (image), W_IMAGE, H_IMAGE); return image; } diff --git a/image/E coli (Goodsell) 2.png b/image/E coli (Goodsell) 2.png new file mode 100644 index 0000000..b2eb7d7 Binary files /dev/null and b/image/E coli (Goodsell) 2.png differ