[gnome-bluetooth] lib: Remove 'can-focus' property everywhere
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-bluetooth] lib: Remove 'can-focus' property everywhere
- Date: Thu, 28 Oct 2021 15:29:59 +0000 (UTC)
commit 5c3a3df9789f56ee30f6136c37e28b1cf31c8368
Author: Georges Basile Stavracas Neto <georges stavracas gmail com>
Date: Wed Oct 27 16:12:12 2021 -0300
lib: Remove 'can-focus' property everywhere
The semantics of the 'can-focus' changed between GTK3 and GTK4, and in
fact it now breaks keyboard navigation for us. There is not a single
case here where we'd need to manually set the 'can-focus' property, so
just remove all instances of it.
lib/bluetooth-pairing-dialog.ui | 9 ---------
lib/bluetooth-settings-row.ui | 5 -----
lib/settings.ui | 30 ------------------------------
3 files changed, 44 deletions(-)
---
diff --git a/lib/bluetooth-pairing-dialog.ui b/lib/bluetooth-pairing-dialog.ui
index 9efa070f..743d53e1 100644
--- a/lib/bluetooth-pairing-dialog.ui
+++ b/lib/bluetooth-pairing-dialog.ui
@@ -3,16 +3,13 @@
<interface>
<requires lib="gtk+" version="3.12"/>
<template class="BluetoothPairingDialog" parent="GtkDialog">
- <property name="can_focus">False</property>
<child>
<object class="GtkBox" id="dialog-vbox1">
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">2</property>
<child>
<object class="GtkBox" id="pairing_dialog_box">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_start">50</property>
<property name="margin_end">50</property>
<property name="margin_top">48</property>
@@ -21,7 +18,6 @@
<child>
<object class="GtkLabel" id="help_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">Please enter the following PIN on 'Foobar':</property>
<property name="justify">center</property>
<property name="wrap">True</property>
@@ -32,18 +28,15 @@
<child>
<object class="GtkNotebook" id="pin_notebook">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_top">24</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkAspectFrame" id="aspectframe1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="GtkEntry" id="entry_pin">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="margin_start">25</property>
<property name="margin_end">25</property>
<property name="max_length">6</property>
@@ -62,7 +55,6 @@
<child>
<object class="GtkLabel" id="label_pin">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">123456</property>
<style>
<class name="pin-label"/>
@@ -72,7 +64,6 @@
<child>
<object class="GtkLabel" id="label_placeholder">
<property name="visible">True</property>
- <property name="can_focus">False</property>
</object>
</child>
</object>
diff --git a/lib/bluetooth-settings-row.ui b/lib/bluetooth-settings-row.ui
index ef94ce05..269998f3 100644
--- a/lib/bluetooth-settings-row.ui
+++ b/lib/bluetooth-settings-row.ui
@@ -4,11 +4,9 @@
<requires lib="gtk+" version="3.12"/>
<template class="BluetoothSettingsRow" parent="GtkListBoxRow">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<child>
<object class="GtkBox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_start">20</property>
<property name="margin_end">20</property>
<property name="margin_top">16</property>
@@ -16,7 +14,6 @@
<child>
<object class="GtkLabel" id="label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">center</property>
<property name="hexpand">True</property>
@@ -28,7 +25,6 @@
</child>
<child>
<object class="GtkSpinner" id="spinner">
- <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="margin_start">0</property>
@@ -38,7 +34,6 @@
<child>
<object class="GtkLabel" id="status">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="vexpand">True</property>
diff --git a/lib/settings.ui b/lib/settings.ui
index fc07eaf8..dcd27d31 100644
--- a/lib/settings.ui
+++ b/lib/settings.ui
@@ -4,7 +4,6 @@
<requires lib="gtk+" version="3.16"/>
<object class="GtkBox" id="properties_vbox">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_start">12</property>
<property name="margin_end">12</property>
<property name="margin_top">12</property>
@@ -13,13 +12,11 @@
<child>
<object class="GtkBox" id="box1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkImage" id="image">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_top">16</property>
<property name="margin_bottom">16</property>
<property name="icon_name">image-missing</property>
@@ -30,13 +27,11 @@
<child>
<object class="GtkBox" id="box2">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">18</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="connection_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Connection</property>
<property name="xalign">1</property>
<property name="mnemonic_widget">switch_connection</property>
@@ -48,34 +43,29 @@
<child>
<object class="GtkNotebook" id="connecting_notebook">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="show_tabs">False</property>
<property name="show_border">False</property>
<child>
<object class="GtkSwitch" id="switch_connection">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="halign">start</property>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">page 1</property>
</object>
</child>
<child>
<object class="GtkSpinner" id="connecting_spinner">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">start</property>
</object>
</child>
<child type="tab">
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">page 2</property>
</object>
</child>
@@ -95,13 +85,11 @@
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">18</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Paired</property>
<property name="xalign">1</property>
<property name="mnemonic_widget">paired_label</property>
@@ -113,7 +101,6 @@
<child>
<object class="GtkLabel" id="paired_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">Yes</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
@@ -127,13 +114,11 @@
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">18</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Type</property>
<property name="xalign">1</property>
<property name="mnemonic_widget">type_label</property>
@@ -145,7 +130,6 @@
<child>
<object class="GtkLabel" id="type_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">Keyboard</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
@@ -159,13 +143,11 @@
<child>
<object class="GtkBox" id="box5">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">18</property>
<property name="homogeneous">True</property>
<child>
<object class="GtkLabel" id="label6">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label" translatable="yes">Address</property>
<property name="xalign">1</property>
<property name="mnemonic_widget">address_label</property>
@@ -177,7 +159,6 @@
<child>
<object class="GtkLabel" id="address_label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="label">00:00:00:00:00</property>
<property name="selectable">True</property>
<property name="xalign">0</property>
@@ -196,7 +177,6 @@
<child>
<object class="GtkBox" id="vbox3">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="margin_bottom">6</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
@@ -204,7 +184,6 @@
<object class="GtkButton" id="mouse_button">
<property name="label" translatable="yes">_Mouse & Touchpad Settings</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
@@ -213,7 +192,6 @@
<object class="GtkButton" id="sound_button">
<property name="label" translatable="yes">_Sound Settings</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
@@ -222,7 +200,6 @@
<object class="GtkButton" id="keyboard_button">
<property name="label" translatable="yes">_Keyboard Settings</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
@@ -230,7 +207,6 @@
<child>
<object class="GtkButton" id="send_button">
<property name="label" translatable="yes">Send _Files…</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
@@ -239,7 +215,6 @@
<object class="GtkButton" id="delete_button">
<property name="label" translatable="yes">_Remove Device</property>
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
</object>
@@ -249,18 +224,15 @@
<child>
<object class="GtkLabel" id="label7">
<property name="visible">True</property>
- <property name="can_focus">False</property>
</object>
</child>
</object>
<object class="GtkScrolledWindow" id="scrolledwindow1">
<property name="visible">True</property>
- <property name="can_focus">True</property>
<property name="hscrollbar-policy">never</property>
<child>
<object class="GtkViewport" id="viewport1">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<child>
<object class="AdwClamp">
<property name="visible">True</property>
@@ -273,13 +245,11 @@
<child>
<object class="GtkBox" id="vbox_bluetooth">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="spacing">12</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="explanation-label">
<property name="visible">True</property>
- <property name="can_focus">False</property>
<property name="halign">start</property>
<property name="label">Visible as “Bastien's computer” and available for Bluetooth file
transfers. Transferred files are placed in the <a href="http://www.gnome.org">Downloads</a>
folder.</property>
<property name="use_markup">True</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
