diff --git a/src/widget/all_rules/compare/interest.c b/src/widget/main_window/all_rules/compare/interest.c similarity index 99% rename from src/widget/all_rules/compare/interest.c rename to src/widget/main_window/all_rules/compare/interest.c index 6572a9c..dec91e7 100644 --- a/src/widget/all_rules/compare/interest.c +++ b/src/widget/main_window/all_rules/compare/interest.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" #define MAX_SIZE 255 #define CHECK_STACK 0 diff --git a/src/widget/all_rules/dispatch.c b/src/widget/main_window/all_rules/dispatch.c similarity index 96% rename from src/widget/all_rules/dispatch.c rename to src/widget/main_window/all_rules/dispatch.c index e0c09c8..83222b0 100644 --- a/src/widget/all_rules/dispatch.c +++ b/src/widget/main_window/all_rules/dispatch.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/fsm.h" -#include "../../../include/widget.h" -#include "../../../include/signal.h" +#include "../../../../include/fsm.h" +#include "../../../../include/widget.h" +#include "../../../../include/signal.h" diff --git a/src/widget/all_rules/tree/dispatch.c b/src/widget/main_window/all_rules/tree/dispatch.c similarity index 93% rename from src/widget/all_rules/tree/dispatch.c rename to src/widget/main_window/all_rules/tree/dispatch.c index 85ad040..6218384 100644 --- a/src/widget/all_rules/tree/dispatch.c +++ b/src/widget/main_window/all_rules/tree/dispatch.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" diff --git a/src/widget/all_rules/tree/freq.c b/src/widget/main_window/all_rules/tree/freq.c similarity index 96% rename from src/widget/all_rules/tree/freq.c rename to src/widget/main_window/all_rules/tree/freq.c index d731b0d..c4b7267 100644 --- a/src/widget/all_rules/tree/freq.c +++ b/src/widget/main_window/all_rules/tree/freq.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" static GtkScrollbar *rule_bar [n_rules]; diff --git a/src/widget/all_rules/tree/labo.c b/src/widget/main_window/all_rules/tree/labo.c similarity index 99% rename from src/widget/all_rules/tree/labo.c rename to src/widget/main_window/all_rules/tree/labo.c index 1e71b1a..787e6a6 100644 --- a/src/widget/all_rules/tree/labo.c +++ b/src/widget/main_window/all_rules/tree/labo.c @@ -24,7 +24,7 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/widget.h" +#include "../../../../../include/widget.h" // (NB à terme, labo.c disparaitra, bien sûr !) diff --git a/src/widget/all_rules/tree/pilot_box.c b/src/widget/main_window/all_rules/tree/pilot_box.c similarity index 96% rename from src/widget/all_rules/tree/pilot_box.c rename to src/widget/main_window/all_rules/tree/pilot_box.c index 938b9f7..83a1e23 100644 --- a/src/widget/all_rules/tree/pilot_box.c +++ b/src/widget/main_window/all_rules/tree/pilot_box.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" void *widget_get_rules_pilot_box () diff --git a/src/widget/all_rules/tree/tree.c b/src/widget/main_window/all_rules/tree/tree.c similarity index 94% rename from src/widget/all_rules/tree/tree.c rename to src/widget/main_window/all_rules/tree/tree.c index b597a5a..0193ecf 100644 --- a/src/widget/all_rules/tree/tree.c +++ b/src/widget/main_window/all_rules/tree/tree.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" // void *widget_get_user_rules_tree() < est à la racine (dans src/widget/) diff --git a/src/widget/measure/dispatch.c b/src/widget/main_window/measure/dispatch.c similarity index 98% rename from src/widget/measure/dispatch.c rename to src/widget/main_window/measure/dispatch.c index 88ddaad..3670c33 100644 --- a/src/widget/measure/dispatch.c +++ b/src/widget/main_window/measure/dispatch.c @@ -24,11 +24,11 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/util.h" -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" -#include "../../../include/fsm.h" +#include "../../../../include/util.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" +#include "../../../../include/fsm.h" /******************************************************************************/ diff --git a/src/widget/one_rule/algebra/assign.c b/src/widget/main_window/one_rule/algebra/assign.c similarity index 96% rename from src/widget/one_rule/algebra/assign.c rename to src/widget/main_window/one_rule/algebra/assign.c index 63b39d8..d78462f 100644 --- a/src/widget/one_rule/algebra/assign.c +++ b/src/widget/main_window/one_rule/algebra/assign.c @@ -25,9 +25,9 @@ * @endcond */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" #include #include diff --git a/src/widget/one_rule/algebra/conditions.c b/src/widget/main_window/one_rule/algebra/conditions.c similarity index 96% rename from src/widget/one_rule/algebra/conditions.c rename to src/widget/main_window/one_rule/algebra/conditions.c index b32123b..115301a 100644 --- a/src/widget/one_rule/algebra/conditions.c +++ b/src/widget/main_window/one_rule/algebra/conditions.c @@ -26,10 +26,10 @@ * @endcond */ -#include "../../../../include/util.h" -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/util.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" #include #include diff --git a/src/widget/one_rule/algebra/dispatch.c b/src/widget/main_window/one_rule/algebra/dispatch.c similarity index 95% rename from src/widget/one_rule/algebra/dispatch.c rename to src/widget/main_window/one_rule/algebra/dispatch.c index 070d40a..90157f0 100644 --- a/src/widget/one_rule/algebra/dispatch.c +++ b/src/widget/main_window/one_rule/algebra/dispatch.c @@ -26,9 +26,9 @@ * @endcond */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" /** * @brief Provides the three lists needed to describe a rule algebraically. diff --git a/src/widget/one_rule/algebra/identity.c b/src/widget/main_window/one_rule/algebra/identity.c similarity index 96% rename from src/widget/one_rule/algebra/identity.c rename to src/widget/main_window/one_rule/algebra/identity.c index 16887b4..361604c 100644 --- a/src/widget/one_rule/algebra/identity.c +++ b/src/widget/main_window/one_rule/algebra/identity.c @@ -25,9 +25,9 @@ * @endcond */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" #include #include diff --git a/src/widget/one_rule/algebra/utilities.c b/src/widget/main_window/one_rule/algebra/utilities.c similarity index 97% rename from src/widget/one_rule/algebra/utilities.c rename to src/widget/main_window/one_rule/algebra/utilities.c index 5a2b5e8..262e138 100644 --- a/src/widget/one_rule/algebra/utilities.c +++ b/src/widget/main_window/one_rule/algebra/utilities.c @@ -26,9 +26,9 @@ * @endcond */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" #include #include diff --git a/src/widget/one_rule/dispatch.c b/src/widget/main_window/one_rule/dispatch.c similarity index 96% rename from src/widget/one_rule/dispatch.c rename to src/widget/main_window/one_rule/dispatch.c index 7a2a8ae..d7de7af 100644 --- a/src/widget/one_rule/dispatch.c +++ b/src/widget/main_window/one_rule/dispatch.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/fsm.h" -#include "../../../include/widget.h" -#include "../../../include/signal.h" +#include "../../../../include/fsm.h" +#include "../../../../include/widget.h" +#include "../../../../include/signal.h" void *widget_get_selected_rule() diff --git a/src/widget/one_rule/geometry/camera.c b/src/widget/main_window/one_rule/geometry/camera.c similarity index 97% rename from src/widget/one_rule/geometry/camera.c rename to src/widget/main_window/one_rule/geometry/camera.c index 9c73b7b..8703588 100644 --- a/src/widget/one_rule/geometry/camera.c +++ b/src/widget/main_window/one_rule/geometry/camera.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" static GtkBox *rec_XYZ_box() diff --git a/src/widget/one_rule/geometry/dispatch.c b/src/widget/main_window/one_rule/geometry/dispatch.c similarity index 95% rename from src/widget/one_rule/geometry/dispatch.c rename to src/widget/main_window/one_rule/geometry/dispatch.c index c1ea384..1d0d4e8 100644 --- a/src/widget/one_rule/geometry/dispatch.c +++ b/src/widget/main_window/one_rule/geometry/dispatch.c @@ -27,9 +27,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" void *widget_get_selected_rule_geometry() diff --git a/src/widget/one_rule/geometry/edit.c b/src/widget/main_window/one_rule/geometry/edit.c similarity index 94% rename from src/widget/one_rule/geometry/edit.c rename to src/widget/main_window/one_rule/geometry/edit.c index 8cbbf44..c55325d 100644 --- a/src/widget/one_rule/geometry/edit.c +++ b/src/widget/main_window/one_rule/geometry/edit.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" diff --git a/src/widget/one_rule/geometry/geometry.c b/src/widget/main_window/one_rule/geometry/geometry.c similarity index 96% rename from src/widget/one_rule/geometry/geometry.c rename to src/widget/main_window/one_rule/geometry/geometry.c index bcd12f0..b51e1e2 100644 --- a/src/widget/one_rule/geometry/geometry.c +++ b/src/widget/main_window/one_rule/geometry/geometry.c @@ -27,9 +27,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" static void *widget_get_selected_rule_geometry_before() diff --git a/src/widget/one_rule/geometry/investigate.c b/src/widget/main_window/one_rule/geometry/investigate.c similarity index 94% rename from src/widget/one_rule/geometry/investigate.c rename to src/widget/main_window/one_rule/geometry/investigate.c index 48f1828..22d1b24 100644 --- a/src/widget/one_rule/geometry/investigate.c +++ b/src/widget/main_window/one_rule/geometry/investigate.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../../include/fsm.h" -#include "../../../../include/widget.h" -#include "../../../../include/signal.h" +#include "../../../../../include/fsm.h" +#include "../../../../../include/widget.h" +#include "../../../../../include/signal.h" diff --git a/src/widget/results/dispatch.c b/src/widget/main_window/results/dispatch.c similarity index 96% rename from src/widget/results/dispatch.c rename to src/widget/main_window/results/dispatch.c index f62269c..86030d2 100644 --- a/src/widget/results/dispatch.c +++ b/src/widget/main_window/results/dispatch.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" // "graph", "chart", "plot" and "diagram" are ambiguous terms, sometimes used interchangeably. // https://www.mathsisfun.com/data/data-graph.php diff --git a/src/widget/results/display.c b/src/widget/main_window/results/display.c similarity index 97% rename from src/widget/results/display.c rename to src/widget/main_window/results/display.c index bd22ef1..de21161 100644 --- a/src/widget/results/display.c +++ b/src/widget/main_window/results/display.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" void *widget_get_results_box_time () { GtkBox *time_box = GTK_BOX (gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2)); diff --git a/src/widget/results/organize.c b/src/widget/main_window/results/organize.c similarity index 96% rename from src/widget/results/organize.c rename to src/widget/main_window/results/organize.c index 799c455..450107e 100644 --- a/src/widget/results/organize.c +++ b/src/widget/main_window/results/organize.c @@ -25,9 +25,9 @@ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" void *widget_get_results_box_organize () { diff --git a/src/widget/state/bottom.c b/src/widget/main_window/state/bottom.c similarity index 97% rename from src/widget/state/bottom.c rename to src/widget/main_window/state/bottom.c index 8e7eeee..683c75f 100644 --- a/src/widget/state/bottom.c +++ b/src/widget/main_window/state/bottom.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/fsm.h" -#include "../../../include/widget.h" -#include "../../../include/signal.h" +#include "../../../../include/fsm.h" +#include "../../../../include/widget.h" +#include "../../../../include/signal.h" /* L'image de l'état de l'espace (au centre) fait partie d'un panneau "milieu", diff --git a/src/widget/state/dispatch.c b/src/widget/main_window/state/dispatch.c similarity index 97% rename from src/widget/state/dispatch.c rename to src/widget/main_window/state/dispatch.c index e51224f..b27496c 100644 --- a/src/widget/state/dispatch.c +++ b/src/widget/main_window/state/dispatch.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/fsm.h" -#include "../../../include/widget.h" -#include "../../../include/signal.h" +#include "../../../../include/fsm.h" +#include "../../../../include/widget.h" +#include "../../../../include/signal.h" /* L'image de l'état de l'espace (au centre) fait partie d'un panneau "milieu", diff --git a/src/widget/state/middle.c b/src/widget/main_window/state/middle.c similarity index 97% rename from src/widget/state/middle.c rename to src/widget/main_window/state/middle.c index 1561c02..f01ab89 100644 --- a/src/widget/state/middle.c +++ b/src/widget/main_window/state/middle.c @@ -24,10 +24,10 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/fsm.h" -#include "../../../include/widget.h" -#include "../../../include/signal.h" -#include "../../../include/util.h" +#include "../../../../include/fsm.h" +#include "../../../../include/widget.h" +#include "../../../../include/signal.h" +#include "../../../../include/util.h" static GtkAdjustment *X_adjust; static GtkAdjustment *Y_adjust; diff --git a/src/widget/state/top.c b/src/widget/main_window/state/top.c similarity index 98% rename from src/widget/state/top.c rename to src/widget/main_window/state/top.c index d7f99b5..33e498d 100644 --- a/src/widget/state/top.c +++ b/src/widget/main_window/state/top.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/fsm.h" -#include "../../../include/widget.h" -#include "../../../include/signal.h" +#include "../../../../include/fsm.h" +#include "../../../../include/widget.h" +#include "../../../../include/signal.h" /******************************************************************************/ diff --git a/src/widget/synth/dispatch.c b/src/widget/main_window/synth/dispatch.c similarity index 98% rename from src/widget/synth/dispatch.c rename to src/widget/main_window/synth/dispatch.c index b1788de..caea315 100644 --- a/src/widget/synth/dispatch.c +++ b/src/widget/main_window/synth/dispatch.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" void *widget_get_non_time_dependent() // for fun ! diff --git a/src/widget/synth/time.c b/src/widget/main_window/synth/time.c similarity index 94% rename from src/widget/synth/time.c rename to src/widget/main_window/synth/time.c index 0dae2fc..be6d138 100644 --- a/src/widget/synth/time.c +++ b/src/widget/main_window/synth/time.c @@ -24,9 +24,9 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" void *widget_get_time_dependent() { diff --git a/src/widget/topbar/dispatch.c b/src/widget/main_window/topbar/dispatch.c similarity index 95% rename from src/widget/topbar/dispatch.c rename to src/widget/main_window/topbar/dispatch.c index 047ba1e..1d8ea55 100644 --- a/src/widget/topbar/dispatch.c +++ b/src/widget/main_window/topbar/dispatch.c @@ -24,10 +24,10 @@ */ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" -#include "../../../include/fsm.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" +#include "../../../../include/fsm.h" diff --git a/src/widget/topbar/left.c b/src/widget/main_window/topbar/left.c similarity index 97% rename from src/widget/topbar/left.c rename to src/widget/main_window/topbar/left.c index e2c7e48..d5c0538 100644 --- a/src/widget/topbar/left.c +++ b/src/widget/main_window/topbar/left.c @@ -24,10 +24,10 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" -#include "../../../include/fsm.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" +#include "../../../../include/fsm.h" /******************************************************************************/ diff --git a/src/widget/topbar/right.c b/src/widget/main_window/topbar/right.c similarity index 98% rename from src/widget/topbar/right.c rename to src/widget/main_window/topbar/right.c index f5bca3f..9eb6d24 100644 --- a/src/widget/topbar/right.c +++ b/src/widget/main_window/topbar/right.c @@ -24,10 +24,10 @@ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ -#include "../../../include/base.h" -#include "../../../include/signal.h" -#include "../../../include/widget.h" -#include "../../../include/fsm.h" +#include "../../../../include/base.h" +#include "../../../../include/signal.h" +#include "../../../../include/widget.h" +#include "../../../../include/fsm.h" /******************************************************************************/