universal-access: Inline Sound Keys dialog

This can also be replaced with a simple switch
in an AdwActionRow.

panels/universal-access/cc-sound-keys-dialog.c

@@ -1,76 +0,0 @@
-/*
- * 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-sound-keys-dialog.h"
-
-#define KEYBOARD_SETTINGS            "org.gnome.desktop.a11y.keyboard"
-#define KEY_TOGGLEKEYS_ENABLED       "togglekeys-enable"
-
-struct _CcSoundKeysDialog
-{
-  GtkDialog parent;
-
-  GtkSwitch *enable_switch;
-
-  GSettings *keyboard_settings;
-};
-
-G_DEFINE_TYPE (CcSoundKeysDialog, cc_sound_keys_dialog, GTK_TYPE_DIALOG);
-
-static void
-cc_sound_keys_dialog_dispose (GObject *object)
-{
-  CcSoundKeysDialog *self = CC_SOUND_KEYS_DIALOG (object);
-
-  g_clear_object (&self->keyboard_settings);
-
-  G_OBJECT_CLASS (cc_sound_keys_dialog_parent_class)->dispose (object);
-}
-
-static void
-cc_sound_keys_dialog_class_init (CcSoundKeysDialogClass *klass)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (klass);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass);
-
-  object_class->dispose = cc_sound_keys_dialog_dispose;
-
-  gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/universal-access/cc-sound-keys-dialog.ui");
-
-  gtk_widget_class_bind_template_child (widget_class, CcSoundKeysDialog, enable_switch);
-}
-
-static void
-cc_sound_keys_dialog_init (CcSoundKeysDialog *self)
-{
-  gtk_widget_init_template (GTK_WIDGET (self));
-
-  self->keyboard_settings = g_settings_new (KEYBOARD_SETTINGS);
-
-  g_settings_bind (self->keyboard_settings, KEY_TOGGLEKEYS_ENABLED,
-                   self->enable_switch, "active",
-                   G_SETTINGS_BIND_DEFAULT);
-}
-
-CcSoundKeysDialog *
-cc_sound_keys_dialog_new (void)
-{
-  return g_object_new (cc_sound_keys_dialog_get_type (),
-                       "use-header-bar", TRUE,
-                       NULL);
-}

panels/universal-access/cc-sound-keys-dialog.h

@@ -1,29 +0,0 @@
-/*
- * 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 <gtk/gtk.h>
-
-G_BEGIN_DECLS
-
-G_DECLARE_FINAL_TYPE (CcSoundKeysDialog, cc_sound_keys_dialog, CC, SOUND_KEYS_DIALOG, GtkDialog)
-
-CcSoundKeysDialog *cc_sound_keys_dialog_new (void);
-
-G_END_DECLS

panels/universal-access/cc-sound-keys-dialog.ui

@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<interface>
-  <!-- interface-requires gtk+ 3.0 -->
-  <template class="CcSoundKeysDialog" parent="GtkDialog">
-    <property name="title" translatable="yes">Sound Keys</property>
-    <property name="resizable">False</property>
-    <property name="modal">True</property>
-    <property name="use_header_bar">1</property>
-    <child>
-      <object class="GtkBox">
-        <property name="margin_start">12</property>
-        <property name="margin_end">12</property>
-        <property name="margin_top">12</property>
-        <property name="margin_bottom">12</property>
-        <property name="orientation">vertical</property>
-        <property name="spacing">2</property>
-        <child>
-          <object class="GtkLabel">
-            <property name="margin_start">12</property>
-            <property name="margin_end">6</property>
-            <property name="margin_top">6</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">Beep when Num Lock or Caps Lock are turned on or off.</property>
-            <property name="wrap">True</property>
-          </object>
-        </child>
-        <child>
-          <object class="GtkBox">
-            <property name="margin_start">12</property>
-            <property name="margin_end">6</property>
-            <property name="margin_top">12</property>
-            <property name="margin_bottom">12</property>
-            <property name="spacing">12</property>
-            <child>
-              <object class="GtkLabel">
-                <property name="hexpand">True</property>
-                <property name="xalign">0</property>
-                <property name="label" translatable="yes">_Sound Keys</property>
-                <property name="use_underline">True</property>
-                <property name="mnemonic_widget">enable_switch</property>
-              </object>
-            </child>
-            <child>
-              <object class="GtkSwitch" id="enable_switch">
-                <property name="halign">end</property>
-              </object>
-            </child>
-          </object>
-        </child>
-      </object>
-    </child>
-  </template>
-</interface>

panels/universal-access/cc-ua-panel.c

@@ -33,7 +33,6 @@
 #include "cc-cursor-size-dialog.h"
 #include "cc-pointing-dialog.h"
 #include "cc-repeat-keys-dialog.h"
-#include "cc-sound-keys-dialog.h"
 #include "cc-typing-dialog.h"
 #include "cc-visual-alerts-dialog.h"
 #include "cc-zoom-options-dialog.h"
@@ -127,7 +126,7 @@ struct _CcUaPanel
   GtkSwitch         *screen_reader_switch;
   AdwActionRow      *screen_reader_row;
   GtkSwitch         *show_status_switch;
-  GtkLabel          *sound_keys_label;
+  GtkSwitch         *sound_keys_switch;
   AdwActionRow      *sound_keys_row;
   GtkLabel          *visual_alerts_label;
   AdwActionRow      *visual_alerts_row;
@@ -167,10 +166,6 @@ activate_row (CcUaPanel *self, AdwActionRow *row)
     {
       run_dialog (self, GTK_DIALOG (cc_cursor_size_dialog_new ()));
     }
-  else if (row == self->sound_keys_row)
-    {
-      run_dialog (self, GTK_DIALOG (cc_sound_keys_dialog_new ()));
-    }
   else if (row == self->visual_alerts_row)
     {
       run_dialog (self, GTK_DIALOG (cc_visual_alerts_dialog_new ()));
@@ -250,7 +245,7 @@ cc_ua_panel_class_init (CcUaPanelClass *klass)
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_reader_switch);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, screen_reader_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, show_status_switch);
-  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, sound_keys_label);
+  gtk_widget_class_bind_template_child (widget_class, CcUaPanel, sound_keys_switch);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, sound_keys_row);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, visual_alerts_label);
   gtk_widget_class_bind_template_child (widget_class, CcUaPanel, visual_alerts_row);
@@ -428,6 +423,11 @@ cc_ua_panel_init_seeing (CcUaPanel *self)
                    self->screen_reader_switch, "active",
                    G_SETTINGS_BIND_DEFAULT);
 
+  /* sound keys */
+
+  g_settings_bind (self->kb_settings, KEY_TOGGLEKEYS_ENABLED,
+                   self->sound_keys_switch, "active",
+                   G_SETTINGS_BIND_DEFAULT);
 
   /* cursor size */
 
@@ -444,14 +444,6 @@ cc_ua_panel_init_seeing (CcUaPanel *self)
                                 "label", G_SETTINGS_BIND_GET,
                                 on_off_label_mapping_get,
                                 NULL, NULL, NULL);
-
-  /* sound keys */
-
-  g_settings_bind_with_mapping (self->kb_settings, KEY_TOGGLEKEYS_ENABLED,
-                                self->sound_keys_label, "label",
-                                G_SETTINGS_BIND_GET,
-                                on_off_label_mapping_get,
-                                NULL, NULL, NULL);
 }
 
 /* hearing/sound section */

panels/universal-access/cc-ua-panel.ui

@@ -81,6 +81,19 @@
                 </child>
               </object>
             </child>
+            <child>
+              <object class="AdwActionRow" id="sound_keys_row">
+                <property name="title" translatable="yes">_Sound Keys</property>
+                <property name="subtitle" translatable="yes">Beep when Num Lock or Caps Lock are turned on or off.</property>
+                <property name="use-underline">True</property>
+                <property name="activatable-widget">sound_keys_switch</property>
+                <child type="suffix">
+                  <object class="GtkSwitch" id="sound_keys_switch">
+                    <property name="valign">center</property>
+                  </object>
+                </child>
+              </object>
+            </child>
             <child>
               <object class="AdwActionRow" id="cursor_size_row">
                 <property name="title" translatable="yes">C_ursor Size</property>
@@ -109,20 +122,6 @@
                 </child>
               </object>
             </child>
-            <child>
-              <object class="AdwActionRow" id="sound_keys_row">
-                <property name="title" translatable="yes">_Sound Keys</property>
-                <property name="use-underline">True</property>
-                <property name="activatable">True</property>
-                <signal name="activated" handler="activate_row" swapped="yes"/>
-                <child type="suffix">
-                  <object class="GtkLabel" id="sound_keys_label">
-                    <property name="valign">center</property>
-                    <property name="xalign">1</property>
-                  </object>
-                </child>
-              </object>
-            </child>
           </object>
         </child>
         <child>

panels/universal-access/meson.build

@@ -22,7 +22,6 @@ sources = files(
   'cc-cursor-size-dialog.c',
   'cc-pointing-dialog.c',
   'cc-repeat-keys-dialog.c',
-  'cc-sound-keys-dialog.c',
   'cc-typing-dialog.c',
   'cc-ua-panel.c',
   'cc-visual-alerts-dialog.c',
@@ -40,7 +39,6 @@ resource_data = files(
   'cc-cursor-size-dialog.ui',
   'cc-pointing-dialog.ui',
   'cc-repeat-keys-dialog.ui',
-  'cc-sound-keys-dialog.ui',
   'cc-typing-dialog.ui',
   'cc-visual-alerts-dialog.ui',
   'cc-zoom-options-dialog.ui'

panels/universal-access/universal-access.gresource.xml

@@ -5,7 +5,6 @@
     <file preprocess="xml-stripblanks">cc-cursor-size-dialog.ui</file>
     <file preprocess="xml-stripblanks">cc-pointing-dialog.ui</file>
     <file preprocess="xml-stripblanks">cc-repeat-keys-dialog.ui</file>
-    <file preprocess="xml-stripblanks">cc-sound-keys-dialog.ui</file>
     <file preprocess="xml-stripblanks">cc-typing-dialog.ui</file>
     <file preprocess="xml-stripblanks">cc-ua-panel.ui</file>
     <file preprocess="xml-stripblanks">cc-visual-alerts-dialog.ui</file>

po/POTFILES.in

@@ -225,7 +225,6 @@ panels/universal-access/cc-cursor-blinking-dialog.ui
 panels/universal-access/cc-cursor-size-dialog.ui
 panels/universal-access/cc-pointing-dialog.ui
 panels/universal-access/cc-repeat-keys-dialog.ui
-panels/universal-access/cc-sound-keys-dialog.ui
 panels/universal-access/cc-typing-dialog.ui
 panels/universal-access/cc-ua-panel.c
 panels/universal-access/cc-ua-panel.ui