From 5c92e6ddc69037844c5d23979f287018045659e7 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Thu, 17 Feb 2022 12:24:51 +0100 Subject: [PATCH] inspector: Show app ID and resource path in the General tab This makes it easier to figure out those values (which are mentioned in the GtkApplication documentation) rather than working that out from the way they're generated (or documented as being generated). --- gtk/inspector/general.c | 25 ++++++++++++ gtk/inspector/general.ui | 84 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 109 insertions(+) diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c index 48237d1ea5..4fd0c3039c 100644 --- a/gtk/inspector/general.c +++ b/gtk/inspector/general.c @@ -62,6 +62,9 @@ struct _GtkInspectorGeneralPrivate GtkWidget *device_box; GtkWidget *gtk_version; GtkWidget *gdk_backend; + GtkWidget *app_id_frame; + GtkWidget *app_id; + GtkWidget *resource_path; GtkWidget *gl_version; GtkWidget *gl_vendor; GtkWidget *prefix; @@ -119,6 +122,24 @@ init_version (GtkInspectorGeneral *gen) gtk_label_set_text (GTK_LABEL (gen->priv->gdk_backend), backend); } +static void +init_app_id (GtkInspectorGeneral *gen) +{ + GApplication *app; + + app = g_application_get_default (); + if (!app) + { + gtk_widget_hide (gen->priv->app_id_frame); + return; + } + + gtk_label_set_text (GTK_LABEL (gen->priv->app_id), + g_application_get_application_id (app)); + gtk_label_set_text (GTK_LABEL (gen->priv->resource_path), + g_application_get_resource_base_path (app)); +} + static G_GNUC_UNUSED void add_check_row (GtkInspectorGeneral *gen, GtkListBox *list, @@ -646,6 +667,7 @@ gtk_inspector_general_init (GtkInspectorGeneral *gen) gen->priv = gtk_inspector_general_get_instance_private (gen); gtk_widget_init_template (GTK_WIDGET (gen)); init_version (gen); + init_app_id (gen); init_env (gen); init_display (gen); init_gl (gen); @@ -735,6 +757,9 @@ gtk_inspector_general_class_init (GtkInspectorGeneralClass *klass) gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gl_box); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gtk_version); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gdk_backend); + gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, app_id_frame); + gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, app_id); + gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, resource_path); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gl_version); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, gl_vendor); gtk_widget_class_bind_template_child_private (widget_class, GtkInspectorGeneral, prefix); diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui index e2ff8e9250..f57771c453 100644 --- a/gtk/inspector/general.ui +++ b/gtk/inspector/general.ui @@ -91,6 +91,87 @@ + + + True + center + + + True + none + + + True + False + + + True + horizontal + 10 + 40 + + + True + Application ID + start + baseline + 0.0 + + + + + True + True + end + baseline + + + True + + + + + + + + + True + False + + + True + horizontal + 10 + 40 + + + True + Resource Path + start + baseline + 0.0 + + + + + True + True + end + baseline + + + True + + + + + + + + + + + True @@ -569,6 +650,8 @@ + + @@ -587,6 +670,7 @@ horizontal +