diff options
author | Matthias Clasen <mclasen@redhat.com> | 2020-06-30 15:17:14 -0400 |
---|---|---|
committer | Matthias Clasen <mclasen@redhat.com> | 2020-06-30 15:18:37 -0400 |
commit | 52666d6fe5a78de911133ca55856ee4ec48e7ba9 (patch) | |
tree | 6db02e4e0011862be49a06e45aa22ffd702679bd | |
parent | bbb28196e51d2d8293e9d145a16003b3edd505eb (diff) | |
download | gtk+-52666d6fe5a78de911133ca55856ee4ec48e7ba9.tar.gz |
inspector: Rename DataList -> TreeData
Rename the DataList object to TreeData, in preparation
for adding a ListData object for list models. While
we are touching it, modernize it a bit (drop the Private
struct, use a layout manager, etc).
-rw-r--r-- | gtk/inspector/data-list.h | 54 | ||||
-rw-r--r-- | gtk/inspector/init.c | 4 | ||||
-rw-r--r-- | gtk/inspector/meson.build | 2 | ||||
-rw-r--r-- | gtk/inspector/tree-data.c (renamed from gtk/inspector/data-list.c) | 79 | ||||
-rw-r--r-- | gtk/inspector/tree-data.h | 39 | ||||
-rw-r--r-- | gtk/inspector/tree-data.ui (renamed from gtk/inspector/data-list.ui) | 3 | ||||
-rw-r--r-- | gtk/inspector/window.c | 6 | ||||
-rw-r--r-- | gtk/inspector/window.h | 2 | ||||
-rw-r--r-- | gtk/inspector/window.ui | 2 |
9 files changed, 95 insertions, 96 deletions
diff --git a/gtk/inspector/data-list.h b/gtk/inspector/data-list.h deleted file mode 100644 index 9a9af15a78..0000000000 --- a/gtk/inspector/data-list.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - * Copyright (c) 2014 Red Hat, Inc. - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2 of the License, or (at your option) any later version. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library. If not, see <http://www.gnu.org/licenses/>. - */ - -#ifndef _GTK_INSPECTOR_DATA_LIST_H_ -#define _GTK_INSPECTOR_DATA_LIST_H_ - -#include <gtk/gtkbox.h> - -#define GTK_TYPE_INSPECTOR_DATA_LIST (gtk_inspector_data_list_get_type()) -#define GTK_INSPECTOR_DATA_LIST(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_DATA_LIST, GtkInspectorDataList)) -#define GTK_INSPECTOR_DATA_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass), GTK_TYPE_INSPECTOR_DATA_LIST, GtkInspectorDataListClass)) -#define GTK_INSPECTOR_IS_DATA_LIST(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_INSPECTOR_DATA_LIST)) -#define GTK_INSPECTOR_IS_DATA_LIST_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE((klass), GTK_TYPE_INSPECTOR_DATA_LIST)) -#define GTK_INSPECTOR_DATA_LIST_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS((obj), GTK_TYPE_INSPECTOR_DATA_LIST, GtkInspectorDataListClass)) - - -typedef struct _GtkInspectorDataListPrivate GtkInspectorDataListPrivate; - -typedef struct _GtkInspectorDataList -{ - GtkBox parent; - GtkInspectorDataListPrivate *priv; -} GtkInspectorDataList; - -typedef struct _GtkInspectorDataListClass -{ - GtkBoxClass parent; -} GtkInspectorDataListClass; - -G_BEGIN_DECLS - -GType gtk_inspector_data_list_get_type (void); -void gtk_inspector_data_list_set_object (GtkInspectorDataList *sl, - GObject *object); - -G_END_DECLS - -#endif // _GTK_INSPECTOR_DATA_LIST_H_ - -// vim: set et sw=2 ts=2: diff --git a/gtk/inspector/init.c b/gtk/inspector/init.c index 126ce44b31..59d09e30c9 100644 --- a/gtk/inspector/init.c +++ b/gtk/inspector/init.c @@ -29,7 +29,6 @@ #include "controllers.h" #include "css-editor.h" #include "css-node-tree.h" -#include "data-list.h" #include "general.h" #include "graphdata.h" #include "logs.h" @@ -43,6 +42,7 @@ #include "shortcuts.h" #include "size-groups.h" #include "statistics.h" +#include "tree-data.h" #include "visual.h" #include "window.h" @@ -64,7 +64,6 @@ gtk_inspector_init (void) g_type_ensure (GTK_TYPE_INSPECTOR_CONTROLLERS); g_type_ensure (GTK_TYPE_INSPECTOR_CSS_EDITOR); g_type_ensure (GTK_TYPE_INSPECTOR_CSS_NODE_TREE); - g_type_ensure (GTK_TYPE_INSPECTOR_DATA_LIST); g_type_ensure (GTK_TYPE_INSPECTOR_GENERAL); g_type_ensure (GTK_TYPE_INSPECTOR_LOGS); g_type_ensure (GTK_TYPE_MAGNIFIER); @@ -78,6 +77,7 @@ gtk_inspector_init (void) g_type_ensure (GTK_TYPE_INSPECTOR_SHORTCUTS); g_type_ensure (GTK_TYPE_INSPECTOR_SIZE_GROUPS); g_type_ensure (GTK_TYPE_INSPECTOR_STATISTICS); + g_type_ensure (GTK_TYPE_INSPECTOR_TREE_DATA); g_type_ensure (GTK_TYPE_INSPECTOR_VISUAL); g_type_ensure (GTK_TYPE_INSPECTOR_WINDOW); diff --git a/gtk/inspector/meson.build b/gtk/inspector/meson.build index eeb1811824..b2d00b74c5 100644 --- a/gtk/inspector/meson.build +++ b/gtk/inspector/meson.build @@ -6,7 +6,6 @@ inspector_sources = files( 'controllers.c', 'css-editor.c', 'css-node-tree.c', - 'data-list.c', 'focusoverlay.c', 'fpsoverlay.c', 'general.c', @@ -33,6 +32,7 @@ inspector_sources = files( 'startrecording.c', 'statistics.c', 'strv-editor.c', + 'tree-data.c', 'treewalk.c', 'type-info.c', 'updatesoverlay.c', diff --git a/gtk/inspector/data-list.c b/gtk/inspector/tree-data.c index c15ace1352..4c0b3b8394 100644 --- a/gtk/inspector/data-list.c +++ b/gtk/inspector/tree-data.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Red Hat, Inc. + * Copyright (c) 2014, 2020 Red Hat, Inc. * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public @@ -18,7 +18,7 @@ #include "config.h" #include <glib/gi18n-lib.h> -#include "data-list.h" +#include "tree-data.h" #include "object-tree.h" @@ -27,10 +27,14 @@ #include "gtktogglebutton.h" #include "gtklabel.h" #include "gtkstack.h" +#include "gtkboxlayout.h" +#include "gtkorientable.h" -struct _GtkInspectorDataListPrivate +struct _GtkInspectorTreeData { + GtkWidget parent_instance; + GtkTreeModel *object; GtkTreeModel *types; GtkTreeView *view; @@ -38,13 +42,22 @@ struct _GtkInspectorDataListPrivate gboolean show_data; }; -G_DEFINE_TYPE_WITH_PRIVATE (GtkInspectorDataList, gtk_inspector_data_list, GTK_TYPE_BOX) +typedef struct _GtkInspectorTreeDataClass GtkInspectorTreeDataClass; +struct _GtkInspectorTreeDataClass +{ + GtkWidgetClass parent_class; +}; + + +G_DEFINE_TYPE (GtkInspectorTreeData, gtk_inspector_tree_data, GTK_TYPE_WIDGET) static void -gtk_inspector_data_list_init (GtkInspectorDataList *sl) +gtk_inspector_tree_data_init (GtkInspectorTreeData *sl) { - sl->priv = gtk_inspector_data_list_get_instance_private (sl); gtk_widget_init_template (GTK_WIDGET (sl)); + + gtk_orientable_set_orientation (GTK_ORIENTABLE (gtk_widget_get_layout_manager (GTK_WIDGET (sl))), + GTK_ORIENTATION_VERTICAL); } static void @@ -67,7 +80,7 @@ cell_data_func (GtkTreeViewColumn *col, } static void -add_columns (GtkInspectorDataList *sl) +add_columns (GtkInspectorTreeData *sl) { gint n_columns; GtkCellRenderer *cell; @@ -76,45 +89,45 @@ add_columns (GtkInspectorDataList *sl) GtkTreeViewColumn *col; gint i; - n_columns = gtk_tree_model_get_n_columns (sl->priv->object); + n_columns = gtk_tree_model_get_n_columns (sl->object); for (i = 0; i < n_columns; i++) { cell = gtk_cell_renderer_text_new (); - type = gtk_tree_model_get_column_type (sl->priv->object, i); + type = gtk_tree_model_get_column_type (sl->object, i); title = g_strdup_printf ("%d: %s", i, g_type_name (type)); col = gtk_tree_view_column_new_with_attributes (title, cell, NULL); g_object_set_data (G_OBJECT (col), "num", GINT_TO_POINTER (i)); gtk_tree_view_column_set_cell_data_func (col, cell, cell_data_func, sl, NULL); - gtk_tree_view_append_column (sl->priv->view, col); + gtk_tree_view_append_column (sl->view, col); g_free (title); } } static void -show_types (GtkInspectorDataList *sl) +show_types (GtkInspectorTreeData *sl) { - gtk_tree_view_set_model (sl->priv->view, NULL); - sl->priv->show_data = FALSE; + gtk_tree_view_set_model (sl->view, NULL); + sl->show_data = FALSE; } static void -show_data (GtkInspectorDataList *sl) +show_data (GtkInspectorTreeData *sl) { - gtk_tree_view_set_model (sl->priv->view, sl->priv->object); - sl->priv->show_data = TRUE; + gtk_tree_view_set_model (sl->view, sl->object); + sl->show_data = TRUE; } static void -clear_view (GtkInspectorDataList *sl) +clear_view (GtkInspectorTreeData *sl) { - gtk_tree_view_set_model (sl->priv->view, NULL); - while (gtk_tree_view_get_n_columns (sl->priv->view) > 0) - gtk_tree_view_remove_column (sl->priv->view, - gtk_tree_view_get_column (sl->priv->view, 0)); + gtk_tree_view_set_model (sl->view, NULL); + while (gtk_tree_view_get_n_columns (sl->view) > 0) + gtk_tree_view_remove_column (sl->view, + gtk_tree_view_get_column (sl->view, 0)); } void -gtk_inspector_data_list_set_object (GtkInspectorDataList *sl, +gtk_inspector_tree_data_set_object (GtkInspectorTreeData *sl, GObject *object) { GtkWidget *stack; @@ -125,8 +138,8 @@ gtk_inspector_data_list_set_object (GtkInspectorDataList *sl, page = gtk_stack_get_page (GTK_STACK (stack), GTK_WIDGET (sl)); clear_view (sl); - sl->priv->object = NULL; - sl->priv->show_data = FALSE; + sl->object = NULL; + sl->show_data = FALSE; if (!GTK_IS_TREE_MODEL (object)) { @@ -135,21 +148,21 @@ gtk_inspector_data_list_set_object (GtkInspectorDataList *sl, } title = gtk_inspector_get_object_title (object); - gtk_label_set_label (GTK_LABEL (sl->priv->object_title), title); + gtk_label_set_label (GTK_LABEL (sl->object_title), title); g_free (title); g_object_set (page, "visible", TRUE, NULL); - sl->priv->object = GTK_TREE_MODEL (object); + sl->object = GTK_TREE_MODEL (object); add_columns (sl); show_types (sl); } static void toggle_show (GtkToggleButton *button, - GtkInspectorDataList *sl) + GtkInspectorTreeData *sl) { - if (gtk_toggle_button_get_active (button) == sl->priv->show_data) + if (gtk_toggle_button_get_active (button) == sl->show_data) return; if (gtk_toggle_button_get_active (button)) @@ -159,14 +172,16 @@ toggle_show (GtkToggleButton *button, } static void -gtk_inspector_data_list_class_init (GtkInspectorDataListClass *klass) +gtk_inspector_tree_data_class_init (GtkInspectorTreeDataClass *klass) { GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/data-list.ui"); - gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorDataList, view); - gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorDataList, object_title); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gtk/libgtk/inspector/tree-data.ui"); + gtk_widget_class_bind_template_child (widget_class, GtkInspectorTreeData, view); + gtk_widget_class_bind_template_child (widget_class, GtkInspectorTreeData, object_title); gtk_widget_class_bind_template_callback (widget_class, toggle_show); + + gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT); } // vim: set et sw=2 ts=2: diff --git a/gtk/inspector/tree-data.h b/gtk/inspector/tree-data.h new file mode 100644 index 0000000000..04c848f779 --- /dev/null +++ b/gtk/inspector/tree-data.h @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2014, 2020 Red Hat, Inc. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library. If not, see <http://www.gnu.org/licenses/>. + */ + +#ifndef _GTK_INSPECTOR_TREE_DATA_H_ +#define _GTK_INSPECTOR_TREE_DATA_H_ + +#include <gtk/gtkwidget.h> + +#define GTK_TYPE_INSPECTOR_TREE_DATA (gtk_inspector_tree_data_get_type ()) +#define GTK_INSPECTOR_TREE_DATA(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj), GTK_TYPE_INSPECTOR_TREE_DATA, GtkInspectorTreeData)) +#define GTK_INSPECTOR_IS_TREE_DATA(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj), GTK_TYPE_INSPECTOR_TREE_DATA)) + +typedef struct _GtkInspectorTreeData GtkInspectorTreeData; + +G_BEGIN_DECLS + +GType gtk_inspector_tree_data_get_type (void) G_GNUC_CONST; +void gtk_inspector_tree_data_set_object (GtkInspectorTreeData *sl, + GObject *object); + +G_END_DECLS + +#endif // _GTK_INSPECTOR_TREE_DATA_H_ + +// vim: set et sw=2 ts=2: diff --git a/gtk/inspector/data-list.ui b/gtk/inspector/tree-data.ui index 78e2369777..84fe5acd6f 100644 --- a/gtk/inspector/data-list.ui +++ b/gtk/inspector/tree-data.ui @@ -1,6 +1,5 @@ <interface domain="gtk40"> - <template class="GtkInspectorDataList" parent="GtkBox"> - <property name="orientation">vertical</property> + <template class="GtkInspectorTreeData" parent="GtkWidget"> <child> <object class="GtkBox"> <property name="spacing">6</property> diff --git a/gtk/inspector/window.c b/gtk/inspector/window.c index 16431a7657..626e3163a8 100644 --- a/gtk/inspector/window.c +++ b/gtk/inspector/window.c @@ -35,13 +35,13 @@ #include "css-node-tree.h" #include "object-tree.h" #include "size-groups.h" -#include "data-list.h" #include "actions.h" #include "shortcuts.h" #include "menu.h" #include "misc-info.h" #include "magnifier.h" #include "recorder.h" +#include "tree-data.h" #include "visual.h" #include "general.h" #include "logs.h" @@ -100,7 +100,7 @@ set_selected_object (GtkInspectorWindow *iw, gtk_inspector_misc_info_set_object (GTK_INSPECTOR_MISC_INFO (iw->misc_info), selected); gtk_inspector_css_node_tree_set_object (GTK_INSPECTOR_CSS_NODE_TREE (iw->widget_css_node_tree), selected); gtk_inspector_size_groups_set_object (GTK_INSPECTOR_SIZE_GROUPS (iw->size_groups), selected); - gtk_inspector_data_list_set_object (GTK_INSPECTOR_DATA_LIST (iw->data_list), selected); + gtk_inspector_tree_data_set_object (GTK_INSPECTOR_TREE_DATA (iw->tree_data), selected); gtk_inspector_actions_set_object (GTK_INSPECTOR_ACTIONS (iw->actions), selected); gtk_inspector_shortcuts_set_object (GTK_INSPECTOR_SHORTCUTS (iw->shortcuts), selected); gtk_inspector_menu_set_object (GTK_INSPECTOR_MENU (iw->menu), selected); @@ -445,7 +445,7 @@ gtk_inspector_window_class_init (GtkInspectorWindowClass *klass) gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, widget_recorder); gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, object_title); gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, size_groups); - gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, data_list); + gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, tree_data); gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, actions); gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, shortcuts); gtk_widget_class_bind_template_child (widget_class, GtkInspectorWindow, menu); diff --git a/gtk/inspector/window.h b/gtk/inspector/window.h index 6ac9a7eafc..fe2dd5a03d 100644 --- a/gtk/inspector/window.h +++ b/gtk/inspector/window.h @@ -64,7 +64,7 @@ typedef struct GtkWidget *widget_recorder; GtkWidget *object_hierarchy; GtkWidget *size_groups; - GtkWidget *data_list; + GtkWidget *tree_data; GtkWidget *actions; GtkWidget *shortcuts; GtkWidget *menu; diff --git a/gtk/inspector/window.ui b/gtk/inspector/window.ui index e469cb23c2..cfddd20fdc 100644 --- a/gtk/inspector/window.ui +++ b/gtk/inspector/window.ui @@ -405,7 +405,7 @@ <property name="name">data</property> <property name="title" translatable="yes">Data</property> <property name="child"> - <object class="GtkInspectorDataList" id="data_list"/> + <object class="GtkInspectorTreeData" id="tree_data"/> </property> </object> </child> |