diff --git a/include/widget.h b/include/widget.h index 1676dac..bc5996c 100644 --- a/include/widget.h +++ b/include/widget.h @@ -77,10 +77,10 @@ void widget_design_text_window (GtkWindow *main_window, GtkWindow *text_window // called in widget / topbar / dispatch.c / widget_design_main_window() // defined in topbar / left.c -const char *widget_get_btt_synth_label(); -const char *widget_get_btt_state_label(); -const char *widget_get_btt_rules_label(); -const char *widget_get_btt_data_label(); +const char *widget_get_btt_label_synth(); +const char *widget_get_btt_label_state(); +const char *widget_get_btt_label_rules(); +const char *widget_get_btt_label_data(); // called in widget / topbar / dispatch.c / widget_design_main_window() // defined in widget / topbar / left.c @@ -97,11 +97,11 @@ void window_design_topbar_right (GtkWidget *header_bar, GtkApplication *app); // - widget / data / dispatch.c // - widget / measure / dispatch.c -void *widget_get_synth_page(); // in : widget / synth / dispatch.c -void *widget_get_state_page(); // in : widget / state / dispatch.c -void *widget_get_data_page(); // in : widget / data / dispatch.c -void *widget_get_measure_page();// in : widget / measure / dispatch.c -void *widget_get_engine_page(); // in : fsm / engine / engine.c +void *widget_get_page_synth(); // in : widget / synth / dispatch.c +void *widget_get_page_state(); // in : widget / state / dispatch.c +void *widget_get_page_data(); // in : widget / data / dispatch.c +void *widget_get_page_measure();// in : widget / measure / dispatch.c +void *widget_get_page_engine(); // in : fsm / engine / engine.c /* The rules page consists of two half-pages in a GtkPaned widget : * - on the left, widgets for controlling or editing all the rules. @@ -178,8 +178,8 @@ void widget_state_XYZ_reset_all(); #define LIST_W 190 #define LIST_H 114 -void *widget_get_all_rules_left_pane(); -void *widget_get_selected_rule_right_pane(); +void *widget_get_pane_all_rules_left(); +void *widget_get_pane_selected_rule_right(); void *widget_get_geometry_algebra(); @@ -219,15 +219,15 @@ void *widget_get_selected_rule_before_after(); /******************************************************************************/ /* D A T A */ /******************************************************************************/ -// call: widget / results / dispatch / widget_get_data_page() +// call: widget / results / dispatch / widget_get_page_data() // def: widget / results / organize.c // display.c #define H_PARTITION_RESULTS 140 -void *widget_get_organize_results_box(); -void *widget_get_display_results_box(); -void *widget_get_time_results_box (); +void *widget_get_results_box_organize(); +void *widget_get_results_box_display(); +void *widget_get_results_box_time (); /******************************************************************************/ @@ -236,7 +236,7 @@ void *widget_get_time_results_box (); //struct slist {gchar *text; struct slist *child;}; struct TreeNode_t {gchar *text; struct TreeNode_t *child, *next;}; -struct TreeNode_t *widget_create_user_tree_node (const gchar* text); +struct TreeNode_t *widget_create_user_rules_tree_node (const gchar* text); void widget_add_child_node (struct TreeNode_t *parent, struct TreeNode_t *child); diff --git a/src/fsm/dispatch.c b/src/fsm/dispatch.c index 7ddfcc8..e79ba76 100644 --- a/src/fsm/dispatch.c +++ b/src/fsm/dispatch.c @@ -60,8 +60,8 @@ static journal gg_logs; void fsm_journal_publication_request() {fsm_journal_publish (gg_logs);} -// CRITICAL ERROR WARNING INFO MESSAGE DEBUG SPEW -// 0 1 2 3 4 5 6 +// CRITICAL ERROR WARNING INFO MESSAGE DEBUG SPEW +// 0 1 2 3 4 5 6 void fsm_journal_event (int severity, int source, const char *file_source, diff --git a/src/main.c b/src/main.c index ff3b9c8..4f35a9b 100644 --- a/src/main.c +++ b/src/main.c @@ -157,7 +157,7 @@ int main (int argc, char **argv) - +/* printf("voir à la fin de 'main: étude des limites de la fonction 'snprintf()'\n"); long num = 1234567891234567891; @@ -173,7 +173,7 @@ int main (int argc, char **argv) // The first int specifies the base of the number, // and the second int specifies the maximum number of characters to be converted. printf("strtol %ld > str %s\n", num, str); - +*/ diff --git a/src/signal.c b/src/signal.c index 24d13d9..47b8629 100644 --- a/src/signal.c +++ b/src/signal.c @@ -291,10 +291,10 @@ void on_toggle_state_rules_data (GtkWidget *toggled_button, gpointer widget_all_ concat ("[", toggled_button_name, "]", NULL)); int is_active = gtk_check_button_get_active (GTK_CHECK_BUTTON (toggled_button)); - if ( ! strcmp (toggled_button_name, widget_get_btt_synth_label())) fsm_set_state_rules_data (SYNTH); - if ( ! strcmp (toggled_button_name, widget_get_btt_state_label())) fsm_set_state_rules_data (STATE); - if ( ! strcmp (toggled_button_name, widget_get_btt_rules_label())) fsm_set_state_rules_data (RULES); - if ( ! strcmp (toggled_button_name, widget_get_btt_data_label())) fsm_set_state_rules_data (DATA); + if ( ! strcmp (toggled_button_name, widget_get_btt_label_synth())) fsm_set_state_rules_data (SYNTH); + if ( ! strcmp (toggled_button_name, widget_get_btt_label_state())) fsm_set_state_rules_data (STATE); + if ( ! strcmp (toggled_button_name, widget_get_btt_label_rules())) fsm_set_state_rules_data (RULES); + if ( ! strcmp (toggled_button_name, widget_get_btt_label_data())) fsm_set_state_rules_data (DATA); if (is_active) switch_state_rules_data(); } @@ -308,12 +308,12 @@ static void switch_state_rules_data() case (SYNTH) : gtk_window_set_child (GTK_WINDOW (widget_get_main_window ()), - GTK_WIDGET (widget_get_synth_page())); + GTK_WIDGET (widget_get_page_synth())); break; case (STATE) : gtk_window_set_child (GTK_WINDOW (widget_get_main_window ()), - GTK_WIDGET (widget_get_state_page())); + GTK_WIDGET (widget_get_page_state())); break; case (RULES) : @@ -329,9 +329,9 @@ static void switch_state_rules_data() GtkPaned *widget_all_vs_selected_one = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_HORIZONTAL)); gtk_paned_set_start_child (widget_all_vs_selected_one, - GTK_WIDGET (widget_get_all_rules_left_pane())); + GTK_WIDGET (widget_get_pane_all_rules_left())); gtk_paned_set_end_child (widget_all_vs_selected_one, - GTK_WIDGET (widget_get_selected_rule_right_pane())); + GTK_WIDGET (widget_get_pane_selected_rule_right())); gtk_paned_set_position (widget_all_vs_selected_one, ALL_VS_SELECTED); gtk_paned_set_wide_handle (widget_all_vs_selected_one, TRUE); @@ -344,7 +344,7 @@ static void switch_state_rules_data() case (DATA) : gtk_window_set_child (GTK_WINDOW (widget_get_main_window ()), - GTK_WIDGET (widget_get_data_page())); + GTK_WIDGET (widget_get_page_data())); break; default : @@ -433,7 +433,7 @@ void on_topbar_right_measure_clicked (GtkWidget *btt, gpointer button_icon_name) // ! WARNING ! ce qui suit n'est qu'une maquette: (... delenda est !) // la 'logique' qui va des mesures aux résultats doit changer de forme TODO gtk_window_set_child (GTK_WINDOW (widget_get_main_window ()), - GTK_WIDGET (widget_get_measure_page())); + GTK_WIDGET (widget_get_page_measure())); } void on_start_new_measure (GtkWidget *btt, gpointer btt_label) @@ -496,7 +496,7 @@ void on_closing_page (GtkWidget *btt, gpointer data) { fsm_journal_event (DEBUG, BUTTON, "signal", "closing page()", ""); gtk_window_set_child (GTK_WINDOW (widget_get_main_window ()), - GTK_WIDGET (widget_get_synth_page())); + GTK_WIDGET (widget_get_page_synth())); } void on_measure_single_event_occurences_nb (GtkWidget *btt, gpointer data) diff --git a/src/util/tree.c b/src/util/tree.c index f23727c..2cdb2f3 100644 --- a/src/util/tree.c +++ b/src/util/tree.c @@ -38,7 +38,7 @@ void widget_add_child_node (struct TreeNode_t *parent, struct TreeNode_t *child) } else parent->child = child; } -struct TreeNode_t *widget_create_user_tree_node (const gchar* text) +struct TreeNode_t *widget_create_user_rules_tree_node (const gchar* text) { struct TreeNode_t *node = g_malloc0 (sizeof(struct TreeNode_t)); node->text = g_strdup (text); @@ -90,7 +90,7 @@ void *widget_get_user_rules_tree () fsm_journal_event (DEBUG, RULES_TREE, "util/tree", "get_user_rules_tree()", "[We, the people,] <-- a tree node sample (root)"); - struct TreeNode_t *tree_root = widget_create_user_tree_node("We, the people,"); + struct TreeNode_t *tree_root = widget_create_user_rules_tree_node("We, the people,"); widget_let_us_create_a_complex_useless_and_expensive_tree (tree_root); GtkStringList *model = gtk_string_list_new(NULL); diff --git a/src/widget/all_rules/dispatch.c b/src/widget/all_rules/dispatch.c index 85a9dba..e0c09c8 100644 --- a/src/widget/all_rules/dispatch.c +++ b/src/widget/all_rules/dispatch.c @@ -57,7 +57,7 @@ -void *widget_get_all_rules_left_pane () +void *widget_get_pane_all_rules_left () { fsm_journal_event (INFO, TOPBAR_LEFT, "widget/all_rules/", "all_rules_left_pane design", "pilot box + tree tools "); diff --git a/src/widget/all_rules/tree/labo.c b/src/widget/all_rules/tree/labo.c index c31af8c..94989b7 100644 --- a/src/widget/all_rules/tree/labo.c +++ b/src/widget/all_rules/tree/labo.c @@ -71,60 +71,60 @@ void widget_let_us_create_a_complex_useless_and_expensive_tree (struct TreeNode_t *tree_root) { - struct TreeNode_t *a = widget_create_user_tree_node("aware of"); widget_add_child_node(tree_root, a); - struct TreeNode_t *b = widget_create_user_tree_node("eager to"); widget_add_child_node(tree_root, b); - struct TreeNode_t *c = widget_create_user_tree_node("decide"); widget_add_child_node(tree_root, c); - struct TreeNode_t *aaa = widget_create_user_tree_node("our rights"); widget_add_child_node(a, aaa); - struct TreeNode_t *aab = widget_create_user_tree_node("our duties"); widget_add_child_node(a, aab); + struct TreeNode_t *a = widget_create_user_rules_tree_node("aware of"); widget_add_child_node(tree_root, a); + struct TreeNode_t *b = widget_create_user_rules_tree_node("eager to"); widget_add_child_node(tree_root, b); + struct TreeNode_t *c = widget_create_user_rules_tree_node("decide"); widget_add_child_node(tree_root, c); + struct TreeNode_t *aaa = widget_create_user_rules_tree_node("our rights"); widget_add_child_node(a, aaa); + struct TreeNode_t *aab = widget_create_user_rules_tree_node("our duties"); widget_add_child_node(a, aab); - struct TreeNode_t *aaa0 = widget_create_user_tree_node("speak"); widget_add_child_node(aaa, aaa0); - struct TreeNode_t *aaa1 = widget_create_user_tree_node("question"); widget_add_child_node(aaa, aaa1); - struct TreeNode_t *aaa2 = widget_create_user_tree_node("learn"); widget_add_child_node(aaa, aaa2); - struct TreeNode_t *aaaa = widget_create_user_tree_node("read"); widget_add_child_node(aaa, aaaa); - struct TreeNode_t *aaab = widget_create_user_tree_node("write"); widget_add_child_node(aaa, aaab); - struct TreeNode_t *aaac = widget_create_user_tree_node("compute"); widget_add_child_node(aaa, aaac); - struct TreeNode_t *aaad = widget_create_user_tree_node("code"); widget_add_child_node(aaa, aaad); - struct TreeNode_t *aaag = widget_create_user_tree_node("imagine"); widget_add_child_node(aaad, aaag); - struct TreeNode_t *aaah = widget_create_user_tree_node("combine"); widget_add_child_node(aaad, aaah); - struct TreeNode_t *aaai = widget_create_user_tree_node("invent"); widget_add_child_node(aaad, aaai); - struct TreeNode_t *aaaj = widget_create_user_tree_node("create"); widget_add_child_node(aaad, aaaj); - struct TreeNode_t *aaak = widget_create_user_tree_node("enjoy !"); widget_add_child_node(aaad, aaak); -// struct TreeNode_t *aaae = widget_create_user_tree_node("interact"); widget_add_child_node(aaa, aaae); + struct TreeNode_t *aaa0 = widget_create_user_rules_tree_node("speak"); widget_add_child_node(aaa, aaa0); + struct TreeNode_t *aaa1 = widget_create_user_rules_tree_node("question"); widget_add_child_node(aaa, aaa1); + struct TreeNode_t *aaa2 = widget_create_user_rules_tree_node("learn"); widget_add_child_node(aaa, aaa2); + struct TreeNode_t *aaaa = widget_create_user_rules_tree_node("read"); widget_add_child_node(aaa, aaaa); + struct TreeNode_t *aaab = widget_create_user_rules_tree_node("write"); widget_add_child_node(aaa, aaab); + struct TreeNode_t *aaac = widget_create_user_rules_tree_node("compute"); widget_add_child_node(aaa, aaac); + struct TreeNode_t *aaad = widget_create_user_rules_tree_node("code"); widget_add_child_node(aaa, aaad); + struct TreeNode_t *aaag = widget_create_user_rules_tree_node("imagine"); widget_add_child_node(aaad, aaag); + struct TreeNode_t *aaah = widget_create_user_rules_tree_node("combine"); widget_add_child_node(aaad, aaah); + struct TreeNode_t *aaai = widget_create_user_rules_tree_node("invent"); widget_add_child_node(aaad, aaai); + struct TreeNode_t *aaaj = widget_create_user_rules_tree_node("create"); widget_add_child_node(aaad, aaaj); + struct TreeNode_t *aaak = widget_create_user_rules_tree_node("enjoy !"); widget_add_child_node(aaad, aaak); +// struct TreeNode_t *aaae = widget_create_user_rules_tree_node("interact"); widget_add_child_node(aaa, aaae); - struct TreeNode_t *aaaco = widget_create_user_tree_node("copy"); widget_add_child_node(aaaa, aaaco); + struct TreeNode_t *aaaco = widget_create_user_rules_tree_node("copy"); widget_add_child_node(aaaa, aaaco); - struct TreeNode_t *aaae = widget_create_user_tree_node("edit"); widget_add_child_node(aaab, aaae); - struct TreeNode_t *aaaf = widget_create_user_tree_node("publish"); widget_add_child_node(aaab, aaaf); -// struct TreeNode_t *aaada = widget_create_user_tree_node("manifest"); widget_add_child_node(aaad, aaada); + struct TreeNode_t *aaae = widget_create_user_rules_tree_node("edit"); widget_add_child_node(aaab, aaae); + struct TreeNode_t *aaaf = widget_create_user_rules_tree_node("publish"); widget_add_child_node(aaab, aaaf); +// struct TreeNode_t *aaada = widget_create_user_rules_tree_node("manifest"); widget_add_child_node(aaad, aaada); - struct TreeNode_t *aaba = widget_create_user_tree_node("learn"); widget_add_child_node(aab, aaba); + struct TreeNode_t *aaba = widget_create_user_rules_tree_node("learn"); widget_add_child_node(aab, aaba); - struct TreeNode_t *aabl = widget_create_user_tree_node("access"); widget_add_child_node(aaac, aabl); - struct TreeNode_t *aabm = widget_create_user_tree_node("free"); widget_add_child_node(aaac, aabm); - struct TreeNode_t *aabn = widget_create_user_tree_node("tools"); widget_add_child_node(aaac, aabn); + struct TreeNode_t *aabl = widget_create_user_rules_tree_node("access"); widget_add_child_node(aaac, aabl); + struct TreeNode_t *aabm = widget_create_user_rules_tree_node("free"); widget_add_child_node(aaac, aabm); + struct TreeNode_t *aabn = widget_create_user_rules_tree_node("tools"); widget_add_child_node(aaac, aabn); - struct TreeNode_t *aabb = widget_create_user_tree_node("share"); widget_add_child_node(aab, aabb); - struct TreeNode_t *aabc = widget_create_user_tree_node("help"); widget_add_child_node(aab, aabc); + struct TreeNode_t *aabb = widget_create_user_rules_tree_node("share"); widget_add_child_node(aab, aabb); + struct TreeNode_t *aabc = widget_create_user_rules_tree_node("help"); widget_add_child_node(aab, aabc); - struct TreeNode_t *ba = widget_create_user_tree_node("promote"); widget_add_child_node(b, ba); - struct TreeNode_t *bb = widget_create_user_tree_node("individual"); widget_add_child_node(b, bb); - struct TreeNode_t *bc = widget_create_user_tree_node("and common"); widget_add_child_node(b, bc); - struct TreeNode_t *bd = widget_create_user_tree_node("well-being"); widget_add_child_node(b, bd); - struct TreeNode_t *bca = widget_create_user_tree_node("education"); widget_add_child_node(bc, bca); - struct TreeNode_t *bcb = widget_create_user_tree_node("mutual"); widget_add_child_node(bc, bcb); - struct TreeNode_t *bcc = widget_create_user_tree_node("support"); widget_add_child_node(bc, bcc); - struct TreeNode_t *bcd = widget_create_user_tree_node("health"); widget_add_child_node(bc, bcd); - struct TreeNode_t *bcda = widget_create_user_tree_node("mental"); widget_add_child_node(bcd, bcda); - struct TreeNode_t *bcdb = widget_create_user_tree_node("physical"); widget_add_child_node(bcd, bcdb); - struct TreeNode_t *ca = widget_create_user_tree_node("free"); widget_add_child_node(c, ca); - struct TreeNode_t *cb = widget_create_user_tree_node("code"); widget_add_child_node(c, cb); - struct TreeNode_t *cc = widget_create_user_tree_node("access"); widget_add_child_node(c, cc); + struct TreeNode_t *ba = widget_create_user_rules_tree_node("promote"); widget_add_child_node(b, ba); + struct TreeNode_t *bb = widget_create_user_rules_tree_node("individual"); widget_add_child_node(b, bb); + struct TreeNode_t *bc = widget_create_user_rules_tree_node("and common"); widget_add_child_node(b, bc); + struct TreeNode_t *bd = widget_create_user_rules_tree_node("well-being"); widget_add_child_node(b, bd); + struct TreeNode_t *bca = widget_create_user_rules_tree_node("education"); widget_add_child_node(bc, bca); + struct TreeNode_t *bcb = widget_create_user_rules_tree_node("mutual"); widget_add_child_node(bc, bcb); + struct TreeNode_t *bcc = widget_create_user_rules_tree_node("support"); widget_add_child_node(bc, bcc); + struct TreeNode_t *bcd = widget_create_user_rules_tree_node("health"); widget_add_child_node(bc, bcd); + struct TreeNode_t *bcda = widget_create_user_rules_tree_node("mental"); widget_add_child_node(bcd, bcda); + struct TreeNode_t *bcdb = widget_create_user_rules_tree_node("physical"); widget_add_child_node(bcd, bcdb); + struct TreeNode_t *ca = widget_create_user_rules_tree_node("free"); widget_add_child_node(c, ca); + struct TreeNode_t *cb = widget_create_user_rules_tree_node("code"); widget_add_child_node(c, cb); + struct TreeNode_t *cc = widget_create_user_rules_tree_node("access"); widget_add_child_node(c, cc); - struct TreeNode_t *cca = widget_create_user_tree_node("tiens ?"); widget_add_child_node(cc, cca); - struct TreeNode_t *ccb = widget_create_user_tree_node("y a comme"); widget_add_child_node(cc, ccb); - struct TreeNode_t *ccc = widget_create_user_tree_node("un bug..."); widget_add_child_node(cc, ccc); - struct TreeNode_t *ccd = widget_create_user_tree_node("imprévu"); widget_add_child_node(cc, ccd); - struct TreeNode_t *cce = widget_create_user_tree_node("ici ( ;- )"); widget_add_child_node(cc, cce); + struct TreeNode_t *cca = widget_create_user_rules_tree_node("tiens ?"); widget_add_child_node(cc, cca); + struct TreeNode_t *ccb = widget_create_user_rules_tree_node("y a comme"); widget_add_child_node(cc, ccb); + struct TreeNode_t *ccc = widget_create_user_rules_tree_node("un bug..."); widget_add_child_node(cc, ccc); + struct TreeNode_t *ccd = widget_create_user_rules_tree_node("imprévu"); widget_add_child_node(cc, ccd); + struct TreeNode_t *cce = widget_create_user_rules_tree_node("ici ( ;- )"); widget_add_child_node(cc, cce); } // TODO bug in this tree diff --git a/src/widget/measure/dispatch.c b/src/widget/measure/dispatch.c index ad4aa10..4f49ea9 100644 --- a/src/widget/measure/dispatch.c +++ b/src/widget/measure/dispatch.c @@ -292,7 +292,7 @@ void *widget_measure_do_select_rules_first () return measure_page; } -void *widget_get_measure_page() +void *widget_get_page_measure() { measure_page = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); edit_a_new_measure_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); diff --git a/src/widget/one_rule/dispatch.c b/src/widget/one_rule/dispatch.c index 0663df8..55eaf32 100644 --- a/src/widget/one_rule/dispatch.c +++ b/src/widget/one_rule/dispatch.c @@ -41,7 +41,7 @@ void *widget_get_selected_rule() return GTK_WIDGET (one_rule); } -void *widget_get_selected_rule_right_pane() // < called in signal switch_state_rules_data() +void *widget_get_pane_selected_rule_right() // < called in signal switch_state_rules_data() // + on_toggle_state_rules_data() { GtkPaned *rule_itself_vs_explore_edit_pane = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_VERTICAL)); diff --git a/src/widget/results/dispatch.c b/src/widget/results/dispatch.c index 9233c4c..f62269c 100644 --- a/src/widget/results/dispatch.c +++ b/src/widget/results/dispatch.c @@ -33,11 +33,11 @@ -void *widget_get_data_page() +void *widget_get_page_data() { GtkWidget *measures_and_results = gtk_paned_new (GTK_ORIENTATION_VERTICAL); - gtk_paned_set_start_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_organize_results_box())); - gtk_paned_set_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_display_results_box())); + gtk_paned_set_start_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_results_box_organize())); + gtk_paned_set_end_child (GTK_PANED(measures_and_results), GTK_WIDGET (widget_get_results_box_display())); gtk_paned_set_position (GTK_PANED (measures_and_results), H_PARTITION_RESULTS); gtk_paned_set_shrink_start_child (GTK_PANED (measures_and_results), FALSE); gtk_paned_set_shrink_end_child (GTK_PANED (measures_and_results), FALSE); diff --git a/src/widget/results/display.c b/src/widget/results/display.c index c817eb4..bd22ef1 100644 --- a/src/widget/results/display.c +++ b/src/widget/results/display.c @@ -28,7 +28,7 @@ #include "../../../include/signal.h" #include "../../../include/widget.h" -void *widget_get_time_results_box () { +void *widget_get_results_box_time () { GtkBox *time_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); gtk_box_append (time_box, GTK_WIDGET (gtk_button_new_with_label ("\n a widget\n\ intended to\n modulate\n the look of\n the various\n represented\n flows\n"))); @@ -42,7 +42,7 @@ void *widget_get_time_results_box () { return GTK_WIDGET (time_box); } -void *widget_get_display_results_box () { +void *widget_get_results_box_display () { GtkBox *data_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); gtk_box_append (data_box, gtk_button_new_with_label ("repartitions (1D, 2D)")); @@ -59,7 +59,7 @@ void *widget_get_display_results_box () { a scroll bar allowing to detail the data along the time elapsed during the simulation"))); gtk_box_append (scroll_bar_box, GTK_WIDGET (gtk_progress_bar_new ())); GtkAdjustment *adjust = gtk_adjustment_new (30, 0, 100, 1, 0, 0); - gtk_box_append (data_box, GTK_WIDGET (widget_get_time_results_box ())); + gtk_box_append (data_box, GTK_WIDGET (widget_get_results_box_time ())); // https://gitlab.gnome.org/GNOME/gnome-system-monitor/-/blob/master/src/load-graph.cpp?ref_type=heads gtk_box_append (scroll_bar_box, GTK_WIDGET (gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, adjust))); diff --git a/src/widget/results/organize.c b/src/widget/results/organize.c index e802b62..799c455 100644 --- a/src/widget/results/organize.c +++ b/src/widget/results/organize.c @@ -29,7 +29,7 @@ #include "../../../include/signal.h" #include "../../../include/widget.h" -void *widget_get_organize_results_box () +void *widget_get_results_box_organize () { GtkBox *all_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); GtkBox *ad_hoc_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); diff --git a/src/widget/state/dispatch.c b/src/widget/state/dispatch.c index 7fa0883..e51224f 100644 --- a/src/widget/state/dispatch.c +++ b/src/widget/state/dispatch.c @@ -49,7 +49,7 @@ /******************************************************************************/ -void *widget_get_state_page() +void *widget_get_page_state() { GtkBox *page_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); gtk_box_append (page_box, GTK_WIDGET (widget_get_graph_view_control())); diff --git a/src/widget/synth/dispatch.c b/src/widget/synth/dispatch.c index 47db129..f520afd 100644 --- a/src/widget/synth/dispatch.c +++ b/src/widget/synth/dispatch.c @@ -58,7 +58,7 @@ static void *widget_get_space_vs_non_time_dependent_analysis() return space_vs_non_time_dependent_analysis; } -void *widget_get_synth_page() +void *widget_get_page_synth() { GtkWidget *space_and_analysis_vs_history = gtk_paned_new (GTK_ORIENTATION_VERTICAL); gtk_paned_set_start_child (GTK_PANED (space_and_analysis_vs_history), diff --git a/src/widget/synth/time.c b/src/widget/synth/time.c index fa188dc..a663df8 100644 --- a/src/widget/synth/time.c +++ b/src/widget/synth/time.c @@ -32,7 +32,7 @@ void *widget_get_time_dependent_results_and_time_controls() { GtkBox *time_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_VERTICAL, 2)); gtk_box_append (time_box, GTK_WIDGET(widget_get_sequence_control())); - gtk_box_append (time_box, GTK_WIDGET (widget_get_time_results_box ())); + gtk_box_append (time_box, GTK_WIDGET (widget_get_results_box_time ())); return time_box; } diff --git a/src/widget/topbar/left.c b/src/widget/topbar/left.c index a8ca27a..e2c7e48 100644 --- a/src/widget/topbar/left.c +++ b/src/widget/topbar/left.c @@ -39,10 +39,10 @@ static GtkButton *btt_SYNTH, *btt_STATE, *btt_RULES, *btt_DATA; // ! WARNING ! LE LABEL D'UN BOUTON NE DOIT ÊTRE DÉFINI QU'UNE FOIS (ICI) ET // EN UTILISANT LA FONCTION: widget_get_btt__label() -const char *widget_get_btt_synth_label () {return "synth";} -const char *widget_get_btt_state_label () {return "state";} -const char *widget_get_btt_rules_label () {return "rules";} -const char *widget_get_btt_data_label () {return "results";} +const char *widget_get_btt_label_synth () {return "synth";} +const char *widget_get_btt_label_state () {return "state";} +const char *widget_get_btt_label_rules () {return "rules";} +const char *widget_get_btt_label_data () {return "results";} /* The rules page consists of two half-pages in a GtkPaned widget : @@ -81,22 +81,22 @@ void window_design_topbar_left (GtkWidget *header_bar) GtkCheckButton *group_state_rules_data = GTK_CHECK_BUTTON (gtk_check_button_new ()); - btt_SYNTH = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_synth_label())); + btt_SYNTH = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_label_synth())); g_signal_connect (btt_SYNTH, "toggled", G_CALLBACK (on_toggle_state_rules_data), no_local_data); gtk_check_button_set_group (GTK_CHECK_BUTTON (btt_SYNTH), group_state_rules_data); - btt_STATE = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_state_label())); + btt_STATE = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_label_state())); g_signal_connect (btt_STATE, "toggled", G_CALLBACK (on_toggle_state_rules_data), no_local_data); gtk_check_button_set_group (GTK_CHECK_BUTTON (btt_STATE), group_state_rules_data); // see signal switch_state_rules_data() // case (RULES): GtkPaned *widget_all_vs_selected_one = ... // and the full comment above. - btt_RULES = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_rules_label())); + btt_RULES = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_label_rules())); g_signal_connect (btt_RULES, "toggled", G_CALLBACK (on_toggle_state_rules_data), no_local_data); gtk_check_button_set_group (GTK_CHECK_BUTTON (btt_RULES), group_state_rules_data); - btt_DATA = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_data_label())); + btt_DATA = GTK_BUTTON (gtk_check_button_new_with_label (widget_get_btt_label_data())); g_signal_connect (btt_DATA, "toggled", G_CALLBACK (on_toggle_state_rules_data), no_local_data); gtk_check_button_set_group (GTK_CHECK_BUTTON (btt_DATA), group_state_rules_data);