diff options
author | Cyrille Bagard <nocbos@gmail.com> | 2018-11-27 23:08:36 (GMT) |
---|---|---|
committer | Cyrille Bagard <nocbos@gmail.com> | 2018-11-27 23:08:36 (GMT) |
commit | 425f8ce0e40592287431bd1d3d71e03f5bdcbdd5 (patch) | |
tree | a8a555a4708dbb35dc3892648c30358fbf8e010f /src/gui/panels/log.c | |
parent | ce4b859adf12e1be6e13ea33b5afb1ce773ff1b3 (diff) |
Used Glade to build all GUI panels.
Diffstat (limited to 'src/gui/panels/log.c')
-rw-r--r-- | src/gui/panels/log.c | 71 |
1 files changed, 15 insertions, 56 deletions
diff --git a/src/gui/panels/log.c b/src/gui/panels/log.c index 9c109d4..f0252e9 100644 --- a/src/gui/panels/log.c +++ b/src/gui/panels/log.c @@ -142,11 +142,6 @@ static void g_log_panel_init(GLogPanel *panel) { GEditorItem *base; /* Version basique d'instance */ GPanelItem *pitem; /* Version parente du panneau */ - GtkWidget *scrolled; /* Fenêtre avec défilements */ - GtkTreeStore *store; /* Modèle de gestion */ - GtkWidget *treeview; /* Affichage de la liste */ - GtkCellRenderer *renderer; /* Moteur de rendu de colonne */ - GtkTreeViewColumn *column; /* Colonne de la liste */ /* Eléments de base */ @@ -163,43 +158,7 @@ static void g_log_panel_init(GLogPanel *panel) /* Représentation graphique */ - scrolled = gtk_scrolled_window_new(NULL, NULL); - gtk_widget_show(scrolled); - - base->widget = scrolled; - - /* Construction graphique */ - - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrolled), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); - gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scrolled), GTK_SHADOW_IN); - - store = gtk_tree_store_new(LGC_COUNT, G_TYPE_STRING, G_TYPE_STRING); - g_object_set_data(G_OBJECT(scrolled), "store", store); - - treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - g_object_set_data(G_OBJECT(scrolled), "treeview", treeview); - gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(treeview), FALSE); - gtk_widget_show(treeview); - gtk_container_add(GTK_CONTAINER(scrolled), treeview); - - g_object_unref(G_OBJECT(store)); - - column = gtk_tree_view_column_new(); - gtk_tree_view_column_set_visible(column, FALSE); - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); - gtk_tree_view_set_expander_column(GTK_TREE_VIEW(treeview), column); - - column = gtk_tree_view_column_new(); - - renderer = gtk_cell_renderer_pixbuf_new(); - gtk_tree_view_column_pack_start(column, renderer, FALSE); - gtk_tree_view_column_add_attribute(column, renderer, "stock-id", LGC_PICTURE); - - renderer = gtk_cell_renderer_text_new(); - gtk_tree_view_column_pack_start(column, renderer, TRUE); - gtk_tree_view_column_add_attribute(column, renderer, "markup", LGC_STRING); - - gtk_tree_view_append_column(GTK_TREE_VIEW(treeview), column); + g_panel_item_build(pitem, "log"); } @@ -283,7 +242,7 @@ void g_log_panel_add_message(GLogPanel *panel, LogMessageType type, const char * { log_data *data; /* Paramètres à joindre */ - data = (log_data *)calloc(1, sizeof(log_data)); + data = calloc(1, sizeof(log_data)); data->item = G_PANEL_ITEM(panel); data->type = type; @@ -311,58 +270,58 @@ void g_log_panel_add_message(GLogPanel *panel, LogMessageType type, const char * static gboolean log_message(log_data *data) { - GtkWidget *panel; /* Panneau à traiter */ - GtkTreeStore *store; /* Modèle de gestion */ + GtkBuilder *builder; /* Constructeur utilisé */ + GtkListStore *store; /* Modèle de gestion */ GtkTreeIter iter; /* Point d'insertion */ GtkTreeView *treeview; /* Affichage de la liste */ - /* Mise en place du message */ + builder = G_PANEL_ITEM(data->item)->builder; - panel = g_editor_item_get_widget(G_EDITOR_ITEM(data->item)); + /* Mise en place du message */ - store = g_object_get_data(G_OBJECT(panel), "store"); + store = GTK_LIST_STORE(gtk_builder_get_object(builder, "store")); - gtk_tree_store_append(store, &iter, NULL); + gtk_list_store_append(store, &iter); switch (data->type) { case LMT_INFO: - gtk_tree_store_set(store, &iter, + gtk_list_store_set(store, &iter, LGC_PICTURE, "gtk-info", LGC_STRING, data->msg, -1); break; case LMT_BAD_BINARY: - gtk_tree_store_set(store, &iter, + gtk_list_store_set(store, &iter, LGC_PICTURE, "gtk-dialog-warning", LGC_STRING, data->msg, -1); break; case LMT_PROCESS: - gtk_tree_store_set(store, &iter, + gtk_list_store_set(store, &iter, LGC_PICTURE, "gtk-execute", LGC_STRING, data->msg, -1); break; case LMT_ERROR: - gtk_tree_store_set(store, &iter, + gtk_list_store_set(store, &iter, LGC_PICTURE, "gtk-dialog-error", LGC_STRING, data->msg, -1); break; case LMT_WARNING: - gtk_tree_store_set(store, &iter, + gtk_list_store_set(store, &iter, LGC_PICTURE, "gtk-dialog-warning", LGC_STRING, data->msg, -1); break; default: - gtk_tree_store_set(store, &iter, + gtk_list_store_set(store, &iter, LGC_STRING, data->msg, -1); break; @@ -371,7 +330,7 @@ static gboolean log_message(log_data *data) /* Défilement pour pointer à l'affichage */ - treeview = GTK_TREE_VIEW(g_object_get_data(G_OBJECT(panel), "treeview")); + treeview = GTK_TREE_VIEW(gtk_builder_get_object(builder, "treeview")); scroll_to_treeview_iter(treeview, GTK_TREE_MODEL(store), &iter); |