summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColomban Wendling <[email protected]>2020-06-11 14:10:39 +0200
committerColomban Wendling <[email protected]>2020-08-06 18:42:52 +0200
commit15ed08e4e5f44314b428445024545264b4c6d16e (patch)
tree0432be1a6d9da1b0dcf4c979f74b395ca276c6d4
parentdf6ee37b38a3941e2195b152c2d49c9a3de6a862 (diff)
downloadmate-control-center-15ed08e4e5f44314b428445024545264b4c6d16e.tar.bz2
mate-control-center-15ed08e4e5f44314b428445024545264b4c6d16e.tar.xz
keyboard-a11y: Add UI for capslock-beep
Diffstat
-rw-r--r--capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui87
-rw-r--r--capplets/keyboard/mate-keyboard-properties-a11y.c3
-rw-r--r--capplets/keyboard/ui-a11y.suppr2
-rw-r--r--configure.ac2
4 files changed, 93 insertions, 1 deletions
diff --git a/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui b/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui
index ffe8819f..d092d889 100644
--- a/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui
+++ b/capplets/keyboard/mate-keyboard-properties-a11y-notifications.ui
@@ -625,6 +625,93 @@
<property name="position">4</property>
</packing>
</child>
+ <child>
+ <object class="GtkBox" id="vbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="label" translatable="yes">Caps Lock</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <child>
+ <object class="GtkLabel" id="label2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="label"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkBox" id="vbox2">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="capslock_beep_enable">
+ <property name="label" translatable="yes">Beep when pressing a key while Caps_Lock is active</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
+ <property name="halign">start</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">5</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="expand">False</property>
diff --git a/capplets/keyboard/mate-keyboard-properties-a11y.c b/capplets/keyboard/mate-keyboard-properties-a11y.c
index 301b1ee1..5f9e2492 100644
--- a/capplets/keyboard/mate-keyboard-properties-a11y.c
+++ b/capplets/keyboard/mate-keyboard-properties-a11y.c
@@ -149,6 +149,9 @@ notifications_button_clicked_cb (GtkWidget *button, GtkBuilder *dialog)
w = NWID ("togglekeys_enable");
g_settings_bind (a11y_settings, "togglekeys-enable", w, "active", G_SETTINGS_BIND_DEFAULT);
+ w = NWID ("capslock_beep_enable");
+ g_settings_bind (a11y_settings, "capslock-beep-enable", w, "active", G_SETTINGS_BIND_DEFAULT);
+
w = NWID ("stickykeys_modifier_beep");
g_settings_bind (a11y_settings, "stickykeys-modifier-beep", w, "active", G_SETTINGS_BIND_DEFAULT);
diff --git a/capplets/keyboard/ui-a11y.suppr b/capplets/keyboard/ui-a11y.suppr
index e2c2d70c..a0775acd 100644
--- a/capplets/keyboard/ui-a11y.suppr
+++ b/capplets/keyboard/ui-a11y.suppr
@@ -1,3 +1,5 @@
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label1'] orphan-label
+mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label2'] orphan-label
mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label33'] orphan-label
mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label40'] orphan-label
mate-keyboard-properties-a11y-notifications.ui://GtkLabel[@id='label47'] orphan-label
diff --git a/configure.ac b/configure.ac
index 67d53cfe..7bbc29fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -69,7 +69,7 @@ GLIB_REQUIRED=2.50.0
GTK_REQUIRED=3.22.0
MARCO_REQUIRED=1.17.0
MATEKBD_REQUIRED=1.17.0
-MATE_DESKTOP_REQUIRED=1.23.2
+MATE_DESKTOP_REQUIRED=1.25.0
APPINDICATOR_REQUIRED=0.0.13
ENGINES_FOLDER="theming-engines"
generated by cgit v1.2.1 (git 2.18.0) at 2024-06-26 08:27:33 +0000