From 2f4058d7e9fdf1c467cb23d2ad17b47789e29dc7 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Tue, 3 Nov 2020 08:57:13 +1300 Subject: [PATCH] universal-access: Split cursor blinking dialog into its own widget --- .../cc-cursor-blinking-dialog.c | 83 +++++++++++ .../cc-cursor-blinking-dialog.h | 29 ++++ .../cc-cursor-blinking-dialog.ui | 124 ++++++++++++++++ panels/universal-access/cc-ua-panel.c | 24 +-- panels/universal-access/cc-ua-panel.ui | 140 ------------------ panels/universal-access/meson.build | 2 + .../universal-access.gresource.xml | 1 + po/POTFILES.in | 1 + 8 files changed, 242 insertions(+), 162 deletions(-) create mode 100644 panels/universal-access/cc-cursor-blinking-dialog.c create mode 100644 panels/universal-access/cc-cursor-blinking-dialog.h create mode 100644 panels/universal-access/cc-cursor-blinking-dialog.ui diff --git a/panels/universal-access/cc-cursor-blinking-dialog.c b/panels/universal-access/cc-cursor-blinking-dialog.c new file mode 100644 index 000000000..1cb9e91eb --- /dev/null +++ b/panels/universal-access/cc-cursor-blinking-dialog.c @@ -0,0 +1,83 @@ +/* + * Copyright 2020 Canonical Ltd. + * + * 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 2.1 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 Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include "cc-cursor-blinking-dialog.h" + +#define INTERFACE_SETTINGS "org.gnome.desktop.interface" +#define KEY_CURSOR_BLINKING "cursor-blink" +#define KEY_CURSOR_BLINKING_TIME "cursor-blink-time" + +struct _CcCursorBlinkingDialog +{ + GtkDialog parent; + + GtkScale *blink_time_scale; + GtkSwitch *enable_switch; + + GSettings *interface_settings; +}; + +G_DEFINE_TYPE (CcCursorBlinkingDialog, cc_cursor_blinking_dialog, GTK_TYPE_DIALOG); + +static void +cc_cursor_blinking_dialog_dispose (GObject *object) +{ + CcCursorBlinkingDialog *self = CC_CURSOR_BLINKING_DIALOG (object); + + g_clear_object (&self->interface_settings); + + G_OBJECT_CLASS (cc_cursor_blinking_dialog_parent_class)->dispose (object); +} + +static void +cc_cursor_blinking_dialog_class_init (CcCursorBlinkingDialogClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + object_class->dispose = cc_cursor_blinking_dialog_dispose; + + gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/universal-access/cc-cursor-blinking-dialog.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcCursorBlinkingDialog, blink_time_scale); + gtk_widget_class_bind_template_child (widget_class, CcCursorBlinkingDialog, enable_switch); +} + +static void +cc_cursor_blinking_dialog_init (CcCursorBlinkingDialog *self) +{ + gtk_widget_init_template (GTK_WIDGET (self)); + + self->interface_settings = g_settings_new (INTERFACE_SETTINGS); + + g_settings_bind (self->interface_settings, KEY_CURSOR_BLINKING, + self->enable_switch, "active", + G_SETTINGS_BIND_DEFAULT); + + g_settings_bind (self->interface_settings, KEY_CURSOR_BLINKING_TIME, + gtk_range_get_adjustment (GTK_RANGE (self->blink_time_scale)), "value", + G_SETTINGS_BIND_DEFAULT); +} + +CcCursorBlinkingDialog * +cc_cursor_blinking_dialog_new (void) +{ + return g_object_new (cc_cursor_blinking_dialog_get_type (), + "use-header-bar", TRUE, + NULL); +} diff --git a/panels/universal-access/cc-cursor-blinking-dialog.h b/panels/universal-access/cc-cursor-blinking-dialog.h new file mode 100644 index 000000000..46d5a05a4 --- /dev/null +++ b/panels/universal-access/cc-cursor-blinking-dialog.h @@ -0,0 +1,29 @@ +/* + * Copyright 2020 Canonical Ltd. + * + * 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 2.1 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 Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#pragma once + +#include + +G_BEGIN_DECLS + +G_DECLARE_FINAL_TYPE (CcCursorBlinkingDialog, cc_cursor_blinking_dialog, CC, CURSOR_BLINKING_DIALOG, GtkDialog) + +CcCursorBlinkingDialog *cc_cursor_blinking_dialog_new (void); + +G_END_DECLS diff --git a/panels/universal-access/cc-cursor-blinking-dialog.ui b/panels/universal-access/cc-cursor-blinking-dialog.ui new file mode 100644 index 000000000..7af88cfcb --- /dev/null +++ b/panels/universal-access/cc-cursor-blinking-dialog.ui @@ -0,0 +1,124 @@ + + + + + + 100 + 2500 + 1000 + 200 + 200 + + diff --git a/panels/universal-access/cc-ua-panel.c b/panels/universal-access/cc-ua-panel.c index 316408664..8604d03e3 100644 --- a/panels/universal-access/cc-ua-panel.c +++ b/panels/universal-access/cc-ua-panel.c @@ -30,6 +30,7 @@ #include "list-box-helper.h" #include "cc-ua-panel.h" #include "cc-ua-resources.h" +#include "cc-cursor-blinking-dialog.h" #include "cc-cursor-size-dialog.h" #include "cc-repeat-keys-dialog.h" #include "cc-sound-keys-dialog.h" @@ -105,9 +106,6 @@ struct _CcUaPanel { CcPanel parent_instance; - GtkDialog *cursor_blinking_dialog; - GtkWidget *cursor_blinking_scale; - GtkWidget *cursor_blinking_switch; GtkWidget *list_hearing; GtkWidget *list_pointing; GtkWidget *list_seeing; @@ -230,9 +228,6 @@ cc_ua_panel_class_init (CcUaPanelClass *klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/universal-access/cc-ua-panel.ui"); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_blinking_dialog); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_blinking_scale); - gtk_widget_class_bind_template_child (widget_class, CcUaPanel, cursor_blinking_switch); gtk_widget_class_bind_template_child (widget_class, CcUaPanel, list_hearing); gtk_widget_class_bind_template_child (widget_class, CcUaPanel, list_pointing); gtk_widget_class_bind_template_child (widget_class, CcUaPanel, list_seeing); @@ -564,7 +559,7 @@ activate_row (CcUaPanel *self, GtkListBoxRow *row) } else if (row == self->row_cursor_blinking) { - show_dialog (self, self->cursor_blinking_dialog); + run_dialog (self, GTK_DIALOG (cc_cursor_blinking_dialog_new ())); } else if (row == self->row_accessx) { @@ -717,23 +712,8 @@ cc_ua_panel_init_keyboard (CcUaPanel *self) /* Cursor Blinking */ g_signal_connect_object (self->interface_settings, "changed", G_CALLBACK (on_cursor_blinking_toggled), self, G_CONNECT_SWAPPED); - - self->toplevels = g_slist_prepend (self->toplevels, self->cursor_blinking_dialog); - - g_signal_connect (self->cursor_blinking_dialog, "delete-event", - G_CALLBACK (gtk_widget_hide_on_delete), NULL); - - sw = self->cursor_blinking_switch; - g_settings_bind (self->interface_settings, KEY_CURSOR_BLINKING, - sw, "active", - G_SETTINGS_BIND_DEFAULT); on_cursor_blinking_toggled (self); - g_settings_bind (self->interface_settings, KEY_CURSOR_BLINKING_TIME, - gtk_range_get_adjustment (GTK_RANGE (self->cursor_blinking_scale)), "value", - G_SETTINGS_BIND_DEFAULT); - - /* accessx */ g_signal_connect_object (self->kb_settings, "changed", G_CALLBACK (update_accessx_label), self, G_CONNECT_SWAPPED); diff --git a/panels/universal-access/cc-ua-panel.ui b/panels/universal-access/cc-ua-panel.ui index f19e48e29..930b16cc1 100644 --- a/panels/universal-access/cc-ua-panel.ui +++ b/panels/universal-access/cc-ua-panel.ui @@ -9,13 +9,6 @@ 100 100 - - 100 - 2500 - 1000 - 200 - 200 -