From 1aa772c2659d2b7c3533b75db7bd11ebcc377109 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Fri, 14 Jul 2023 21:08:46 -0700 Subject: [PATCH] sysprof: move resources into same base path --- src/sysprof/sysprof-callgraph-view.c | 2 +- src/sysprof/sysprof-css.c | 2 +- src/sysprof/sysprof-mark-chart-row.c | 2 +- src/sysprof/sysprof-mark-chart.c | 2 +- src/sysprof/sysprof-mark-table.c | 2 +- src/sysprof/sysprof-memory-callgraph-view.c | 2 +- src/sysprof/sysprof-weighted-callgraph-view.c | 2 +- src/sysprof/sysprof.gresource.xml | 34 +++++++++---------- 8 files changed, 23 insertions(+), 25 deletions(-) diff --git a/src/sysprof/sysprof-callgraph-view.c b/src/sysprof/sysprof-callgraph-view.c index 83cb7732..2f088bdd 100644 --- a/src/sysprof/sysprof-callgraph-view.c +++ b/src/sysprof/sysprof-callgraph-view.c @@ -428,7 +428,7 @@ sysprof_callgraph_view_class_init (SysprofCallgraphViewClass *klass) g_object_class_install_properties (object_class, N_PROPS, properties); - gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-callgraph-view.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-callgraph-view.ui"); gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT); gtk_widget_class_set_css_name (widget_class, "callgraphview"); gtk_widget_class_bind_template_child (widget_class, SysprofCallgraphView, callers_column_view); diff --git a/src/sysprof/sysprof-css.c b/src/sysprof/sysprof-css.c index 5e986415..a83b42de 100644 --- a/src/sysprof/sysprof-css.c +++ b/src/sysprof/sysprof-css.c @@ -34,7 +34,7 @@ _sysprof_css_init (void) g_resources_register (sysprof_get_resource ()); css = gtk_css_provider_new (); - gtk_css_provider_load_from_resource (css, "/libsysprof-gtk/style.css"); + gtk_css_provider_load_from_resource (css, "/org/gnome/sysprof/style.css"); gtk_style_context_add_provider_for_display (gdk_display_get_default (), GTK_STYLE_PROVIDER (css), G_MAXUINT); diff --git a/src/sysprof/sysprof-mark-chart-row.c b/src/sysprof/sysprof-mark-chart-row.c index 91901f43..112658cd 100644 --- a/src/sysprof/sysprof-mark-chart-row.c +++ b/src/sysprof/sysprof-mark-chart-row.c @@ -152,7 +152,7 @@ sysprof_mark_chart_row_class_init (SysprofMarkChartRowClass *klass) gtk_widget_class_set_css_name (widget_class, "markchartrow"); gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT); - gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-mark-chart-row.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-mark-chart-row.ui"); gtk_widget_class_bind_template_child (widget_class, SysprofMarkChartRow, chart); gtk_widget_class_bind_template_child (widget_class, SysprofMarkChartRow, layer); gtk_widget_class_bind_template_callback (widget_class, sysprof_mark_chart_row_activate_layer_item_cb); diff --git a/src/sysprof/sysprof-mark-chart.c b/src/sysprof/sysprof-mark-chart.c index db953e30..e83afabe 100644 --- a/src/sysprof/sysprof-mark-chart.c +++ b/src/sysprof/sysprof-mark-chart.c @@ -158,7 +158,7 @@ sysprof_mark_chart_class_init (SysprofMarkChartClass *klass) g_object_class_install_properties (object_class, N_PROPS, properties); - gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-mark-chart.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-mark-chart.ui"); gtk_widget_class_set_css_name (widget_class, "markchart"); gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT); gtk_widget_class_bind_template_child (widget_class, SysprofMarkChart, box); diff --git a/src/sysprof/sysprof-mark-table.c b/src/sysprof/sysprof-mark-table.c index dc077428..50523b7e 100644 --- a/src/sysprof/sysprof-mark-table.c +++ b/src/sysprof/sysprof-mark-table.c @@ -141,7 +141,7 @@ sysprof_mark_table_class_init (SysprofMarkTableClass *klass) g_object_class_install_properties (object_class, N_PROPS, properties); - gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-mark-table.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-mark-table.ui"); gtk_widget_class_set_css_name (widget_class, "marktable"); gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT); gtk_widget_class_bind_template_child (widget_class, SysprofMarkTable, box); diff --git a/src/sysprof/sysprof-memory-callgraph-view.c b/src/sysprof/sysprof-memory-callgraph-view.c index f3b84cf2..97ffded8 100644 --- a/src/sysprof/sysprof-memory-callgraph-view.c +++ b/src/sysprof/sysprof-memory-callgraph-view.c @@ -325,7 +325,7 @@ sysprof_memory_callgraph_view_class_init (SysprofMemoryCallgraphViewClass *klass callgraph_view_class->augment_func = augment_memory; callgraph_view_class->load = sysprof_memory_callgraph_view_load; - gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-memory-callgraph-view.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-memory-callgraph-view.ui"); gtk_widget_class_bind_template_child (widget_class, SysprofMemoryCallgraphView, callers_self_column); gtk_widget_class_bind_template_child (widget_class, SysprofMemoryCallgraphView, callers_total_column); diff --git a/src/sysprof/sysprof-weighted-callgraph-view.c b/src/sysprof/sysprof-weighted-callgraph-view.c index f1ac08da..c2b4dacb 100644 --- a/src/sysprof/sysprof-weighted-callgraph-view.c +++ b/src/sysprof/sysprof-weighted-callgraph-view.c @@ -310,7 +310,7 @@ sysprof_weighted_callgraph_view_class_init (SysprofWeightedCallgraphViewClass *k callgraph_view_class->augment_func = augment_weight; callgraph_view_class->load = sysprof_weighted_callgraph_view_load; - gtk_widget_class_set_template_from_resource (widget_class, "/libsysprof-gtk/sysprof-weighted-callgraph-view.ui"); + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-weighted-callgraph-view.ui"); gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, callers_self_column); gtk_widget_class_bind_template_child (widget_class, SysprofWeightedCallgraphView, callers_total_column); diff --git a/src/sysprof/sysprof.gresource.xml b/src/sysprof/sysprof.gresource.xml index a2760abf..070739a5 100644 --- a/src/sysprof/sysprof.gresource.xml +++ b/src/sysprof/sysprof.gresource.xml @@ -1,17 +1,18 @@ - - sysprof-callgraph-view.ui - sysprof-mark-chart.ui - sysprof-mark-chart-row.ui - sysprof-mark-table.ui - sysprof-memory-callgraph-view.ui - sysprof-weighted-callgraph-view.ui - style.css - gtk/help-overlay.ui gtk/menus.ui + icons/scalable/actions/address-layout-symbolic.svg + icons/scalable/actions/mark-chart-symbolic.svg + icons/scalable/actions/mark-table-symbolic.svg + icons/scalable/actions/mark-waterfall-symbolic.svg + icons/scalable/actions/memory-allocations-symbolic.svg + icons/scalable/actions/metadata-symbolic.svg + icons/scalable/actions/process-mounts-symbolic.svg + icons/scalable/actions/storage-symbolic.svg + icons/scalable/actions/system-log-symbolic.svg + sysprof-callgraph-view.ui sysprof-counters-section.ui sysprof-cpu-info-dialog.ui sysprof-cpu-section.ui @@ -19,7 +20,11 @@ sysprof-frame-utility.ui sysprof-greeter.ui sysprof-logs-section.ui + sysprof-mark-chart-row.ui + sysprof-mark-chart.ui + sysprof-mark-table.ui sysprof-marks-section.ui + sysprof-memory-callgraph-view.ui sysprof-memory-section.ui sysprof-metadata-section.ui sysprof-process-dialog.ui @@ -29,15 +34,8 @@ sysprof-sidebar.ui sysprof-time-scrubber.ui sysprof-traceables-utility.ui + sysprof-weighted-callgraph-view.ui sysprof-window.ui - icons/scalable/actions/address-layout-symbolic.svg - icons/scalable/actions/mark-chart-symbolic.svg - icons/scalable/actions/mark-table-symbolic.svg - icons/scalable/actions/memory-allocations-symbolic.svg - icons/scalable/actions/metadata-symbolic.svg - icons/scalable/actions/process-mounts-symbolic.svg - icons/scalable/actions/storage-symbolic.svg - icons/scalable/actions/system-log-symbolic.svg - icons/scalable/actions/mark-waterfall-symbolic.svg + style.css