diff --git a/hot.c b/hot.c index db12b53..cc297b6 100644 --- a/hot.c +++ b/hot.c @@ -22,15 +22,7 @@ static struct TreeNode_t *create_user_tree_node (const gchar* text){ return node; } -static void add_child_node (struct TreeNode_t *parent, struct TreeNode_t *child){ - if (parent->child) { - struct TreeNode_t *cur = parent->child; - while (cur && cur->next) {cur = cur->next;} - cur->next = child; - } else parent->child = child; -} - -void on_experimental_user_tree_expander_toggled(GtkExpander *expander, gpointer user_data) +void on_user_tree_expander_toggled(GtkExpander *expander, gpointer user_data) { // This is a conceptual callback for when an expander is toggled GtkTreeListRow *row = GTK_TREE_LIST_ROW(user_data); @@ -45,8 +37,8 @@ static void on_bind_user_tree_factory (GtkSignalListItemFactory *factory, GObjec const gchar *text = gtk_string_object_get_string (GTK_STRING_OBJECT (gtk_tree_list_row_get_item (row))); GtkWidget *expander = gtk_list_item_get_child (list_item); gtk_expander_set_label (GTK_EXPANDER (expander), text); - g_signal_handlers_disconnect_by_func(expander, G_CALLBACK(on_experimental_user_tree_expander_toggled), row); - g_signal_connect(expander, "activate", G_CALLBACK(on_experimental_user_tree_expander_toggled), row); + g_signal_handlers_disconnect_by_func(expander, G_CALLBACK(on_user_tree_expander_toggled), row); + g_signal_connect(expander, "activate", G_CALLBACK(on_user_tree_expander_toggled), row); gtk_widget_set_margin_start(expander, gtk_tree_list_row_get_depth(row)*20); gboolean is_expanded = gtk_tree_list_row_get_expanded(row); if (0) printf("[on_bind_user_tree_factory] row content is [%s] and expander is [%d]\n", text, is_expanded); @@ -60,11 +52,11 @@ void on_setup_user_tree_factory (GtkSignalListItemFactory *factory, if (0) printf("[on_setup_user_tree_factory] here is an expander\n"); } -static GListModel* get_experimental_user_tree_model_child (struct TreeNode_t *parent){ +static GListModel* get_user_tree_model_child (struct TreeNode_t *parent){ GtkStringList *list = NULL; assert (parent); // if (parent) { - if (0) printf("[get_experimental_user_tree_model_child] here is %s content : ", parent->text); + if (0) printf("[get_user_tree_model_child] here is %s content : ", parent->text); struct TreeNode_t *child = parent->child; if (child) {list = gtk_string_list_new(NULL);} while(child) { @@ -87,13 +79,32 @@ GListModel* get_user_tree_model (GObject *item, gpointer root){ if (cur == NULL) {cur = parent->child; parent = cur;} } if (0) printf("[get_user_user_tree_model] looked for %s in %s item\n", cur->text, string); - return get_experimental_user_tree_model_child (cur); + return get_user_tree_model_child (cur); +} + +static void add_child_node (struct TreeNode_t *parent, struct TreeNode_t *child){ + if (parent->child) { + struct TreeNode_t *cur = parent->child; + while (cur && cur->next) {cur = cur->next;} + cur->next = child; + } else parent->child = child; } GtkScrolledWindow *get_user_rules_tree (){ - struct TreeNode_t *tree_root = create_user_tree_node("hello"); - struct TreeNode_t *it_s_me = create_user_tree_node("it's me"); add_child_node(tree_root, it_s_me); - struct TreeNode_t *remember = create_user_tree_node("do you remember ?"); add_child_node(it_s_me, remember); + struct TreeNode_t *tree_root = create_user_tree_node("root"); + struct TreeNode_t *move_random = create_user_tree_node("move random"); add_child_node(tree_root, move_random); + struct TreeNode_t *isole = create_user_tree_node("isolated object"); add_child_node(move_random, isole); + struct TreeNode_t *isole_1D = create_user_tree_node("isolated object move 1D"); add_child_node(isole, isole_1D); + struct TreeNode_t *isole_2D = create_user_tree_node("isolated object move 2D"); add_child_node(isole, isole_2D); + struct TreeNode_t *isole_3D = create_user_tree_node("isolated object move 3D"); add_child_node(isole, isole_3D); + struct TreeNode_t *relie = create_user_tree_node("part of object"); add_child_node(move_random, relie); + struct TreeNode_t *move_determ = create_user_tree_node("move determ"); add_child_node(tree_root, move_determ); + struct TreeNode_t *transport = create_user_tree_node("transport"); add_child_node(tree_root, transport); + struct TreeNode_t *transform = create_user_tree_node("transform"); add_child_node(tree_root, transform); + struct TreeNode_t *no_payload = create_user_tree_node("free"); add_child_node(transport, no_payload); + struct TreeNode_t *charged = create_user_tree_node("charged"); add_child_node(transport, charged); + struct TreeNode_t *spontaneous = create_user_tree_node("spontaneous"); add_child_node(transform, spontaneous); + struct TreeNode_t *catalysed = create_user_tree_node("catalysed"); add_child_node(transform, catalysed); GtkStringList *model = gtk_string_list_new(NULL); gtk_string_list_append (model, tree_root->text); @@ -114,11 +125,11 @@ GtkScrolledWindow *get_user_rules_tree (){ gtk_single_selection_set_autoselect (selection_model, FALSE); gtk_single_selection_set_can_unselect (selection_model, TRUE); GtkWidget *list_view = gtk_list_view_new (GTK_SELECTION_MODEL (selection_model), GTK_LIST_ITEM_FACTORY (factory)); - GtkScrolledWindow *experimental_scrolled_window = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new()); - gtk_scrolled_window_set_child(experimental_scrolled_window, list_view); - gtk_scrolled_window_set_policy (experimental_scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_widget_set_vexpand(GTK_WIDGET(experimental_scrolled_window), TRUE); - gtk_widget_set_visible(GTK_WIDGET(experimental_scrolled_window), TRUE); + GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (gtk_scrolled_window_new()); + gtk_scrolled_window_set_child(scrolled_window, list_view); + gtk_scrolled_window_set_policy (scrolled_window, GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + gtk_widget_set_vexpand(GTK_WIDGET(scrolled_window), TRUE); + gtk_widget_set_visible(GTK_WIDGET(scrolled_window), TRUE); gtk_widget_set_visible(GTK_WIDGET(list_view), TRUE); - return experimental_scrolled_window; + return scrolled_window; }