diff --git a/contain.c b/contain.c index 2d26600..599b98d 100644 --- a/contain.c +++ b/contain.c @@ -100,29 +100,31 @@ GtkWidget *get_edit_space_page_new(){ return space_grid; } +GtkWidget *get_run_space_left_box(){ + GtkBox *left_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_VERTICAL, 0)); + gtk_box_append (left_box, GTK_WIDGET (get_ELAPSED_TIME_box())); + gtk_box_append (left_box, GTK_WIDGET (get_test_image())); + gtk_box_append (left_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + gtk_box_append (left_box, GTK_WIDGET (get_objects_and_situations_horizontal_pane())); + return GTK_WIDGET (left_box); +} + +GtkWidget *get_run_space_right_box(){ + GtkBox *right_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_VERTICAL, 0)); + gtk_box_append (right_box, GTK_WIDGET (get_RUN_STOP_box())); + gtk_box_append (right_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_HORIZONTAL))); + 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())); + return GTK_WIDGET (right_box); +} + GtkWidget *get_run_space_page_new(){ -/* - GtkBox *lateral_right_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_VERTICAL, 40)); // spacing - gtk_box_append (lateral_right_box, GTK_WIDGET (get_RUN_STOP_box())); - gtk_box_append (lateral_right_box, GTK_WIDGET (get_scroll_speed())); - gtk_box_append (lateral_right_box, GTK_WIDGET (get_STEP_by_STEP_box())); - gtk_box_append (lateral_right_box, GTK_WIDGET (get_XYZ_box())); - gtk_box_append (lateral_right_box, GTK_WIDGET (get_ZOOM_box())); -*/ - - GtkWidget *space_grid = gtk_grid_new(); -// same result using either : get_ELAPSED_TIME_box() or get_simulation_time_extent_buffer() - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ELAPSED_TIME_box()), 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), get_test_image(), 0, 1, 1, 2); - gtk_grid_attach (GTK_GRID(space_grid), gtk_label_new ("\n"), 0, 3, 1, 1); - 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_RUN_STOP_box()), 1, 0, 1, 2); -// gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(gtk_separator_new (GTK_ORIENTATION_HORIZONTAL)), 1, 1, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_XYZ_box()), 1, 2, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), GTK_WIDGET(get_ZOOM_box()), 1, 3, 1, 2); - - return space_grid; + GtkBox *page_box = GTK_BOX(gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0)); + gtk_box_append (page_box, GTK_WIDGET (get_run_space_left_box())); + gtk_box_append (page_box, GTK_WIDGET (gtk_separator_new (GTK_ORIENTATION_VERTICAL))); + gtk_box_append (page_box, GTK_WIDGET (get_run_space_right_box())); + return GTK_WIDGET (page_box); } void window_bar(GtkWindow *window, char *title){ diff --git a/contain.h b/contain.h index 295a1c4..215fbdc 100644 --- a/contain.h +++ b/contain.h @@ -14,6 +14,8 @@ #define H_STYLES_PANE 60 void activate (GtkApplication *app, gpointer user_data); +GtkWidget *get_run_space_left_box(); +GtkWidget *get_run_space_right_box(); GtkWidget *get_run_space_page_new(); GtkWidget *get_run_rules_page_new(); diff --git a/contain.o b/contain.o index 67676cc..66d0386 100644 Binary files a/contain.o and b/contain.o differ diff --git a/display.c b/display.c index e5852ae..c24c876 100644 --- a/display.c +++ b/display.c @@ -102,7 +102,7 @@ static GtkBox *get_objects_box(){ static 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 (" promotion opéron lactose "))); + gtk_box_append (situations_box, GTK_WIDGET (gtk_label_new (" activation opéron lactose "))); 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 "))); diff --git a/display.o b/display.o index be6438d..eefa20c 100644 Binary files a/display.o and b/display.o differ diff --git a/myprogram b/myprogram index 1823160..11b9a55 100755 Binary files a/myprogram and b/myprogram differ