diff --git a/panels/info-overview/gnome-info-overview-panel.desktop.in b/panels/info-overview/gnome-info-overview-panel.desktop.in
deleted file mode 100644
index c2d71d9b9..000000000
--- a/panels/info-overview/gnome-info-overview-panel.desktop.in
+++ /dev/null
@@ -1,18 +0,0 @@
-[Desktop Entry]
-Name=About
-Comment=View information about your system
-Exec=gnome-control-center info-overview
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
-Icon=org.gnome.Settings-about-symbolic
-Terminal=false
-Type=Application
-NoDisplay=true
-StartupNotify=true
-Categories=GNOME;GTK;Settings;X-GNOME-Settings-Panel;X-GNOME-DetailsSettings;
-OnlyShowIn=GNOME;Unity;
-# Translators: Search terms to find the About panel.
-# Do NOT translate or localize the semicolons!
-# The list MUST also end with a semicolon!
-# "Preferred Applications" is the old name for the preference, so make
-# sure that you use the same "translation" for those keywords
-Keywords=device;system;information;hostname;memory;processor;version;default;application;preferred;cd;dvd;usb;audio;video;disc;removable;media;autorun;
diff --git a/panels/info-overview/info-overview.gresource.xml b/panels/info-overview/info-overview.gresource.xml
deleted file mode 100644
index f17effa2b..000000000
--- a/panels/info-overview/info-overview.gresource.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
- cc-info-overview-panel.ui
- cc-info-entry.ui
- cc-system-details-window.ui
-
-
diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build
deleted file mode 100644
index af5213bf3..000000000
--- a/panels/info-overview/meson.build
+++ /dev/null
@@ -1,75 +0,0 @@
-panels_list += cappletname
-desktop = 'gnome-@0@-panel.desktop'.format(cappletname)
-
-i18n.merge_file(
- type: 'desktop',
- input: desktop + '.in',
- output: desktop,
- po_dir: po_dir,
- install: true,
- install_dir: control_center_desktopdir
-)
-
-cflags += [
- '-DDATADIR="@0@"'.format(control_center_datadir),
- '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir),
-]
-
-sources = files(
- 'cc-info-overview-panel.c',
- 'cc-system-details-window.c',
- 'cc-info-entry.c',
- 'info-cleanup.c'
-)
-
-sources += gnome.compile_resources(
- 'cc-' + cappletname + '-resources',
- cappletname + '.gresource.xml',
- c_name: 'cc_' + cappletname.underscorify (),
- export: true
-)
-
-deps = common_deps + [
- dependency('udisks2', version: '>= 2.8.2'),
- dependency('libgtop-2.0'),
- gudev_dep,
-]
-
-info_panel_lib = static_library(
- cappletname,
- sources: sources,
- include_directories: [ top_inc, common_inc ],
- dependencies: deps,
- c_args: cflags
-)
-panels_libs += info_panel_lib
-
-print_renderer_deps = [
- dependency('gtk4'),
- epoxy_dep
-]
-
-executable(
- 'test-info-cleanup',
- [ 'info-cleanup.c', 'test-info-cleanup.c' ],
- include_directories: [ top_inc ],
- dependencies: [ print_renderer_deps ],
- c_args: cflags,
-)
-
-executable(
- 'gnome-control-center-print-renderer',
- 'gnome-control-center-print-renderer.c',
- include_directories: [ top_inc ],
- dependencies: [ print_renderer_deps ],
- c_args: cflags,
- install: true,
- install_dir: control_center_libexecdir,
-)
-
-install_data(
- [ 'gnome-logo-text.svg', 'gnome-logo-text-dark.svg' ],
- install_dir: join_paths(control_center_datadir, 'icons')
-)
-
-subdir('icons')
diff --git a/panels/meson.build b/panels/meson.build
index 219c89815..89165761d 100644
--- a/panels/meson.build
+++ b/panels/meson.build
@@ -6,7 +6,6 @@ panels = [
'color',
'datetime',
'display',
- 'info-overview',
'keyboard',
'mouse',
'multitasking',
diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/system/about/cc-about-page.c
similarity index 78%
rename from panels/info-overview/cc-info-overview-panel.c
rename to panels/system/about/cc-about-page.c
index 700df61d2..80969f0bf 100644
--- a/panels/info-overview/cc-info-overview-panel.c
+++ b/panels/system/about/cc-about-page.c
@@ -20,21 +20,17 @@
*
*/
-#include
-
+#include "cc-about-page.h"
#include "cc-hostname-entry.h"
-
-#include "cc-info-overview-resources.h"
-
-#include
-
#include "cc-list-row.h"
#include "cc-system-details-window.h"
-#include "cc-info-overview-panel.h"
-struct _CcInfoOverviewPanel
+#include
+#include
+
+struct _CcAboutPage
{
- CcPanel parent_instance;
+ AdwNavigationPage parent_instance;
CcListRow *disk_row;
CcListRow *hardware_model_row;
@@ -47,10 +43,10 @@ struct _CcInfoOverviewPanel
GtkWindow *system_details_window;
};
-G_DEFINE_TYPE (CcInfoOverviewPanel, cc_info_overview_panel, CC_TYPE_PANEL)
+G_DEFINE_TYPE (CcAboutPage, cc_about_page, ADW_TYPE_NAVIGATION_PAGE)
static void
-info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
+about_page_setup_overview (CcAboutPage *self)
{
guint64 ram_size;
g_autofree char *memory_text = NULL;
@@ -81,7 +77,7 @@ info_overview_panel_setup_overview (CcInfoOverviewPanel *self)
os_name_text = get_os_name ();
cc_list_row_set_secondary_label (self->os_name_row, os_name_text);
- self->system_details_window = GTK_WINDOW (cc_system_details_window_new());
+ self->system_details_window = GTK_WINDOW (cc_system_details_window_new ());
parent = (GtkWindow *) gtk_widget_get_native (GTK_WIDGET (self));
gtk_window_set_transient_for (GTK_WINDOW (self->system_details_window), parent);
}
@@ -123,18 +119,17 @@ does_gpk_update_viewer_exist (void)
}
static void
-cc_info_panel_open_system_details (CcInfoOverviewPanel *self)
+cc_about_page_open_system_details (CcAboutPage *self)
{
- GtkWidget *parent;
-
- parent = cc_shell_get_toplevel (cc_panel_get_shell (CC_PANEL (self)));
+ GtkNative *parent;
+ parent = gtk_widget_get_native (GTK_WIDGET (self));
gtk_window_set_transient_for (self->system_details_window, GTK_WINDOW (parent));
gtk_window_present (GTK_WINDOW (self->system_details_window));
}
static void
-cc_info_panel_open_software_update (CcInfoOverviewPanel *self)
+cc_about_page_open_software_update (CcAboutPage *self)
{
g_autoptr(GError) error = NULL;
gboolean ret;
@@ -158,7 +153,7 @@ cc_info_panel_open_software_update (CcInfoOverviewPanel *self)
#if !defined(DISTRIBUTOR_LOGO) || defined(DARK_MODE_DISTRIBUTOR_LOGO)
static gboolean
-use_dark_theme (CcInfoOverviewPanel *self)
+use_dark_theme (CcAboutPage *self)
{
AdwStyleManager *style_manager = adw_style_manager_get_default ();
@@ -167,7 +162,7 @@ use_dark_theme (CcInfoOverviewPanel *self)
#endif
static void
-setup_os_logo (CcInfoOverviewPanel *self)
+setup_os_logo (CcAboutPage *self)
{
#ifdef DISTRIBUTOR_LOGO
#ifdef DARK_MODE_DISTRIBUTOR_LOGO
@@ -211,50 +206,41 @@ setup_os_logo (CcInfoOverviewPanel *self)
}
static void
-cc_info_overview_panel_class_init (CcInfoOverviewPanelClass *klass)
+cc_about_page_class_init (CcAboutPageClass *klass)
{
GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
g_type_ensure (CC_TYPE_HOSTNAME_ENTRY);
- gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/info-overview/cc-info-overview-panel.ui");
+ gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/system/about/cc-about-page.ui");
- gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, disk_row);
- gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, hardware_model_row);
- gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, memory_row);
- gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, os_logo);
- gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, os_name_row);
- gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, processor_row);
- gtk_widget_class_bind_template_child (widget_class, CcInfoOverviewPanel, software_updates_group);
+ gtk_widget_class_bind_template_child (widget_class, CcAboutPage, disk_row);
+ gtk_widget_class_bind_template_child (widget_class, CcAboutPage, hardware_model_row);
+ gtk_widget_class_bind_template_child (widget_class, CcAboutPage, memory_row);
+ gtk_widget_class_bind_template_child (widget_class, CcAboutPage, os_logo);
+ gtk_widget_class_bind_template_child (widget_class, CcAboutPage, os_name_row);
+ gtk_widget_class_bind_template_child (widget_class, CcAboutPage, processor_row);
+ gtk_widget_class_bind_template_child (widget_class, CcAboutPage, software_updates_group);
- gtk_widget_class_bind_template_callback (widget_class, cc_info_panel_open_software_update);
- gtk_widget_class_bind_template_callback (widget_class, cc_info_panel_open_system_details);
+ gtk_widget_class_bind_template_callback (widget_class, cc_about_page_open_software_update);
+ gtk_widget_class_bind_template_callback (widget_class, cc_about_page_open_system_details);
g_type_ensure (CC_TYPE_LIST_ROW);
}
static void
-cc_info_overview_panel_init (CcInfoOverviewPanel *self)
+cc_about_page_init (CcAboutPage *self)
{
AdwStyleManager *style_manager;
gtk_widget_init_template (GTK_WIDGET (self));
- g_resources_register (cc_info_overview_get_resource ());
-
if ((!does_gnome_software_exist () || !does_gnome_software_allow_updates ()) && !does_gpk_update_viewer_exist ())
gtk_widget_set_visible (GTK_WIDGET (self->software_updates_group), FALSE);
- info_overview_panel_setup_overview (self);
+ about_page_setup_overview (self);
style_manager = adw_style_manager_get_default ();
g_signal_connect_swapped (style_manager, "notify::dark", G_CALLBACK (setup_os_logo), self);
setup_os_logo (self);
}
-
-GtkWidget *
-cc_info_overview_panel_new (void)
-{
- return g_object_new (CC_TYPE_INFO_OVERVIEW_PANEL,
- NULL);
-}
diff --git a/panels/info-overview/cc-info-overview-panel.h b/panels/system/about/cc-about-page.h
similarity index 79%
rename from panels/info-overview/cc-info-overview-panel.h
rename to panels/system/about/cc-about-page.h
index 78a678583..cadd8a814 100644
--- a/panels/info-overview/cc-info-overview-panel.h
+++ b/panels/system/about/cc-about-page.h
@@ -23,9 +23,7 @@
G_BEGIN_DECLS
-#define CC_TYPE_INFO_OVERVIEW_PANEL (cc_info_overview_panel_get_type ())
-G_DECLARE_FINAL_TYPE (CcInfoOverviewPanel, cc_info_overview_panel, CC, INFO_OVERVIEW_PANEL, CcPanel)
-
-GtkWidget *cc_info_overview_panel_new (void);
+#define CC_TYPE_ABOUT_PAGE (cc_about_page_get_type ())
+G_DECLARE_FINAL_TYPE (CcAboutPage, cc_about_page, CC, ABOUT_PAGE, AdwNavigationPage)
G_END_DECLS
diff --git a/panels/info-overview/cc-info-overview-panel.ui b/panels/system/about/cc-about-page.ui
similarity index 92%
rename from panels/info-overview/cc-info-overview-panel.ui
rename to panels/system/about/cc-about-page.ui
index 989840fd1..f3f599482 100644
--- a/panels/info-overview/cc-info-overview-panel.ui
+++ b/panels/system/about/cc-about-page.ui
@@ -1,6 +1,8 @@
-
+
+ About
+ system-about-page