diff --git a/src/sysprof/meson.build b/src/sysprof/meson.build index ab87c403..99a2780e 100644 --- a/src/sysprof/meson.build +++ b/src/sysprof/meson.build @@ -8,7 +8,6 @@ sysprof_sources = [ 'sysprof-color-iter.c', 'sysprof-column-layer.c', 'sysprof-counters-section.c', - 'sysprof-cpu-info-dialog.c', 'sysprof-cpu-section.c', 'sysprof-css.c', 'sysprof-duplex-layer.c', diff --git a/src/sysprof/sysprof-cpu-info-dialog.c b/src/sysprof/sysprof-cpu-info-dialog.c deleted file mode 100644 index eabe36e6..00000000 --- a/src/sysprof/sysprof-cpu-info-dialog.c +++ /dev/null @@ -1,135 +0,0 @@ -/* sysprof-cpu-info-dialog.c - * - * Copyright 2023 Christian Hergert - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -#include "config.h" - -#include "sysprof-cpu-info-dialog.h" - -struct _SysprofCpuInfoDialog -{ - AdwWindow parent_instance; - SysprofDocument *document; -}; - -enum { - PROP_0, - PROP_DOCUMENT, - N_PROPS -}; - -G_DEFINE_FINAL_TYPE (SysprofCpuInfoDialog, sysprof_cpu_info_dialog, ADW_TYPE_WINDOW) - -static GParamSpec *properties [N_PROPS]; - -static void -sysprof_cpu_info_dialog_dispose (GObject *object) -{ - SysprofCpuInfoDialog *self = (SysprofCpuInfoDialog *)object; - - gtk_widget_dispose_template (GTK_WIDGET (self), SYSPROF_TYPE_CPU_INFO_DIALOG); - - g_clear_object (&self->document); - - G_OBJECT_CLASS (sysprof_cpu_info_dialog_parent_class)->dispose (object); -} - -static void -sysprof_cpu_info_dialog_get_property (GObject *object, - guint prop_id, - GValue *value, - GParamSpec *pspec) -{ - SysprofCpuInfoDialog *self = SYSPROF_CPU_INFO_DIALOG (object); - - switch (prop_id) - { - case PROP_DOCUMENT: - g_value_set_object (value, sysprof_cpu_info_dialog_get_document (self)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } -} - -static void -sysprof_cpu_info_dialog_set_property (GObject *object, - guint prop_id, - const GValue *value, - GParamSpec *pspec) -{ - SysprofCpuInfoDialog *self = SYSPROF_CPU_INFO_DIALOG (object); - - switch (prop_id) - { - case PROP_DOCUMENT: - sysprof_cpu_info_dialog_set_document (self, g_value_get_object (value)); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - } -} - -static void -sysprof_cpu_info_dialog_class_init (SysprofCpuInfoDialogClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); - - object_class->dispose = sysprof_cpu_info_dialog_dispose; - object_class->get_property = sysprof_cpu_info_dialog_get_property; - object_class->set_property = sysprof_cpu_info_dialog_set_property; - - properties [PROP_DOCUMENT] = - g_param_spec_object ("document", NULL, NULL, - SYSPROF_TYPE_DOCUMENT, - (G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_STATIC_STRINGS)); - - g_object_class_install_properties (object_class, N_PROPS, properties); - - gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/sysprof/sysprof-cpu-info-dialog.ui"); -} - -static void -sysprof_cpu_info_dialog_init (SysprofCpuInfoDialog *self) -{ - gtk_widget_init_template (GTK_WIDGET (self)); -} - -SysprofDocument * -sysprof_cpu_info_dialog_get_document (SysprofCpuInfoDialog *self) -{ - g_return_val_if_fail (SYSPROF_IS_CPU_INFO_DIALOG (self), NULL); - - return self->document; -} - -void -sysprof_cpu_info_dialog_set_document (SysprofCpuInfoDialog *self, - SysprofDocument *document) -{ - g_return_if_fail (SYSPROF_IS_CPU_INFO_DIALOG (self)); - g_return_if_fail (!document || SYSPROF_IS_DOCUMENT (document)); - - if (g_set_object (&self->document, document)) - g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_DOCUMENT]); -} - diff --git a/src/sysprof/sysprof-cpu-info-dialog.h b/src/sysprof/sysprof-cpu-info-dialog.h deleted file mode 100644 index 5d1b3d1f..00000000 --- a/src/sysprof/sysprof-cpu-info-dialog.h +++ /dev/null @@ -1,37 +0,0 @@ -/* sysprof-cpu-info-dialog.h - * - * Copyright 2023 Christian Hergert - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program 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 General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - * - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -#pragma once - -#include - -#include - -G_BEGIN_DECLS - -#define SYSPROF_TYPE_CPU_INFO_DIALOG (sysprof_cpu_info_dialog_get_type()) - -G_DECLARE_FINAL_TYPE (SysprofCpuInfoDialog, sysprof_cpu_info_dialog, SYSPROF, CPU_INFO_DIALOG, AdwWindow) - -SysprofDocument *sysprof_cpu_info_dialog_get_document (SysprofCpuInfoDialog *self); -void sysprof_cpu_info_dialog_set_document (SysprofCpuInfoDialog *self, - SysprofDocument *document); - -G_END_DECLS diff --git a/src/sysprof/sysprof-cpu-info-dialog.ui b/src/sysprof/sysprof-cpu-info-dialog.ui deleted file mode 100644 index 71a50d5e..00000000 --- a/src/sysprof/sysprof-cpu-info-dialog.ui +++ /dev/null @@ -1,156 +0,0 @@ - - - - - diff --git a/src/sysprof/sysprof-window.c b/src/sysprof/sysprof-window.c index c35e72d0..5faf0516 100644 --- a/src/sysprof/sysprof-window.c +++ b/src/sysprof/sysprof-window.c @@ -23,7 +23,6 @@ #include #include "sysprof-counters-section.h" -#include "sysprof-cpu-info-dialog.h" #include "sysprof-cpu-section.h" #include "sysprof-files-section.h" #include "sysprof-greeter.h" @@ -116,24 +115,6 @@ sysprof_window_record_capture_action (GtkWidget *widget, show_greeter (SYSPROF_WINDOW (widget), SYSPROF_GREETER_PAGE_RECORD); } -static void -sysprof_window_show_cpu_info_action (GtkWidget *widget, - const char *action_name, - GVariant *param) -{ - SysprofWindow *self = (SysprofWindow *)widget; - GtkWindow *window; - - g_assert (SYSPROF_IS_WINDOW (self)); - - window = g_object_new (SYSPROF_TYPE_CPU_INFO_DIALOG, - "document", self->document, - "transient-for", self, - NULL); - - gtk_window_present (window); -} - static void sysprof_window_set_document (SysprofWindow *self, SysprofDocument *document) @@ -397,7 +378,6 @@ sysprof_window_class_init (SysprofWindowClass *klass) gtk_widget_class_install_action (widget_class, "win.open-capture", NULL, sysprof_window_open_capture_action); gtk_widget_class_install_action (widget_class, "win.record-capture", NULL, sysprof_window_record_capture_action); - gtk_widget_class_install_action (widget_class, "win.show-cpu-info", NULL, sysprof_window_show_cpu_info_action); gtk_widget_class_install_action (widget_class, "session.zoom-one", NULL, sysprof_window_session_zoom_one); gtk_widget_class_install_action (widget_class, "session.zoom-out", NULL, sysprof_window_session_zoom_out); gtk_widget_class_install_action (widget_class, "session.zoom-in", NULL, sysprof_window_session_zoom_in); diff --git a/src/sysprof/sysprof-window.ui b/src/sysprof/sysprof-window.ui index f2475f4b..95743a1b 100644 --- a/src/sysprof/sysprof-window.ui +++ b/src/sysprof/sysprof-window.ui @@ -221,12 +221,6 @@ Save As… -
- - Show CPU Information… - win.show-cpu-info - -
Preferences diff --git a/src/sysprof/sysprof.gresource.xml b/src/sysprof/sysprof.gresource.xml index 070739a5..b2d10982 100644 --- a/src/sysprof/sysprof.gresource.xml +++ b/src/sysprof/sysprof.gresource.xml @@ -14,7 +14,6 @@ icons/scalable/actions/system-log-symbolic.svg sysprof-callgraph-view.ui sysprof-counters-section.ui - sysprof-cpu-info-dialog.ui sysprof-cpu-section.ui sysprof-files-section.ui sysprof-frame-utility.ui