matteo
/
malcontent
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity

Merge branch '52-focusable' into 'main' 

restrict-applications-selector: Make rows not focusable

Closes #52

See merge request pwithnall/malcontent!146
This commit is contained in:
Georges Basile Stavracas Neto 2022-08-12 14:58:06 +00:00
parent 2f64f3865e 950abf2e44
commit e1c5b8a4fe
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libmalcontent-ui/restrict-applications-selector.c
View File

@ -357,6 +357,8 @@ create_row_for_app_cb (gpointer item,
adw_action_row_add_suffix (ADW_ACTION_ROW (row), w); adw_action_row_add_suffix (ADW_ACTION_ROW (row), w);
adw_action_row_set_activatable_widget (ADW_ACTION_ROW (row), w); adw_action_row_set_activatable_widget (ADW_ACTION_ROW (row), w);
gtk_widget_set_focusable (GTK_WIDGET (row), FALSE);
/* Fetch status from AccountService */ /* Fetch status from AccountService */
g_object_set_data (G_OBJECT (row), "GtkSwitch", w); g_object_set_data (G_OBJECT (row), "GtkSwitch", w);
g_object_set_data_full (G_OBJECT (w), "GAppInfo", g_object_ref (app), g_object_unref); g_object_set_data_full (G_OBJECT (w), "GAppInfo", g_object_ref (app), g_object_unref);

3
libmalcontent-ui/user-controls.ui
View File

@ -31,6 +31,7 @@
<!-- Set dynamically from user-controls.c: --> <!-- Set dynamically from user-controls.c: -->
<property name="subtitle">Prevents {username} from running web browsers. Limited web content may still be available in other applications.</property> <property name="subtitle">Prevents {username} from running web browsers. Limited web content may still be available in other applications.</property>
<property name="subtitle_lines">0</property> <property name="subtitle_lines">0</property>
<property name="focusable">False</property>
<child> <child>
<object class="GtkSwitch" id="restrict_web_browsers_switch"> <object class="GtkSwitch" id="restrict_web_browsers_switch">
<property name="halign">end</property> <property name="halign">end</property>
@ -79,6 +80,7 @@
<!-- Set dynamically from user-controls.c: --> <!-- Set dynamically from user-controls.c: -->
<property name="subtitle">Prevents {username} from installing applications.</property> <property name="subtitle">Prevents {username} from installing applications.</property>
<property name="subtitle_lines">0</property> <property name="subtitle_lines">0</property>
<property name="focusable">False</property>
<child> <child>
<object class="GtkSwitch" id="restrict_software_installation_switch"> <object class="GtkSwitch" id="restrict_software_installation_switch">
<property name="halign">end</property> <property name="halign">end</property>
@ -99,6 +101,7 @@
<property name="activatable_widget">oars_button</property> <property name="activatable_widget">oars_button</property>
<property name="subtitle" translatable="yes">Restricts browsing or installation of applications to applications suitable for certain ages or above.</property> <property name="subtitle" translatable="yes">Restricts browsing or installation of applications to applications suitable for certain ages or above.</property>
<property name="subtitle_lines">0</property> <property name="subtitle_lines">0</property>
<property name="focusable">False</property>
<child> <child>
<object class="GtkMenuButton" id="oars_button"> <object class="GtkMenuButton" id="oars_button">
<property name="halign">end</property> <property name="halign">end</property>