malcontent-control: Use HdyWindow and HdyHeaderBar

This commit is contained in:
Christopher Davis 2021-02-08 03:27:59 -08:00 committed by Georges Basile Stavracas Neto
parent f11d91da3a
commit d80ed10592
3 changed files with 265 additions and 255 deletions

View File

@ -27,6 +27,7 @@
#include <glib/gi18n-lib.h> #include <glib/gi18n-lib.h>
#include <gio/gio.h> #include <gio/gio.h>
#include <gtk/gtk.h> #include <gtk/gtk.h>
#include <libhandy-1/handy.h>
#include <libmalcontent-ui/malcontent-ui.h> #include <libmalcontent-ui/malcontent-ui.h>
#include <polkit/polkit.h> #include <polkit/polkit.h>
@ -250,6 +251,8 @@ mct_application_startup (GApplication *application)
/* Chain up. */ /* Chain up. */
G_APPLICATION_CLASS (mct_application_parent_class)->startup (application); G_APPLICATION_CLASS (mct_application_parent_class)->startup (application);
hdy_init ();
g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries, g_action_map_add_action_entries (G_ACTION_MAP (application), app_entries,
G_N_ELEMENTS (app_entries), application); G_N_ELEMENTS (app_entries), application);

View File

@ -2,11 +2,15 @@
<!-- Copyright © 2019, 2020 Endless Mobile, Inc. --> <!-- Copyright © 2019, 2020 Endless Mobile, Inc. -->
<interface> <interface>
<requires lib="gtk+" version="3.12"/> <requires lib="gtk+" version="3.12"/>
<object class="GtkApplicationWindow" id="main_window"> <object class="HdyApplicationWindow" id="main_window">
<property name="default-width">540</property> <property name="default-width">540</property>
<property name="default-height">580</property> <property name="default-height">580</property>
<child type="titlebar"> <child>
<object class="GtkHeaderBar" id="header"> <object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">vertical</property>
<child>
<object class="HdyHeaderBar" id="header">
<property name="show-close-button">True</property> <property name="show-close-button">True</property>
<!-- Translators: This is the title of the main window --> <!-- Translators: This is the title of the main window -->
<property name="title" translatable="yes">Parental Controls</property> <property name="title" translatable="yes">Parental Controls</property>
@ -197,7 +201,7 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="justify">center</property> <property name="justify">center</property>
<property name="label" translatable="yes">Parental controls can only be applied to standard user <property name="label" translatable="yes">Parental controls can only be applied to standard user
accounts. These can be created in the user settings.</property> accounts. These can be created in the user settings.</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<child internal-child="accessible"> <child internal-child="accessible">
<object class="AtkObject"> <object class="AtkObject">
@ -297,6 +301,8 @@ accounts. These can be created in the user settings.</property>
</object> </object>
</child> </child>
</object> </object>
</child>
</object>
<menu id="primary-menu"> <menu id="primary-menu">
<section> <section>

View File

@ -28,6 +28,7 @@ malcontent_control = executable('malcontent-control',
dependency('glib-2.0', version: '>= 2.54.2'), dependency('glib-2.0', version: '>= 2.54.2'),
dependency('gobject-2.0', version: '>= 2.54'), dependency('gobject-2.0', version: '>= 2.54'),
dependency('gtk+-3.0'), dependency('gtk+-3.0'),
dependency('libhandy-1', version: '>=1.1.0'),
dependency('polkit-gobject-1'), dependency('polkit-gobject-1'),
libmalcontent_dep, libmalcontent_dep,
libmalcontent_ui_dep, libmalcontent_ui_dep,