diff --git a/src/sysprof/meson.build b/src/sysprof/meson.build index 153eaaf6..ca40c456 100644 --- a/src/sysprof/meson.build +++ b/src/sysprof/meson.build @@ -18,6 +18,7 @@ sysprof_deps = [ libsysprof_dep, libsysprof_ui_dep, dependency('pangoft2', required: false), + dependency('libadwaita-1'), ] sysprof = executable('sysprof', sysprof_resources + sysprof_sources, diff --git a/src/sysprof/sysprof-application.c b/src/sysprof/sysprof-application.c index f30bc82f..22b0b16b 100644 --- a/src/sysprof/sysprof-application.c +++ b/src/sysprof/sysprof-application.c @@ -27,10 +27,10 @@ struct _SysprofApplication { - GtkApplication parent_instance; + AdwApplication parent_instance; }; -G_DEFINE_TYPE (SysprofApplication, sysprof_application, GTK_TYPE_APPLICATION) +G_DEFINE_TYPE (SysprofApplication, sysprof_application, ADW_TYPE_APPLICATION) struct { const gchar *action_name; diff --git a/src/sysprof/sysprof-application.h b/src/sysprof/sysprof-application.h index dfcef56a..4c825395 100644 --- a/src/sysprof/sysprof-application.h +++ b/src/sysprof/sysprof-application.h @@ -18,13 +18,13 @@ #pragma once -#include +#include G_BEGIN_DECLS #define SYSPROF_TYPE_APPLICATION (sysprof_application_get_type()) -G_DECLARE_FINAL_TYPE (SysprofApplication, sysprof_application, SYSPROF, APPLICATION, GtkApplication) +G_DECLARE_FINAL_TYPE (SysprofApplication, sysprof_application, SYSPROF, APPLICATION, AdwApplication) SysprofApplication *sysprof_application_new (void); diff --git a/src/sysprof/sysprof-window.c b/src/sysprof/sysprof-window.c index 5f66ca12..0cf65524 100644 --- a/src/sysprof/sysprof-window.c +++ b/src/sysprof/sysprof-window.c @@ -31,7 +31,7 @@ struct _SysprofWindow { - GtkApplicationWindow parent_instance; + AdwApplicationWindow parent_instance; EggBindingGroup *bindings; @@ -40,7 +40,7 @@ struct _SysprofWindow GtkMenuButton *menu_button; }; -G_DEFINE_TYPE (SysprofWindow, sysprof_window, GTK_TYPE_APPLICATION_WINDOW) +G_DEFINE_TYPE (SysprofWindow, sysprof_window, ADW_TYPE_APPLICATION_WINDOW) /** * sysprof_window_new: diff --git a/src/sysprof/sysprof-window.h b/src/sysprof/sysprof-window.h index 1def9343..e0ca3ce5 100644 --- a/src/sysprof/sysprof-window.h +++ b/src/sysprof/sysprof-window.h @@ -20,13 +20,15 @@ #pragma once +#include + #include "sysprof-application.h" G_BEGIN_DECLS #define SYSPROF_TYPE_WINDOW (sysprof_window_get_type()) -G_DECLARE_FINAL_TYPE (SysprofWindow, sysprof_window, SYSPROF, WINDOW, GtkApplicationWindow) +G_DECLARE_FINAL_TYPE (SysprofWindow, sysprof_window, SYSPROF, WINDOW, AdwApplicationWindow) GtkWidget *sysprof_window_new (SysprofApplication *application); void sysprof_window_new_tab (SysprofWindow *self); diff --git a/src/sysprof/sysprof-window.ui b/src/sysprof/sysprof-window.ui index 01fab152..3cad5f4d 100644 --- a/src/sysprof/sysprof-window.ui +++ b/src/sysprof/sysprof-window.ui @@ -1,54 +1,61 @@ -