varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

notebook: port to GTK 4

Browse Source
This commit is contained in:
Christian Hergert
2021-09-30 19:09:43 -07:00
parent 35d401417b
commit c7fc10b954
2 changed files with 94 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

138
src/libsysprof-ui/sysprof-notebook.c
View File

@ -29,10 +29,11 @@
typedef struct typedef struct
{ {
GtkNotebook *notebook;
guint always_show_tabs : 1; guint always_show_tabs : 1;
} SysprofNotebookPrivate; } SysprofNotebookPrivate;
G_DEFINE_TYPE_WITH_PRIVATE (SysprofNotebook, sysprof_notebook, GTK_TYPE_NOTEBOOK) G_DEFINE_TYPE_WITH_PRIVATE (SysprofNotebook, sysprof_notebook, GTK_TYPE_WIDGET)
enum { enum {
PROP_0, PROP_0,
@ -83,15 +84,16 @@ sysprof_notebook_notify_can_replay_cb (SysprofNotebook *self,
} }
static void static void
sysprof_notebook_page_added (GtkNotebook *notebook, sysprof_notebook_page_added (SysprofNotebook *self,
GtkWidget *child, GtkWidget *child,
guint page_num) guint page_num,
GtkNotebook *notebook)
{ {
SysprofNotebook *self = (SysprofNotebook *)notebook;
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self); SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
g_assert (SYSPROF_IS_NOTEBOOK (self)); g_assert (SYSPROF_IS_NOTEBOOK (self));
g_assert (GTK_IS_WIDGET (child)); g_assert (GTK_IS_WIDGET (child));
g_assert (GTK_IS_NOTEBOOK (notebook));
gtk_notebook_set_show_tabs (notebook, gtk_notebook_set_show_tabs (notebook,
(priv->always_show_tabs || (priv->always_show_tabs ||
@ -125,15 +127,16 @@ sysprof_notebook_page_added (GtkNotebook *notebook,
} }
static void static void
sysprof_notebook_page_removed (GtkNotebook *notebook, sysprof_notebook_page_removed (SysprofNotebook *self,
GtkWidget *child, GtkWidget *child,
guint page_num) guint page_num,
GtkNotebook *notebook)
{ {
SysprofNotebook *self = (SysprofNotebook *)notebook;
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self); SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
g_assert (SYSPROF_IS_NOTEBOOK (self)); g_assert (SYSPROF_IS_NOTEBOOK (self));
g_assert (GTK_IS_WIDGET (child)); g_assert (GTK_IS_WIDGET (child));
g_assert (GTK_IS_NOTEBOOK (notebook));
if (gtk_widget_in_destruction (GTK_WIDGET (notebook))) if (gtk_widget_in_destruction (GTK_WIDGET (notebook)))
return; return;
@ -141,16 +144,16 @@ sysprof_notebook_page_removed (GtkNotebook *notebook,
if (gtk_notebook_get_n_pages (notebook) == 0) if (gtk_notebook_get_n_pages (notebook) == 0)
{ {
child = sysprof_display_new (); child = sysprof_display_new ();
gtk_container_add (GTK_CONTAINER (notebook), child); gtk_notebook_append_page (notebook, child, NULL);
gtk_widget_show (child); gtk_widget_show (child);
g_signal_handlers_disconnect_by_func (child, g_signal_handlers_disconnect_by_func (child,
G_CALLBACK (sysprof_notebook_notify_can_save_cb), G_CALLBACK (sysprof_notebook_notify_can_save_cb),
notebook); notebook);
g_object_notify_by_pspec (G_OBJECT (notebook), properties [PROP_CAN_REPLAY]); g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CAN_REPLAY]);
g_object_notify_by_pspec (G_OBJECT (notebook), properties [PROP_CAN_SAVE]); g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CAN_SAVE]);
g_object_notify_by_pspec (G_OBJECT (notebook), properties [PROP_CURRENT]); g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CURRENT]);
} }
gtk_notebook_set_show_tabs (notebook, gtk_notebook_set_show_tabs (notebook,
@ -159,18 +162,33 @@ sysprof_notebook_page_removed (GtkNotebook *notebook,
} }
static void static void
sysprof_notebook_switch_page (GtkNotebook *notebook, sysprof_notebook_switch_page (SysprofNotebook *self,
GtkWidget *widget, GtkWidget *widget,
guint page) guint page,
GtkNotebook *notebook)
{ {
g_assert (SYSPROF_IS_NOTEBOOK (self));
g_assert (GTK_IS_NOTEBOOK (notebook)); g_assert (GTK_IS_NOTEBOOK (notebook));
g_assert (GTK_IS_WIDGET (widget)); g_assert (GTK_IS_WIDGET (widget));
GTK_NOTEBOOK_CLASS (sysprof_notebook_parent_class)->switch_page (notebook, widget, page); g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CAN_REPLAY]);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CAN_SAVE]);
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_CURRENT]);
}
g_object_notify_by_pspec (G_OBJECT (notebook), properties [PROP_CAN_REPLAY]); static void
g_object_notify_by_pspec (G_OBJECT (notebook), properties [PROP_CAN_SAVE]); sysprof_notebook_dispose (GObject *object)
g_object_notify_by_pspec (G_OBJECT (notebook), properties [PROP_CURRENT]); {
SysprofNotebook *self = (SysprofNotebook *)object;
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
if (priv->notebook)
{
gtk_widget_unparent (GTK_WIDGET (priv->notebook));
priv->notebook = NULL;
}
G_OBJECT_CLASS (sysprof_notebook_parent_class)->dispose (object);
} }
static void static void
@ -227,15 +245,12 @@ static void
sysprof_notebook_class_init (SysprofNotebookClass *klass) sysprof_notebook_class_init (SysprofNotebookClass *klass)
{ {
GObjectClass *object_class = G_OBJECT_CLASS (klass); GObjectClass *object_class = G_OBJECT_CLASS (klass);
GtkNotebookClass *notebook_class = GTK_NOTEBOOK_CLASS (klass); GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
object_class->dispose = sysprof_notebook_dispose;
object_class->get_property = sysprof_notebook_get_property; object_class->get_property = sysprof_notebook_get_property;
object_class->set_property = sysprof_notebook_set_property; object_class->set_property = sysprof_notebook_set_property;
notebook_class->page_added = sysprof_notebook_page_added;
notebook_class->page_removed = sysprof_notebook_page_removed;
notebook_class->switch_page = sysprof_notebook_switch_page;
properties [PROP_ALWAYS_SHOW_TABS] = properties [PROP_ALWAYS_SHOW_TABS] =
g_param_spec_boolean ("always-show-tabs", g_param_spec_boolean ("always-show-tabs",
"Always Show Tabs", "Always Show Tabs",
@ -265,25 +280,51 @@ sysprof_notebook_class_init (SysprofNotebookClass *klass)
(G_PARAM_READABLE | G_PARAM_STATIC_STRINGS)); (G_PARAM_READABLE | G_PARAM_STATIC_STRINGS));
g_object_class_install_properties (object_class, N_PROPS, properties); g_object_class_install_properties (object_class, N_PROPS, properties);
gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
} }
static void static void
sysprof_notebook_init (SysprofNotebook *self) sysprof_notebook_init (SysprofNotebook *self)
{ {
gtk_notebook_set_show_border (GTK_NOTEBOOK (self), FALSE); SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
gtk_notebook_set_scrollable (GTK_NOTEBOOK (self), TRUE);
gtk_notebook_popup_enable (GTK_NOTEBOOK (self)); priv->notebook = GTK_NOTEBOOK (gtk_notebook_new ());
gtk_widget_set_parent (GTK_WIDGET (priv->notebook), GTK_WIDGET (self));
gtk_notebook_set_show_border (priv->notebook, FALSE);
gtk_notebook_set_scrollable (priv->notebook, TRUE);
gtk_notebook_popup_enable (priv->notebook);
g_signal_connect_object (priv->notebook,
"page-added",
G_CALLBACK (sysprof_notebook_page_added),
self,
G_CONNECT_SWAPPED);
g_signal_connect_object (priv->notebook,
"page-removed",
G_CALLBACK (sysprof_notebook_page_removed),
self,
G_CONNECT_SWAPPED);
g_signal_connect_object (priv->notebook,
"switch-page",
G_CALLBACK (sysprof_notebook_switch_page),
self,
G_CONNECT_SWAPPED | G_CONNECT_AFTER);
} }
void void
sysprof_notebook_close_current (SysprofNotebook *self) sysprof_notebook_close_current (SysprofNotebook *self)
{ {
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
gint page; gint page;
g_return_if_fail (SYSPROF_IS_NOTEBOOK (self)); g_return_if_fail (SYSPROF_IS_NOTEBOOK (self));
if ((page = gtk_notebook_get_current_page (GTK_NOTEBOOK (self))) >= 0) if ((page = gtk_notebook_get_current_page (priv->notebook)) >= 0)
gtk_widget_destroy (gtk_notebook_get_nth_page (GTK_NOTEBOOK (self), page)); gtk_notebook_remove_page (priv->notebook, page);
} }
static void static void
@ -307,29 +348,31 @@ void
sysprof_notebook_open (SysprofNotebook *self, sysprof_notebook_open (SysprofNotebook *self,
GFile *file) GFile *file)
{ {
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
GtkWidget *display = NULL; GtkWidget *display = NULL;
gint page; gint page;
g_return_if_fail (SYSPROF_IS_NOTEBOOK (self)); g_return_if_fail (SYSPROF_IS_NOTEBOOK (self));
g_return_if_fail (g_file_is_native (file)); g_return_if_fail (g_file_is_native (file));
gtk_container_foreach (GTK_CONTAINER (self), for (GtkWidget *child = gtk_widget_get_first_child (GTK_WIDGET (priv->notebook));
find_empty_display_cb, child && !display;
&display); child = gtk_widget_get_next_sibling (child))
find_empty_display_cb (child, &display);
if (display == NULL) if (display == NULL)
{ {
display = sysprof_display_new (); display = sysprof_display_new ();
page = gtk_notebook_insert_page (GTK_NOTEBOOK (self), display, NULL, -1); page = gtk_notebook_insert_page (priv->notebook, display, NULL, -1);
gtk_widget_show (display); gtk_widget_show (display);
} }
else else
{ {
page = gtk_notebook_page_num (GTK_NOTEBOOK (self), display); page = gtk_notebook_page_num (priv->notebook, display);
} }
gtk_notebook_set_current_page (GTK_NOTEBOOK (self), page); gtk_notebook_set_current_page (priv->notebook, page);
sysprof_display_open (SYSPROF_DISPLAY (display), file); sysprof_display_open (SYSPROF_DISPLAY (display), file);
} }
@ -337,12 +380,13 @@ sysprof_notebook_open (SysprofNotebook *self,
SysprofDisplay * SysprofDisplay *
sysprof_notebook_get_current (SysprofNotebook *self) sysprof_notebook_get_current (SysprofNotebook *self)
{ {
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
gint page; gint page;
g_assert (SYSPROF_IS_NOTEBOOK (self)); g_assert (SYSPROF_IS_NOTEBOOK (self));
if ((page = gtk_notebook_get_current_page (GTK_NOTEBOOK (self))) >= 0) if ((page = gtk_notebook_get_current_page (priv->notebook)) >= 0)
return SYSPROF_DISPLAY (gtk_notebook_get_nth_page (GTK_NOTEBOOK (self), page)); return SYSPROF_DISPLAY (gtk_notebook_get_nth_page (priv->notebook, page));
return NULL; return NULL;
} }
@ -387,6 +431,7 @@ sysprof_notebook_get_can_replay (SysprofNotebook *self)
void void
sysprof_notebook_replay (SysprofNotebook *self) sysprof_notebook_replay (SysprofNotebook *self)
{ {
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
SysprofDisplay *display; SysprofDisplay *display;
SysprofDisplay *replay; SysprofDisplay *replay;
gint page; gint page;
@ -401,15 +446,16 @@ sysprof_notebook_replay (SysprofNotebook *self)
g_return_if_fail (SYSPROF_IS_DISPLAY (replay)); g_return_if_fail (SYSPROF_IS_DISPLAY (replay));
gtk_widget_show (GTK_WIDGET (replay)); gtk_widget_show (GTK_WIDGET (replay));
gtk_container_add (GTK_CONTAINER (self), GTK_WIDGET (replay)); gtk_notebook_append_page (priv->notebook, GTK_WIDGET (replay), NULL);
page = gtk_notebook_page_num (GTK_NOTEBOOK (self), GTK_WIDGET (replay)); page = gtk_notebook_page_num (priv->notebook, GTK_WIDGET (replay));
gtk_notebook_set_current_page (GTK_NOTEBOOK (self), page); gtk_notebook_set_current_page (priv->notebook, page);
} }
void void
sysprof_notebook_add_profiler (SysprofNotebook *self, sysprof_notebook_add_profiler (SysprofNotebook *self,
SysprofProfiler *profiler) SysprofProfiler *profiler)
{ {
SysprofNotebookPrivate *priv = sysprof_notebook_get_instance_private (self);
GtkWidget *display; GtkWidget *display;
gint page; gint page;
@ -419,9 +465,9 @@ sysprof_notebook_add_profiler (SysprofNotebook *self,
display = sysprof_display_new_for_profiler (profiler); display = sysprof_display_new_for_profiler (profiler);
gtk_widget_show (display); gtk_widget_show (display);
gtk_container_add (GTK_CONTAINER (self), display); gtk_notebook_append_page (priv->notebook, GTK_WIDGET (display), NULL);
page = gtk_notebook_page_num (GTK_NOTEBOOK (self), display); page = gtk_notebook_page_num (priv->notebook, display);
gtk_notebook_set_current_page (GTK_NOTEBOOK (self), page); gtk_notebook_set_current_page (priv->notebook, page);
} }
gboolean gboolean
@ -447,9 +493,9 @@ sysprof_notebook_set_always_show_tabs (SysprofNotebook *self,
if (always_show_tabs != priv->always_show_tabs) if (always_show_tabs != priv->always_show_tabs)
{ {
priv->always_show_tabs = always_show_tabs; priv->always_show_tabs = always_show_tabs;
gtk_notebook_set_show_tabs (GTK_NOTEBOOK (self), gtk_notebook_set_show_tabs (priv->notebook,
(priv->always_show_tabs || (priv->always_show_tabs ||
gtk_notebook_get_n_pages (GTK_NOTEBOOK (self)) > 1)); gtk_notebook_get_n_pages (priv->notebook) > 1));
g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_ALWAYS_SHOW_TABS]); g_object_notify_by_pspec (G_OBJECT (self), properties [PROP_ALWAYS_SHOW_TABS]);
} }
} }

4
src/libsysprof-ui/sysprof-notebook.h
View File

@ -35,11 +35,11 @@ G_BEGIN_DECLS
#define SYSPROF_TYPE_NOTEBOOK (sysprof_notebook_get_type()) #define SYSPROF_TYPE_NOTEBOOK (sysprof_notebook_get_type())
SYSPROF_AVAILABLE_IN_ALL SYSPROF_AVAILABLE_IN_ALL
G_DECLARE_DERIVABLE_TYPE (SysprofNotebook, sysprof_notebook, SYSPROF, NOTEBOOK, GtkNotebook) G_DECLARE_DERIVABLE_TYPE (SysprofNotebook, sysprof_notebook, SYSPROF, NOTEBOOK, GtkWidget)
struct _SysprofNotebookClass struct _SysprofNotebookClass
{ {
GtkNotebookClass parent_class; GtkWidgetClass parent_class;
/*< private >*/ /*< private >*/
gpointer _reserved[16]; gpointer _reserved[16];