diff --git a/alphabetic_index.all b/alphabetic_index.all
index 5aacf07..9fe61e4 100644
--- a/alphabetic_index.all
+++ b/alphabetic_index.all
@@ -21,6 +21,32 @@
* along with this program. If not, see . *
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+concat util/strings_op
+create_axis_slider util/draw/gl (util.h 148)
+graphics_create_shader 187
+graphics_draw 107
+graphics_draw_color 159 333
+graphics_draw_grids_on_space_faces_lines 395
+graphics_draw_grids_on_space_faces_vertex 390
+graphics_draw_line 168 342
+graphics_draw_one_arrow_line 365
+graphics_draw_one_arrow_vertex 355
+graphics_draw_plan 177 351
+graphics_draw_space_ridges_lines 381
+graphics_draw_space_ridges_vertex 375
+graphics_draw_vertex 146
+graphics_init 98 276
+graphics_init_buffers 136 320
+graphics_init_graphics_stack 127
+graphics_init_shaders 125 303
+graphics_model_setup 353
+graphics_print_stack 221
+graphics_render_stack 87
+graphics_set_arrow 401
+graphics_setup_glarea 89
+graphics_shutdown 116 294
+graphics_shutdown_graphics_stack 128
+graphics_update_axis_stack 129
fsm_add_data fsm/measures/data_list
fsm_add_displayable fsm/preferences/manager
fsm_add_measure fsm/measures/manager
@@ -65,31 +91,116 @@ fsm_set_exec_edit fsm/dispatch
fsm_set_preferences_modified fsm/dispatch
fsm_set_state_rules_data fsm/dispatch
fsm_set_store_restore_reset fsm/dispatch
+on_setup_user_tree_factory 96
fsm_struct_journal fsm.h
fsm_struct_journal_unit fsm.h
fsm_struct_list_data fsm.h
fsm_struct_list_disp fsm.h
fsm_struct_list_tool fsm.h
+on_axis_value_change 111
+on_bind_user_tree_factory 98
+on_clicked_topbar_right_home 130 < to rename
+on_clicked_topbar_right_search 131 < to rename
+on_discard_current_model_before_editing 86
+on_entry_name_delete_after 168
+on_entry_name_insert_after 167
+on_glarea_realize 108
+on_glarea_render 107
+on_glarea_unrealize 109
+on_measure_ ... 141 sqq.
+on_resetting_XYZ_in_state_page 122
+on_select_rules_first 142
+on_save_current_model_before_editing 85
+on_situations_box_do_reset 120
+on_toggle_exec_edit 75 < to rename
+on_toggle_state_rules_data 76 < to rename
+on_topbar_right_measure_clicked 132
+on_updating_objects_transparencies 119
+on_windows_activation 53
+on_windows_startup 54
+on_write_current_model 87
+parse_model_get_dim 32
+parse_model_get_dim_value 33
+parse_model_get_multiplicity 34
+parse_model_get_next_arrow 36
+parse_model_get_next_state 35
+parse_model_get_state_arrows_count 40
+parse_model_init 29
+parse_model_shutdown 30
+TreeNode_t widget.h (rename ?)
+util_gl_clean_stack_index 112
+util_gl_get_stack 83
+util_gl_init_stack 101
+util_gl_is_util_ready 92
+util_gl_render_stack 121
+util_gl_setup_glarea 158
+util_gl_shutdown_all_stacks 139
+util_gl_shutdown_stack 110
+util_gl_update_axis 130
+util_read_file 32
+widget_add_tree_child_node util/tree
+widget_create_user_rules_tree_node 242
widget_design_dialog_window widget/dispatch
widget_design_main_window widget/dispatch
widget_design_text_window widget/dispatch
-window_design_topbar_left widget/dispatch
-window_design_topbar_right widget/dispatch
+widget_measure_do_select_rules_first widget/measure/dispatch
+widget_measure_do_ ... 295 sqq.
+widget_measure_event_occurences_dates 307
+widget_measure_event_occurences_nb 306
+widget_measure_event_occurences_situations 308
+widget_measure_other_events_between_the_two 310
+widget_measure_time_elapsed_between_two_events 309
+widget_get_address_text_theory widget/topbar/dispatch
+widget_get_address_text_practice widget/topbar/dispatch
widget_get_btt_label_data widget/dispatch
widget_get_btt_label_rules widget/dispatch
widget_get_btt_label_state widget/dispatch
widget_get_btt_label_synth widget/dispatch
widget_get_dialog_window widget/dispatch
+widget_get_graph_view_control widget/state/middle
widget_get_main_window widget/dispatch
widget_get_non_time_dependent widget/synth/dispatch
+widget_get_object_transparency 159
widget_get_page_data widget/dispatch
widget_get_page_engine widget/dispatch
widget_get_page_measure widget/dispatch
widget_get_page_state widget/dispatch
widget_get_page_synth widget/synth/dispatch
+widget_get_pane_all_rules_left 184
+widget_get_pane_selected_rule_right 185
+widget_get_results_box_display 232
+widget_get_results_box_organize 231
+widget_get_results_box_time 233
+widget_get_rule_edition_tools widget/one_rule/geometry/edit
+widget_get_rule_investigation_tools widget/one_rule/geometry/investigate
+widget_get_rule_geometry_and_algebra 187 (not used))
+widget_get_rules_pilot_box 193
+widget_get_rules_tree_tools 194
+widget_get_rules_use 195
+widget_get_selected_rule 203
+widget_get_selected_rule_algebra 211
+widget_get_selected_rule_assignations_list_btt widget/one_rule/algebra/assignations
+widget_get_selected_rule_before_after 220
+widget_get_selected_rule_camera 219
+widget_get_selected_rule_conditions_list_btt widget/one_rule/algebra/conditions
+widget_get_selected_rule_geometry 212
+widget_get_selected_rule_identity_btt widget/one_rule/algebra/identity
+widget_get_sequence_control 150
+widget_get_space_edit_control 149
+widget_get_space_view widget/state/middle
widget_get_space_vs_non_time_dependent widget/synth/dispatch
+widget_get_text_from_address 257
widget_get_text_window widget/dispatch
widget_get_time_dependent widget/synth/time
+widget_get_user_rules_tree 246
+widget_reset_XYZ_scrollbars_rule 166
+widget_reset_XYZ_scrollbars_state 167
+widget_reset_XYZ_scrollbars_synth 168
+widget_set_item_text 218
+widget_set_objects_value widget/state/top
+widget_set_situations_value widget/state/top
+window_design_topbar_left widget/dispatch
+window_design_topbar_right widget/dispatch
diff --git a/include/signal.h b/include/signal.h
index 5ad03e7..ea67a0f 100644
--- a/include/signal.h
+++ b/include/signal.h
@@ -69,7 +69,8 @@ void on_windows_startup (GtkApplication *app);
/* F I N I T E S T A T E M A C H I N E (fsm) */
/******************************************************************************/
-/* { EXEC xor EDIT } and { STATE xor RULES xor DATA } are states of the fsm */
+/* { EXEC xor EDIT } and { SYNTH xor STATE xor RULES xor DATA }
+ * are states of the fsm */
void on_toggle_exec_edit (GtkWidget *btt_XOR_EXEC_EDIT, gpointer user_data);
void on_toggle_state_rules_data (GtkWidget *btt_STATE_RULES_DATA, gpointer user_data);
diff --git a/include/widget.h b/include/widget.h
index 473b879..40282ed 100644
--- a/include/widget.h
+++ b/include/widget.h
@@ -154,15 +154,18 @@ void *widget_get_sequence_control(); // bottom
// call: prefer.c
// def: widget / state / top.c
-void widget_reset_all_situations_transparencies_at_value (int value); // top
-void widget_set_object_transparency_at_value (int rank, int value); // top
-int widget_get_object_transparency (int i); // top
+void widget_set_situations_value (int value); // top
+void widget_set_objects_value (int rank, int value); // top
+int widget_get_object_transparency (int i); // top
// call: signal.c
// def: widget / state / middle
void widget_state_XYZ_reset_all();
+void widget_reset_XYZ_scrollbars_rule();
+void widget_reset_XYZ_scrollbars_state();
+void widget_reset_XYZ_scrollbars_synth();
/******************************************************************************/
@@ -181,7 +184,7 @@ void widget_state_XYZ_reset_all();
void *widget_get_pane_all_rules_left();
void *widget_get_pane_selected_rule_right();
-void *widget_get_geometry_algebra();
+//void *widget_get_rule_geometry_and_algebra();
// call: widget / rules / tree_tools / dispatch.c / widget_get_all_rules_left_pane()
// def: widget / rules / tree_tools / pilot_box.c
@@ -198,8 +201,8 @@ void *widget_get_rules_use(); // freq.c
// def: widget / rules / selected / enquire.c
void *widget_get_selected_rule(); // dispatch.c
-void *widget_get_rule_edit(); // edit.c
-void *widget_get_rule_enquire(); // enquire.c
+void *widget_get_rule_edition_tools(); // one_rule/geometry/edit_tools
+void *widget_get_rule_investigation_tools(); // one_rule/geometry/investigate
// call: widget / rules / selected / dispatch.c / widget_get_selected_rule()
// def: widget / rules / selected / text.c
@@ -207,9 +210,9 @@ void *widget_get_rule_enquire(); // enquire.c
void *widget_get_selected_rule_algebra();
void *widget_get_selected_rule_geometry();
-void *widget_get_btt_conditions_list();
-void *widget_get_btt_assignations_list();
-void *widget_get_btt_rule_identity();
+void *widget_get_selected_rule_conditions_list_btt();
+void *widget_get_selected_rule_assignations_list_btt();
+void *widget_get_selected_rule_identity_btt();
// def: widget / rules / selected / wip_menu.c
GtkEntry widget_set_item_text (GtkWidget *list_box, const char *text, bool editable);
@@ -238,7 +241,7 @@ void *widget_get_results_box_time ();
struct TreeNode_t {gchar *text; struct TreeNode_t *child, *next;};
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);
+void widget_add_tree_child_node (struct TreeNode_t *parent, struct TreeNode_t *child); // def: util/tree
void *widget_get_user_rules_tree ();
// def: widget/rules/tree_tools/labo.c
@@ -253,8 +256,10 @@ void *widget_get_user_rules_tree ();
void *widget_get_text_from_address (gchar *text_name);
-char *widget_get_text_address_theory ();
-char *widget_get_text_address_practice ();
+char *widget_get_address_text_theory ();
+char *widget_get_address_text_practice ();
+char *widget_get_address_text_alpha_index (); // def: widget/topbar/dispatch
+ // call widget/topbar/modal (47))
/******************************************************************************/
diff --git a/src/fsm/preferences/manager.c b/src/fsm/preferences/manager.c
index 2bb19ed..6c1305a 100644
--- a/src/fsm/preferences/manager.c
+++ b/src/fsm/preferences/manager.c
@@ -76,18 +76,18 @@ void fsm_set_store_restore_reset (int choice, int value)
fsm_journal_event (MESSAGE, PREFER, "fsm/prefer", "store restore reset(): switch (STORE)", "");
for (int i = 0; i < n_objects; i++) {
p [i] = widget_get_object_transparency (i);
- widget_set_object_transparency_at_value (i, p [i]);
+ widget_set_objects_value (i, p [i]);
}
break;
case (RESTORE) :
fsm_journal_event (MESSAGE, PREFER, "fsm/prefer", "store restore reset(): switch (RESTORE)", "");
for (int i = 0; i < n_objects; i++)
- widget_set_object_transparency_at_value (i, p [i]);
+ widget_set_objects_value (i, p [i]);
break;
case (RESET) :
fsm_journal_event (MESSAGE, PREFER, "fsm/prefer", "store restore reset(): switch (RESET)", "");
for (int i = 0; i < n_objects; i++)
- widget_set_object_transparency_at_value (i, value); // i * 4 // rand() % 127
+ widget_set_objects_value (i, value); // i * 4 // rand() % 127
break;
default :
fsm_journal_event (MESSAGE, PREFER, "fsm/prefer", "store restore reset(): switch (default)", "");
@@ -109,7 +109,7 @@ void fsm_reset_all_situations_values (int value)
printf("fsm/preferences/manager fsm_reset_all_situations_values() %d\n", value);
fsm_journal_event (INFO, PREFER, "fsm/preferences/manager", "reset all situations transparencies at value() ", "TODO value > string_value");
reset_situations_to_value = value;
- widget_reset_all_situations_transparencies_at_value (value);
+ widget_set_situations_value (value);
}
diff --git a/src/util/tree.c b/src/util/tree.c
index 2cdb2f3..42b31d6 100644
--- a/src/util/tree.c
+++ b/src/util/tree.c
@@ -29,7 +29,7 @@
#include "../../include/widget.h"
-void widget_add_child_node (struct TreeNode_t *parent, struct TreeNode_t *child)
+void widget_add_tree_child_node (struct TreeNode_t *parent, struct TreeNode_t *child)
{
if (parent->child) {
struct TreeNode_t *cur = parent->child;
diff --git a/src/widget/all_rules/tree/labo.c b/src/widget/all_rules/tree/labo.c
index 94989b7..1e71b1a 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_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 *a = widget_create_user_rules_tree_node("aware of"); widget_add_tree_child_node(tree_root, a);
+ struct TreeNode_t *b = widget_create_user_rules_tree_node("eager to"); widget_add_tree_child_node(tree_root, b);
+ struct TreeNode_t *c = widget_create_user_rules_tree_node("decide"); widget_add_tree_child_node(tree_root, c);
+ struct TreeNode_t *aaa = widget_create_user_rules_tree_node("our rights"); widget_add_tree_child_node(a, aaa);
+ struct TreeNode_t *aab = widget_create_user_rules_tree_node("our duties"); widget_add_tree_child_node(a, aab);
- 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 *aaa0 = widget_create_user_rules_tree_node("speak"); widget_add_tree_child_node(aaa, aaa0);
+ struct TreeNode_t *aaa1 = widget_create_user_rules_tree_node("question"); widget_add_tree_child_node(aaa, aaa1);
+ struct TreeNode_t *aaa2 = widget_create_user_rules_tree_node("learn"); widget_add_tree_child_node(aaa, aaa2);
+ struct TreeNode_t *aaaa = widget_create_user_rules_tree_node("read"); widget_add_tree_child_node(aaa, aaaa);
+ struct TreeNode_t *aaab = widget_create_user_rules_tree_node("write"); widget_add_tree_child_node(aaa, aaab);
+ struct TreeNode_t *aaac = widget_create_user_rules_tree_node("compute"); widget_add_tree_child_node(aaa, aaac);
+ struct TreeNode_t *aaad = widget_create_user_rules_tree_node("code"); widget_add_tree_child_node(aaa, aaad);
+ struct TreeNode_t *aaag = widget_create_user_rules_tree_node("imagine"); widget_add_tree_child_node(aaad, aaag);
+ struct TreeNode_t *aaah = widget_create_user_rules_tree_node("combine"); widget_add_tree_child_node(aaad, aaah);
+ struct TreeNode_t *aaai = widget_create_user_rules_tree_node("invent"); widget_add_tree_child_node(aaad, aaai);
+ struct TreeNode_t *aaaj = widget_create_user_rules_tree_node("create"); widget_add_tree_child_node(aaad, aaaj);
+ struct TreeNode_t *aaak = widget_create_user_rules_tree_node("enjoy !"); widget_add_tree_child_node(aaad, aaak);
+// struct TreeNode_t *aaae = widget_create_user_rules_tree_node("interact"); widget_add_tree_child_node(aaa, aaae);
- struct TreeNode_t *aaaco = widget_create_user_rules_tree_node("copy"); widget_add_child_node(aaaa, aaaco);
+ struct TreeNode_t *aaaco = widget_create_user_rules_tree_node("copy"); widget_add_tree_child_node(aaaa, aaaco);
- 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 *aaae = widget_create_user_rules_tree_node("edit"); widget_add_tree_child_node(aaab, aaae);
+ struct TreeNode_t *aaaf = widget_create_user_rules_tree_node("publish"); widget_add_tree_child_node(aaab, aaaf);
+// struct TreeNode_t *aaada = widget_create_user_rules_tree_node("manifest"); widget_add_tree_child_node(aaad, aaada);
- struct TreeNode_t *aaba = widget_create_user_rules_tree_node("learn"); widget_add_child_node(aab, aaba);
+ struct TreeNode_t *aaba = widget_create_user_rules_tree_node("learn"); widget_add_tree_child_node(aab, aaba);
- 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 *aabl = widget_create_user_rules_tree_node("access"); widget_add_tree_child_node(aaac, aabl);
+ struct TreeNode_t *aabm = widget_create_user_rules_tree_node("free"); widget_add_tree_child_node(aaac, aabm);
+ struct TreeNode_t *aabn = widget_create_user_rules_tree_node("tools"); widget_add_tree_child_node(aaac, aabn);
- 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 *aabb = widget_create_user_rules_tree_node("share"); widget_add_tree_child_node(aab, aabb);
+ struct TreeNode_t *aabc = widget_create_user_rules_tree_node("help"); widget_add_tree_child_node(aab, aabc);
- 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 *ba = widget_create_user_rules_tree_node("promote"); widget_add_tree_child_node(b, ba);
+ struct TreeNode_t *bb = widget_create_user_rules_tree_node("individual"); widget_add_tree_child_node(b, bb);
+ struct TreeNode_t *bc = widget_create_user_rules_tree_node("and common"); widget_add_tree_child_node(b, bc);
+ struct TreeNode_t *bd = widget_create_user_rules_tree_node("well-being"); widget_add_tree_child_node(b, bd);
+ struct TreeNode_t *bca = widget_create_user_rules_tree_node("education"); widget_add_tree_child_node(bc, bca);
+ struct TreeNode_t *bcb = widget_create_user_rules_tree_node("mutual"); widget_add_tree_child_node(bc, bcb);
+ struct TreeNode_t *bcc = widget_create_user_rules_tree_node("support"); widget_add_tree_child_node(bc, bcc);
+ struct TreeNode_t *bcd = widget_create_user_rules_tree_node("health"); widget_add_tree_child_node(bc, bcd);
+ struct TreeNode_t *bcda = widget_create_user_rules_tree_node("mental"); widget_add_tree_child_node(bcd, bcda);
+ struct TreeNode_t *bcdb = widget_create_user_rules_tree_node("physical"); widget_add_tree_child_node(bcd, bcdb);
+ struct TreeNode_t *ca = widget_create_user_rules_tree_node("free"); widget_add_tree_child_node(c, ca);
+ struct TreeNode_t *cb = widget_create_user_rules_tree_node("code"); widget_add_tree_child_node(c, cb);
+ struct TreeNode_t *cc = widget_create_user_rules_tree_node("access"); widget_add_tree_child_node(c, cc);
- 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);
+ struct TreeNode_t *cca = widget_create_user_rules_tree_node("tiens ?"); widget_add_tree_child_node(cc, cca);
+ struct TreeNode_t *ccb = widget_create_user_rules_tree_node("y a comme"); widget_add_tree_child_node(cc, ccb);
+ struct TreeNode_t *ccc = widget_create_user_rules_tree_node("un bug..."); widget_add_tree_child_node(cc, ccc);
+ struct TreeNode_t *ccd = widget_create_user_rules_tree_node("imprévu"); widget_add_tree_child_node(cc, ccd);
+ struct TreeNode_t *cce = widget_create_user_rules_tree_node("ici ( ;- )"); widget_add_tree_child_node(cc, cce);
} // TODO bug in this tree
diff --git a/src/widget/one_rule/algebra/assign.c b/src/widget/one_rule/algebra/assign.c
index c8c0178..40ff8bf 100644
--- a/src/widget/one_rule/algebra/assign.c
+++ b/src/widget/one_rule/algebra/assign.c
@@ -32,7 +32,7 @@
#include
-void *widget_get_btt_assignations_list()
+void *widget_get_selected_rule_assignations_list_btt()
{
GtkWidget *list_box = gtk_list_box_new();
GtkWidget *scrolled_list_box = GTK_WIDGET (gtk_scrolled_window_new ());
diff --git a/src/widget/one_rule/algebra/conditions.c b/src/widget/one_rule/algebra/conditions.c
index 5cbca37..35e8c61 100644
--- a/src/widget/one_rule/algebra/conditions.c
+++ b/src/widget/one_rule/algebra/conditions.c
@@ -33,7 +33,7 @@
#include
-void *widget_get_btt_conditions_list()
+void *widget_get_selected_rule_conditions_list_btt()
{
GtkWidget *list_box = gtk_list_box_new();
GtkWidget *scrolled_list_box = GTK_WIDGET (gtk_scrolled_window_new ());
diff --git a/src/widget/one_rule/algebra/dispatch.c b/src/widget/one_rule/algebra/dispatch.c
index 5df7238..4344a51 100644
--- a/src/widget/one_rule/algebra/dispatch.c
+++ b/src/widget/one_rule/algebra/dispatch.c
@@ -55,9 +55,9 @@ void *widget_get_selected_rule_algebra()
gtk_box_layout_set_spacing (GTK_BOX_LAYOUT (conditions_actions_identity_layout), 180);
// allocate (GTK_LAYOUT_MANAGER (conditions_actions_identity_layout), get_btt_conditions_list (), 100, 20,100); TODO
gtk_box_append (conditions_actions_names_box, GTK_WIDGET (label_ad_hoc));
- gtk_box_append (conditions_actions_names_box, GTK_WIDGET (widget_get_btt_conditions_list ()));
- gtk_box_append (conditions_actions_names_box, GTK_WIDGET (widget_get_btt_assignations_list()));
- gtk_box_append (conditions_actions_names_box, GTK_WIDGET (widget_get_btt_rule_identity()));
+ gtk_box_append (conditions_actions_names_box, GTK_WIDGET (widget_get_selected_rule_conditions_list_btt ()));
+ gtk_box_append (conditions_actions_names_box, GTK_WIDGET (widget_get_selected_rule_assignations_list_btt()));
+ gtk_box_append (conditions_actions_names_box, GTK_WIDGET (widget_get_selected_rule_identity_btt()));
return GTK_WIDGET (conditions_actions_names_box);
}
diff --git a/src/widget/one_rule/algebra/identity.c b/src/widget/one_rule/algebra/identity.c
index 08f094e..81a8099 100644
--- a/src/widget/one_rule/algebra/identity.c
+++ b/src/widget/one_rule/algebra/identity.c
@@ -31,7 +31,7 @@
#include
#include
-void *widget_get_btt_rule_identity()
+void *widget_get_selected_rule_identity_btt()
{
GtkWidget *list_box = gtk_list_box_new();
GtkWidget *scrolled_list_box = GTK_WIDGET (gtk_scrolled_window_new ());
diff --git a/src/widget/one_rule/dispatch.c b/src/widget/one_rule/dispatch.c
index 55eaf32..7a2a8ae 100644
--- a/src/widget/one_rule/dispatch.c
+++ b/src/widget/one_rule/dispatch.c
@@ -47,9 +47,9 @@ void *widget_get_pane_selected_rule_right() // < called in signal switch_state
GtkPaned *rule_itself_vs_explore_edit_pane = GTK_PANED (gtk_paned_new (GTK_ORIENTATION_VERTICAL));
gtk_paned_set_start_child (rule_itself_vs_explore_edit_pane, GTK_WIDGET (widget_get_selected_rule()));
if (fsm_get_exec_edit()) gtk_paned_set_end_child (rule_itself_vs_explore_edit_pane,
- GTK_WIDGET (widget_get_rule_edit()));
+ GTK_WIDGET (widget_get_rule_edition_tools()));
else gtk_paned_set_end_child (rule_itself_vs_explore_edit_pane,
- GTK_WIDGET (widget_get_rule_enquire()));
+ GTK_WIDGET (widget_get_rule_investigation_tools()));
gtk_paned_set_position (rule_itself_vs_explore_edit_pane, 640); // WARNING : position "absolue"
gtk_paned_set_wide_handle (rule_itself_vs_explore_edit_pane, TRUE);
gtk_paned_set_shrink_start_child (rule_itself_vs_explore_edit_pane, FALSE);
diff --git a/src/widget/one_rule/geometry/edit_tools.c b/src/widget/one_rule/geometry/edit.c
similarity index 98%
rename from src/widget/one_rule/geometry/edit_tools.c
rename to src/widget/one_rule/geometry/edit.c
index 3cfe49c..8cbbf44 100644
--- a/src/widget/one_rule/geometry/edit_tools.c
+++ b/src/widget/one_rule/geometry/edit.c
@@ -30,9 +30,10 @@
-void *widget_get_rule_edit()
+void *widget_get_rule_edition_tools()
{
return gtk_label_new
("_______________\n RULE EDITION\n controls\n''''''''''''''''''''''''''");
}
+
diff --git a/src/widget/one_rule/geometry/enquire.c b/src/widget/one_rule/geometry/investigate.c
similarity index 91%
rename from src/widget/one_rule/geometry/enquire.c
rename to src/widget/one_rule/geometry/investigate.c
index 1fa9f3c..48f1828 100644
--- a/src/widget/one_rule/geometry/enquire.c
+++ b/src/widget/one_rule/geometry/investigate.c
@@ -30,10 +30,10 @@
-void *widget_get_rule_enquire()
+void *widget_get_rule_investigation_tools()
{
- return gtk_label_new (" ________________\n RULE INQUIRY\n\
- tools\n '''''''''''''''''''''''''''");
+ return gtk_label_new (" _______________________\n RULE INVESTIGATION\n\
+ tools\n ''''''''''''''''''''''''''''''''''''''''");
}
diff --git a/src/widget/state/top.c b/src/widget/state/top.c
index 6d12946..d7f99b5 100644
--- a/src/widget/state/top.c
+++ b/src/widget/state/top.c
@@ -41,7 +41,7 @@ int widget_get_object_transparency (int rank)
return gtk_adjustment_get_value (gtk_scrollbar_get_adjustment (object_bar [rank]));
}
-void widget_set_object_transparency_at_value (int rank, int value)
+void widget_set_objects_value (int rank, int value)
{
gtk_adjustment_set_value (object_adjust [rank], value);
}
@@ -131,7 +131,7 @@ static void *get_objects_box()
static GtkScrollbar *situation_bar [n_situations];
static GtkAdjustment *situation_adjust [n_situations];
-void widget_reset_all_situations_transparencies_at_value (int value)
+void widget_set_situations_value (int value)
{
for (int i = 0; i < n_situations; i++)
if (value > -1)
@@ -169,7 +169,7 @@ static void *get_situations_box()
gtk_box_append (situations_box, GTK_WIDGET (situation_bar [i]));
}
- widget_reset_all_situations_transparencies_at_value (-1);
+ widget_set_situations_value (-1);
return situations_box;
}
diff --git a/src/widget/topbar/dispatch.c b/src/widget/topbar/dispatch.c
index d7d3013..7dcd1af 100644
--- a/src/widget/topbar/dispatch.c
+++ b/src/widget/topbar/dispatch.c
@@ -83,12 +83,16 @@ static GtkWidget *window_topbar (GtkWindow *window)
/* T E X T S */
/******************************************************************************/
-char *widget_get_text_address_theory () {
+char *widget_get_address_text_theory () {
return "./data/text/théorie.txt";
}
-char *widget_get_text_address_practice () {
+char *widget_get_address_text_practice () {
return "./data/text/pratique.txt";
}
+char *widget_get_address_text_alpha_index () {
+ return "./alphabetic_index.all";
+}
+
diff --git a/src/widget/topbar/modal.c b/src/widget/topbar/modal.c
index 9049d29..51aafcd 100644
--- a/src/widget/topbar/modal.c
+++ b/src/widget/topbar/modal.c
@@ -42,8 +42,9 @@ void widget_design_text_window (GtkWindow *main_window, GtkWindow *text_window)
gtk_header_bar_set_title_widget (GTK_HEADER_BAR (header_bar), gtk_label_new (title));
gtk_window_set_titlebar (text_window, header_bar);
- GtkWidget *child = widget_get_text_from_address (widget_get_text_address_theory());
- child = widget_get_text_from_address (widget_get_text_address_practice());
+ GtkWidget *child = widget_get_text_from_address (widget_get_address_text_theory());
+ child = widget_get_text_from_address (widget_get_address_text_practice());
+ child = widget_get_text_from_address (widget_get_address_text_alpha_index());
gtk_window_set_child (GTK_WINDOW (text_window), GTK_WIDGET (child));
gtk_widget_set_size_request (GTK_WIDGET (child), W_TEXT_WINDOW, H_TEXT_WINDOW);