diff --git a/cold.c b/cold.c index 3a8e919..ee69459 100644 --- a/cold.c +++ b/cold.c @@ -1,7 +1,3 @@ #include #include -#include "cold.h" -#include "widgets.h" -#include "pages.h" -void print_text(GtkWidget *widget, gpointer data) {g_print (data);} diff --git a/cold.d b/cold.d index f5f72b2..d197c4b 100644 --- a/cold.d +++ b/cold.d @@ -1 +1 @@ -cold.o: cold.c cold.h widgets.h pages.h +cold.o: cold.c diff --git a/cold.h b/cold.h index 67e9bfe..6ae26e1 100644 --- a/cold.h +++ b/cold.h @@ -7,4 +7,3 @@ /* */ /******************************************************************************/ -void print_text(GtkWidget *widget, gpointer data); diff --git a/cold.o b/cold.o index bc31a1b..76f8b2e 100644 Binary files a/cold.o and b/cold.o differ diff --git a/hot.c b/hot.c index e8249e8..ac37d86 100644 --- a/hot.c +++ b/hot.c @@ -1,5 +1,6 @@ #include #include + #include "warm.h" #include "cold.h" #include "widgets.h" diff --git a/hot.h b/hot.h index f89b6d0..3353fb3 100644 --- a/hot.h +++ b/hot.h @@ -7,8 +7,6 @@ /* */ /******************************************************************************/ -#include -#include #include "warm.h" #include "cold.h" #include "widgets.h" diff --git a/E coli by David S. Goodsell (2009).png b/image E coli (Goodsell).png similarity index 100% rename from E coli by David S. Goodsell (2009).png rename to image E coli (Goodsell).png diff --git a/image aXoris.png b/image aXoris.png new file mode 100644 index 0000000..1994d91 Binary files /dev/null and b/image aXoris.png differ diff --git a/image gg sketch.png b/image gg sketch.png new file mode 100644 index 0000000..7af2e55 Binary files /dev/null and b/image gg sketch.png differ diff --git a/main.d b/main.d index 46f908e..3a2ea19 100644 --- a/main.d +++ b/main.d @@ -1,3 +1,89 @@ 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 widgets.h pages.h diff --git a/main.o b/main.o index c0d6b89..3b05a94 100644 Binary files a/main.o and b/main.o differ diff --git a/myprogram b/myprogram index 747f707..4458700 100755 Binary files a/myprogram and b/myprogram differ diff --git a/pages.c b/pages.c index d1b02ae..f85b980 100644 --- a/pages.c +++ b/pages.c @@ -1,5 +1,6 @@ #include #include + #include "cold.h" #include "widgets.h" #include "pages.h" @@ -85,7 +86,7 @@ GtkWidget *get_run_rules_page_new(){ GtkWidget *get_edit_space_page_new(){ 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_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); @@ -103,7 +104,7 @@ GtkWidget *get_run_space_page_new(){ // attach 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), GTK_WIDGET(get_simulation_time_extent_buffer()), 0, 0, 1, 1); - gtk_grid_attach (GTK_GRID(space_grid), get_a_space_test_image(), 0, 1, 1, 3); + gtk_grid_attach (GTK_GRID(space_grid), get_test_image(), 0, 1, 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_RUN_STOP_box()), 1, 0, 1, 1); gtk_grid_attach (GTK_GRID(space_grid), get_scroll_speed(), 1, 1, 1, 1); diff --git a/pages.h b/pages.h index cfe8c30..cbda6cf 100644 --- a/pages.h +++ b/pages.h @@ -7,8 +7,6 @@ /* */ /******************************************************************************/ -#include -#include #define W 1920 #define H 960 #define W_IMAGE 1920 - 64 diff --git a/pages.o b/pages.o index 335eb78..aaa50c9 100644 Binary files a/pages.o and b/pages.o differ diff --git a/warm.c b/warm.c index f124d76..3db4c99 100644 --- a/warm.c +++ b/warm.c @@ -1,6 +1,6 @@ #include #include -#include "warm.h" + #include "cold.h" #include "widgets.h" #include "pages.h" diff --git a/warm.h b/warm.h index 9e336be..0b406b6 100644 --- a/warm.h +++ b/warm.h @@ -7,7 +7,7 @@ /* */ /******************************************************************************/ -#pragma once +#pragma once // < WTF !? #include #include diff --git a/widgets.c b/widgets.c index ac0497e..570e2d4 100644 --- a/widgets.c +++ b/widgets.c @@ -1,17 +1,18 @@ #include #include + #include "cold.h" #include "widgets.h" #include "pages.h" -GtkWidget *get_a_space_test_image(){ +GtkWidget *get_test_image(){ GtkWidget *image; - image = GTK_WIDGET(get_scrolled_gl_area()); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/aXoris.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/gg sketch.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/E coli.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/images/E coli resized.png"); - image = gtk_picture_new_for_filename ("/home/jean/01/Gtk4/Getting_Started_with_GTK/E coli by David S. Goodsell (2009).png"); + // forget > GTK_WIDGET(get_scrolled_gl_area()); + // Use GtkImage if you want to display a fixed-size icon + // 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"); return image; } @@ -123,7 +124,7 @@ GtkBox *get_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 (" promotion 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/widgets.h b/widgets.h index 1bbf36b..d7b4165 100644 --- a/widgets.h +++ b/widgets.h @@ -7,7 +7,7 @@ /* */ /******************************************************************************/ -GtkWidget *get_a_space_test_image(); +GtkWidget *get_test_image(); GtkScrolledWindow *get_scrolled_gl_area(); GtkBox *get_RUN_STOP_box(); GtkBox *get_STEP_by_STEP_box(); diff --git a/widgets.o b/widgets.o index 73b65d9..3ca97f5 100644 Binary files a/widgets.o and b/widgets.o differ