From 19cdc544c69eb9aa1c5f3fdae9f486ea4f97c639 Mon Sep 17 00:00:00 2001 From: Jean Sirmai Date: Sun, 30 Jun 2024 18:29:54 +0200 Subject: [PATCH] WIP: cleaning (systematic verifications I) --- include/widgets.h | 3 +- src/shader.frag | 2 +- src/shader.vert | 2 +- src/texts.c | 66 ------------------------- src/widgets.c | 80 +------------------------------ src/widgets_lab.c | 119 ++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 125 insertions(+), 147 deletions(-) delete mode 100644 src/texts.c diff --git a/include/widgets.h b/include/widgets.h index a2c15fa..c551e1a 100644 --- a/include/widgets.h +++ b/include/widgets.h @@ -85,4 +85,5 @@ int get_run_edit_mode(); GListModel* get_user_tree_model (GObject *item, gpointer root); void on_setup_user_tree_factory (GtkSignalListItemFactory *factory, GObject* object, gpointer user_data); - +char *get_space_run_edit_specif(); +void icons_for_fun (GtkHeaderBar *header_bar); diff --git a/src/shader.frag b/src/shader.frag index 4ef65d9..027d30c 100644 --- a/src/shader.frag +++ b/src/shader.frag @@ -2,7 +2,7 @@ * * * Gem-graph client * * * -* Shader * +* Shader frag * * * * Copyright © 2021 Libre en Communs * * Copyright © 2023 Adrien Bourmault * diff --git a/src/shader.vert b/src/shader.vert index 227db1b..77b59a6 100644 --- a/src/shader.vert +++ b/src/shader.vert @@ -2,7 +2,7 @@ * * * Gem-graph client * * * -* Shader * +* Shader vert * * * * Copyright © 2021 Libre en Communs * * Copyright © 2023 Adrien Bourmault * diff --git a/src/texts.c b/src/texts.c deleted file mode 100644 index df41cf7..0000000 --- a/src/texts.c +++ /dev/null @@ -1,66 +0,0 @@ -/* * * * * * * * * * * * * * * * * * * * * * * * * * * -* * -* Gem-graph client * -* * -* Texts * -* * -* Copyright © 2021 Libre en Communs * -* Copyright © 2024 Jean Sirmai * -* * -* This file is part of Gem-graph. * -* * -* This program is free software: you can redistribute it and/or modify it * -* under the terms of the GNU Affero General Public License * -* as publishedby the Free Software Foundation, * -* either version 3 of the License, or (at your option) any later version. * -* * -* This program is distributed in the hope that it will be useful, * -* but WITHOUT ANY WARRANTY; without even the implied warranty of * -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. * -* See the GNU Affero General Public License for more details. * -* * -* You should have received a copy of the GNU Affero General Public License * -* along with this program. If not, see . * -* * -* * * * * * * * * * * * * * * * * * * * * * * * * * */ - - -char *get_space_run_edit_specif(){ return "\n\ ->>> Dans : [space_page - mode RUN] doivent être : ------------------------------------------------------\n\n\ -(1) les commandes de mouvement:\n\ - - run/stop, slow down/speed up, step by step, do/undo/redo\n\ - + le buffer [elapsed time] qui montre le temps de simulation écoulé\n\n\ -(2) les commandes qui modifient la perception de l'espace (la caméra)\n\ - - son orientation (X,Y,Z),\n\ - + l'orientation (X,Y,Z) de l'état dans l'espace (six possibilités),\n\ - + le zoom,\n\ - + les paramètres qui définissent la perspective (distances oeil/écran, écran/objet virtuel) \n\n\ -(3) les commandes qui modifient les apparences des objets et des situations d'intérêt\n\ - (+/- transparents, colorés, etc.)\n\n\ -(4) les commandes qui modifient l'apparence de l'espace (grilles, +/- surfaces, aspect des flèches, etc.)\n\n\ -(0) NB >>> AUCUNE COMMANDE NE DOIT PERMETTRE D'ÉDITER L'ESPACE ! <<<\n\n\n\ ->>> Dans : [space_page - mode EDIT] doivent être : ------------------------------------------------------\n\n\ -(1) les commandes qui modifient la perception de l'espace (la caméra)\n\ - - son orientation (X,Y,Z),\n\ - + l'orientation (X,Y,Z) de l'état dans l'espace (six possibilités),\n\ - + le zoom,\n\ - + les paramètres qui définissent la perspective (distances oeil/écran, écran/objet virtuel) \n\n\ -(2) les commandes qui modifient les apparences des objets et des situations d'intérêt\n\ - (+/- transparents, colorés, etc.)\n\n\ -(3) les commandes qui modifient l'apparence de l'espace (grilles, +/- surfaces, aspect des flèches, etc.)\n\n\ -(4) les commandes d'édition locales (drag and drop une flèche)\n\ - ('faire de la place' pour insérer)\n\ - (sélectionner pour déplacer ou enlever...)\n\ - NB ces commandes doivent être graphiques et/ou accessibles par raccourcis ou en ligne\n\n\ -(5) les commandes d'édition globales\n\ - (ex: introduire, retirer, transformer +/-aléatoirement (n) objets dans l'espace)\n\n\n\ - NB une action effectuée sur une zone d'intérêt devrait pouvoir être automatiquement appliquée\n\ - à d'autres zones d'intérêt identifiées comme similaires\n\n\ -(0) NB >>> AUCUNE COMMANDE NE DOIT PERMETTRE D'EXÉCUTER UN RUN ! <<<\n\n\n\ ->>> L'objectif est que l'utilisateur ait accès à une organsisation aussi ergonomique que possible -----\n\n\ - i.e : chaque utilisateur devrait disposer de 'préférences'\n\ - c'est-à-dire avoir la possiblité de faire des choix ergonomiques personnalisés.\n\ -";} - -char *get_rules_run_edit_specif(){ return "\n\ -";} diff --git a/src/widgets.c b/src/widgets.c index 5f91d1c..35b315a 100644 --- a/src/widgets.c +++ b/src/widgets.c @@ -171,8 +171,6 @@ GtkWidget *get_SPACE_EDIT_controls_box() { } -static void icons_for_fun (GtkHeaderBar *header_bar); - static GtkButton *btt_open_STATE; static GtkButton *btt_open_RULES; static GtkButton *btt_open_DATA; @@ -226,10 +224,7 @@ void window_header_bar (GtkWindow *window, char *title){ gtk_header_bar_pack_start (GTK_HEADER_BAR (header_bar), GTK_WIDGET (btt_open_DATA)); - icons_for_fun (GTK_HEADER_BAR (header_bar)); // https://iconduck.com/sets/adwaita-icon-theme -// https://iconduck.com/sets/carbon-icons < pas mal ... -// https://thenounproject.com/icon/train-134324/ -// ma préférée : Transport Steam Engine Icon mais : [ process icon ] semble un bon choix... + icons_for_fun (GTK_HEADER_BAR (header_bar)); } void main_window_design (GtkWindow *main_window){ @@ -276,7 +271,7 @@ GtkWidget *get_window_child_RULES(){ } GtkWidget *get_window_child_DATA (){ - if (0) printf("widgets.get_window_child_DATA (line 259)\n"); + if (0) printf("widgets.get_window_child_DATA (line 279)\n"); GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 32)); GtkWidget* frame_rule_effect = gtk_frame_new ("rule effect\n-----------"); @@ -375,74 +370,3 @@ GtkWidget *get_window_child_DATA (){ return GTK_WIDGET (data_box); } -static void icons_for_fun (GtkHeaderBar *header_bar) -{ - GtkButton *go_home = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (go_home, "go-home-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (go_home)); - - GtkButton *user_trash = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (user_trash, "user-trash-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (user_trash)); - - GtkButton *help_biblio = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (help_biblio, "accessories-dictionary-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_biblio)); - - GtkButton *help_doc = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (help_doc, "emblem-documents-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_doc)); - - GtkButton *help_about = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (help_about, "help-about-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_about)); - - GtkButton *help_faq = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (help_faq, "help-faq-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_faq)); - - GtkButton *terminal = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (terminal, "utilities-terminal-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (terminal)); - - GtkButton *search = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (search, "folder-saved-search-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (search)); - - GtkButton *preferences_desktop_appearance = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (preferences_desktop_appearance, "preferences-desktop-appearance-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (preferences_desktop_appearance)); - - GtkButton *preferences_system = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (preferences_system, "preferences-system-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (preferences_system)); - - GtkButton *document_properties = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (document_properties, "document-properties-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (document_properties)); - - GtkButton *text_edit = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (text_edit, "text-editor-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (text_edit)); - - GtkButton *applications_utilities = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (applications_utilities, "applications-utilities-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (applications_utilities)); - - GtkButton *open_menu = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (open_menu, "open-menu-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (open_menu)); - - GtkButton *power_max = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (power_max, "power-profile-performance-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (power_max)); - - GtkButton *power_middle = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (power_middle, "power-profile-balanced-rtl-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (power_middle)); - - GtkButton *power_low = GTK_BUTTON (gtk_button_new ()); - gtk_button_set_icon_name (power_low, "power-profile-power-saver-symbolic"); - gtk_header_bar_pack_end (header_bar, GTK_WIDGET (power_low)); -} - diff --git a/src/widgets_lab.c b/src/widgets_lab.c index 32447ef..9dd9fcf 100644 --- a/src/widgets_lab.c +++ b/src/widgets_lab.c @@ -300,3 +300,122 @@ GtkWidget *get_rules_page_new(){ return GTK_WIDGET (H_tree_vs_selected); } + +char *get_space_run_edit_specif(){ + return "\n\ +\ +>>> Dans : [space_page - mode RUN] doivent être : ------------------------------------------------------\n\n\ +(1) les commandes de mouvement:\n\ + - run/stop, slow down/speed up, step by step, do/undo/redo\n\ + + le buffer [elapsed time] qui montre le temps de simulation écoulé\n\n\ +(2) les commandes qui modifient la perception de l'espace (la caméra)\n\ + - son orientation (X,Y,Z),\n\ + + l'orientation (X,Y,Z) de l'état dans l'espace (six possibilités),\n\ + + le zoom,\n\ + + les paramètres qui définissent la perspective (distances oeil/écran, écran/objet virtuel) \n\n\ +(3) les commandes qui modifient les apparences des objets et des situations d'intérêt\n\ + (+/- transparents, colorés, etc.)\n\n\ +(4) les commandes qui modifient l'apparence de l'espace (grilles, +/- surfaces, aspect des flèches, etc.)\n\n\ +\ +(0) NB >>> AUCUNE COMMANDE NE DOIT PERMETTRE D'ÉDITER L'ESPACE ! <<<\n\n\n\ +\ +>>> Dans : [space_page - mode EDIT] doivent être : ------------------------------------------------------\n\n\ +(1) les commandes qui modifient la perception de l'espace (la caméra)\n\ + - son orientation (X,Y,Z),\n\ + + l'orientation (X,Y,Z) de l'état dans l'espace (six possibilités),\n\ + + le zoom,\n\ + + les paramètres qui définissent la perspective (distances oeil/écran, écran/objet virtuel) \n\n\ +(2) les commandes qui modifient les apparences des objets et des situations d'intérêt\n\ + (+/- transparents, colorés, etc.)\n\n\ +(3) les commandes qui modifient l'apparence de l'espace (grilles, +/- surfaces, aspect des flèches, etc.)\n\n\ +(4) les commandes d'édition locales (drag and drop une flèche)\n\ + ('faire de la place' pour insérer)\n\ + (sélectionner pour déplacer ou enlever...)\n\ + NB ces commandes doivent être graphiques et/ou accessibles par raccourcis ou en ligne\n\n\ +(5) les commandes d'édition globales\n\ + (ex: introduire, retirer, transformer +/-aléatoirement (n) objets dans l'espace)\n\n\n\ + NB une action effectuée sur une zone d'intérêt devrait pouvoir être automatiquement appliquée\n\ + à d'autres zones d'intérêt identifiées comme similaires\n\n\ +\ +(0) NB >>> AUCUNE COMMANDE NE DOIT PERMETTRE D'EXÉCUTER UN RUN ! <<<\n\n\n\ +\ +>>> L'objectif est que l'utilisateur ait accès à une organsisation aussi ergonomique que possible -----\n\n\ + i.e : chaque utilisateur devrait disposer de 'préférences'\n\ + c'est-à-dire avoir la possiblité de faire des choix ergonomiques personnalisés.\n"; +} + + +void icons_for_fun (GtkHeaderBar *header_bar) // https://iconduck.com/sets/adwaita-icon-theme +// https://iconduck.com/sets/carbon-icons < pas mal ... +// https://thenounproject.com/icon/train-134324/ +// ma préférée : Transport Steam Engine Icon mais : [ process icon ] semble un bon choix... +{ + GtkButton *go_home = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (go_home, "go-home-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (go_home)); + + GtkButton *user_trash = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (user_trash, "user-trash-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (user_trash)); + + GtkButton *help_biblio = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (help_biblio, "accessories-dictionary-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_biblio)); + + GtkButton *help_doc = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (help_doc, "emblem-documents-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_doc)); + + GtkButton *help_about = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (help_about, "help-about-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_about)); + + GtkButton *help_faq = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (help_faq, "help-faq-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (help_faq)); + + GtkButton *terminal = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (terminal, "utilities-terminal-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (terminal)); + + GtkButton *search = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (search, "folder-saved-search-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (search)); + + GtkButton *preferences_desktop_appearance = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (preferences_desktop_appearance, "preferences-desktop-appearance-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (preferences_desktop_appearance)); + + GtkButton *preferences_system = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (preferences_system, "preferences-system-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (preferences_system)); + + GtkButton *document_properties = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (document_properties, "document-properties-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (document_properties)); + + GtkButton *text_edit = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (text_edit, "text-editor-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (text_edit)); + + GtkButton *applications_utilities = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (applications_utilities, "applications-utilities-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (applications_utilities)); + + GtkButton *open_menu = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (open_menu, "open-menu-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (open_menu)); + + GtkButton *power_max = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (power_max, "power-profile-performance-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (power_max)); + + GtkButton *power_middle = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (power_middle, "power-profile-balanced-rtl-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (power_middle)); + + GtkButton *power_low = GTK_BUTTON (gtk_button_new ()); + gtk_button_set_icon_name (power_low, "power-profile-power-saver-symbolic"); + gtk_header_bar_pack_end (header_bar, GTK_WIDGET (power_low)); +} +