matteo
/
malcontent
1
0
Fork 0
Code Issues Pull Requests 2 Packages Projects Releases Wiki Activity
malcontent/libmalcontent-ui/user-controls.ui

492 lines
24 KiB
Plaintext
Raw Normal View History

malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<?xml version="1.0" encoding="UTF-8"?>
malcontent-control: Reformat and rename code from gnome-control-center Make it fit in with the surrounding code style, and rename the classes to `MctCarousel` and `MctUserControls`. List them in `meson.build` and `POTFILES.in`. No other changes. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 16:16:28 +01:00
<!-- Copyright © 2018, 2019, 2020 Endless, Inc. -->
libmalcontent-ui: Explicitly state translation domains in UI files This means the strings are always translated using the correct domain, regardless of which program libmalcontent-ui is used in. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-04-27 13:11:39 +02:00
<interface domain="malcontent">
malcontent-control: Reformat and rename code from gnome-control-center Make it fit in with the surrounding code style, and rename the classes to `MctCarousel` and `MctUserControls`. List them in `meson.build` and `POTFILES.in`. No other changes. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 16:16:28 +01:00
<requires lib="gtk+" version="3.12"/>
<template class="MctUserControls" parent="GtkGrid">
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="visible">True</property>
<property name="margin-top">18</property>
<property name="row-spacing">6</property>
<property name="column-spacing">12</property>
<property name="valign">start</property>
malcontent-control: Relabel a group of controls This fits in better with the new design, and is more noun-like than verb-like. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:20:20 +01:00
<!-- Application Usage Restrictions -->
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="xalign">0.0</property>
malcontent-control: Relabel a group of controls This fits in better with the new design, and is more noun-like than verb-like. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:20:20 +01:00
<property name="label" translatable="yes">Application Usage Restrictions</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<attributes>
<attribute name="weight" value="bold" />
</attributes>
</object>
<packing>
<property name="top-attach">0</property>
<property name="left-attach">0</property>
</packing>
</child>
<child>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<object class="GtkFrame">
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="visible">True</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="can_focus">False</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="hexpand">True</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<child>
user-controls: Add separators between rows Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-14 16:48:23 +01:00
<object class="GtkListBox" id="application_usage_permissions_listbox">
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="visible">True</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="can_focus">False</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="hexpand">True</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="selection_mode">none</property>
user-controls: Make whole ‘Restrict Applications’ row activatable Previously, just the button at the end was activatable, but making the whole row activatable makes it an easier hit target. From a suggestion by Nick Richards (https://www.nedrichards.com/2020/04/endless-3.8.0-beta-1-trip-report/). Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-05-01 16:20:09 +02:00
<property name="activate-on-single-click">True</property>
<signal name="row-activated" handler="on_application_usage_permissions_listbox_activated_cb" object="MctUserControls" swapped="no" />
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin-left">12</property>
<property name="margin-right">12</property>
<property name="margin-top">8</property>
<property name="margin-bottom">8</property>
<property name="row-spacing">4</property>
<property name="column-spacing">4</property>
<child>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<object class="GtkLabel" id="restrict_web_browsers_label">
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<property name="label" translatable="yes">Restrict _Web Browsers</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="use_underline">True</property>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<property name="mnemonic_widget">restrict_web_browsers_switch</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<accessibility>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<relation target="restrict_web_browsers_switch" type="label-for"/>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<object class="GtkLabel" id="restrict_web_browsers_description">
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
user-controls: Line wrap labels rather than ellipsising The labels are too long to fit on a single line, given the default width of the user controls widget, so allow them to wrap onto multiple lines rather than unhelpfully ellipsising. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 13:09:41 +01:00
<property name="ellipsize">none</property>
<property name="wrap">True</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="xalign">0</property>
user-controls: Include user display name in the description labels This clarifies that the settings apply to that user. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 18:28:21 +01:00
<!-- Set dynamically from user-controls.c: -->
user-controls: More minor wording tweaks Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-26 12:00:28 +01:00
<property name="label">Prevents {username} from running web browsers. Limited web content may still be available in other applications.</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<attributes>
<attribute name="scale" value="0.88"/>
</attributes>
<style>
<class name="dim-label" />
</style>
<accessibility>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<relation target="restrict_web_browsers_switch" type="description-for"/>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<object class="GtkSwitch" id="restrict_web_browsers_switch">
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<signal name="notify::active" handler="on_restrict_web_browsers_switch_active_changed_cb" object="MctUserControls" swapped="no" />
<style>
<class name="restricts" />
</style>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="height">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
<child>
user-controls: Make whole ‘Restrict Applications’ row activatable Previously, just the button at the end was activatable, but making the whole row activatable makes it an easier hit target. From a suggestion by Nick Richards (https://www.nedrichards.com/2020/04/endless-3.8.0-beta-1-trip-report/). Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-05-01 16:20:09 +02:00
<object class="GtkListBoxRow" id="restrict_applications_row">
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="visible">True</property>
<property name="can_focus">True</property>
user-controls: Make whole ‘Restrict Applications’ row activatable Previously, just the button at the end was activatable, but making the whole row activatable makes it an easier hit target. From a suggestion by Nick Richards (https://www.nedrichards.com/2020/04/endless-3.8.0-beta-1-trip-report/). Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-05-01 16:20:09 +02:00
<property name="activatable">True</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="selectable">False</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin-left">12</property>
<property name="margin-right">12</property>
<property name="margin-top">8</property>
<property name="margin-bottom">8</property>
<property name="row-spacing">4</property>
<property name="column-spacing">4</property>
<child>
<object class="GtkLabel" id="restrict_applications_label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">_Restrict Applications</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">restrict_applications_button</property>
<accessibility>
<relation target="restrict_applications_button" type="label-for"/>
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="restrict_applications_description">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
user-controls: Line wrap labels rather than ellipsising The labels are too long to fit on a single line, given the default width of the user controls widget, so allow them to wrap onto multiple lines rather than unhelpfully ellipsising. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 13:09:41 +01:00
<property name="ellipsize">none</property>
<property name="wrap">True</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="xalign">0</property>
user-controls: Include user display name in the description labels This clarifies that the settings apply to that user. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 18:28:21 +01:00
<!-- Set dynamically from user-controls.c: -->
<property name="label">Prevents specified applications from being used by {username}.</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<attributes>
<attribute name="scale" value="0.88"/>
</attributes>
<style>
<class name="dim-label" />
</style>
<accessibility>
<relation target="restrict_applications_button" type="description-for"/>
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="restrict_applications_button">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
<property name="relief">none</property>
<signal name="clicked" handler="on_restrict_applications_button_clicked_cb" object="MctUserControls" swapped="no" />
<child>
<object class="GtkImage">
<property name="visible">True</property>
user-controls: Fix icon for ‘Restrict Applications’ button Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-14 16:21:58 +01:00
<property name="icon-name">go-next-symbolic</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="icon-size">4</property><!-- GTK_ICON_SIZE_BUTTON -->
</object>
</child>
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="height">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
</object>
</child>
</object>
<packing>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="top-attach">1</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="left-attach">0</property>
</packing>
</child>
malcontent-control: Relabel a group of controls This fits in better with the new design, and is more noun-like than verb-like. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:20:20 +01:00
<!-- Software Installation Restrictions -->
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<child>
<object class="GtkLabel">
<property name="visible">True</property>
<property name="margin-top">12</property>
<property name="xalign">0.0</property>
malcontent-control: Relabel a group of controls This fits in better with the new design, and is more noun-like than verb-like. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:20:20 +01:00
<property name="label" translatable="yes">Software Installation Restrictions</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<attributes>
<attribute name="weight" value="bold" />
</attributes>
</object>
<packing>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="top-attach">2</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="left-attach">0</property>
</packing>
</child>
<child>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<object class="GtkFrame">
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="visible">True</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="can_focus">False</property>
<property name="hexpand">True</property>
<property name="label_xalign">0</property>
<property name="shadow_type">in</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<child>
user-controls: Add separators between rows Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-14 16:48:23 +01:00
<object class="GtkListBox" id="software_installation_permissions_listbox">
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="visible">True</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="can_focus">False</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="hexpand">True</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="selection_mode">none</property>
<property name="activate_on_single_click">False</property>
<child>
<object class="GtkListBoxRow">
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<property name="visible" bind-source="restrict_software_installation_switch" bind-property="visible" bind-flags="default|sync-create" />
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin-left">12</property>
<property name="margin-right">12</property>
<property name="margin-top">8</property>
<property name="margin-bottom">8</property>
<property name="row-spacing">4</property>
<property name="column-spacing">4</property>
<child>
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<object class="GtkLabel" id="restrict_software_installation_label">
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
user-controls: Relabel ‘allow installation’ as ‘restrict installation’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:44:15 +01:00
<property name="label" translatable="yes">Restrict Application _Installation</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="use_underline">True</property>
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<property name="mnemonic_widget">restrict_software_installation_switch</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<accessibility>
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<relation target="restrict_software_installation_switch" type="label-for"/>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<object class="GtkLabel" id="restrict_software_installation_description">
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
user-controls: Line wrap labels rather than ellipsising The labels are too long to fit on a single line, given the default width of the user controls widget, so allow them to wrap onto multiple lines rather than unhelpfully ellipsising. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 13:09:41 +01:00
<property name="ellipsize">none</property>
<property name="wrap">True</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="xalign">0</property>
user-controls: Include user display name in the description labels This clarifies that the settings apply to that user. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 18:28:21 +01:00
<!-- Set dynamically from user-controls.c: -->
<property name="label">Prevents {username} from installing applications.</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<attributes>
<attribute name="scale" value="0.88"/>
</attributes>
<style>
<class name="dim-label" />
</style>
<accessibility>
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<relation target="restrict_software_installation_switch" type="description-for"/>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<object class="GtkSwitch" id="restrict_software_installation_switch">
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
user-controls: Relabel ‘allow installation’ as ‘restrict installation’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:44:15 +01:00
<signal name="notify::active" handler="on_restrict_installation_switch_active_changed_cb" object="MctUserControls" swapped="no" />
<style>
<class name="restricts" />
</style>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="height">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<child>
<object class="GtkListBoxRow">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="activatable">False</property>
<property name="selectable">False</property>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="valign">center</property>
<property name="margin-left">12</property>
<property name="margin-right">12</property>
<property name="margin-top">8</property>
<property name="margin-bottom">8</property>
<property name="row-spacing">4</property>
<property name="column-spacing">4</property>
<child>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<object class="GtkLabel" id="oars_label">
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
<property name="ellipsize">end</property>
<property name="xalign">0</property>
<property name="label" translatable="yes">Application _Suitability</property>
<property name="use_underline">True</property>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<property name="mnemonic_widget">oars_button</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<accessibility>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<relation target="oars_button" type="label-for"/>
<relation target="oars_button" type="flows-to"/>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">0</property>
</packing>
</child>
<child>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<object class="GtkLabel" id="oars_description">
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="hexpand">True</property>
user-controls: Line wrap labels rather than ellipsising The labels are too long to fit on a single line, given the default width of the user controls widget, so allow them to wrap onto multiple lines rather than unhelpfully ellipsising. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 13:09:41 +01:00
<property name="ellipsize">none</property>
<property name="wrap">True</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="xalign">0</property>
user-controls: More minor wording tweaks Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-26 12:00:28 +01:00
<property name="label" translatable="yes">Restricts browsing or installation of applications to applications suitable for certain ages or above.</property>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<attributes>
<attribute name="scale" value="0.88"/>
</attributes>
<style>
<class name="dim-label" />
</style>
<accessibility>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<relation target="oars_button" type="description-for"/>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
</accessibility>
</object>
<packing>
<property name="left-attach">0</property>
<property name="top-attach">1</property>
</packing>
</child>
<child>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<object class="GtkMenuButton" id="oars_button">
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">end</property>
<property name="valign">center</property>
user-controls: Make OARS drop down open to the right On laptops which have a 1366 by 768 display, in gnome-initial-setup the OARS dropdown is cut off by the edge of the screen. Only the first couple entries are visible. So make it open to the right instead, where more room is available.
2020-03-13 19:32:11 +01:00
<property name="direction">right</property>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<property name="popover">oars_popover</property>
user-controls: Add a drop-down arrow next to the OARS age selector To make it more obvious that it triggers a drop-down menu. Potentially, this should be a `GtkComboBox` rather than reinventing the wheel using a `GtkMenuButton` — but that’s a change for another day. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-14 16:23:10 +01:00
<child>
<object class="GtkBox">
<property name="visible">True</property>
<property name="orientation">horizontal</property>
<child>
<object class="GtkLabel" id="oars_button_label">
<property name="visible">True</property>
<property name="label"></property>
<property name="expand">True</property>
user-controls: Left-align the OARS drop-down text Make it look more and more like a combo box. This widget really should have been a combo box to begin with. We’re eventually going to end up re-implementing a combo box from first principles at this rate. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-26 12:00:41 +01:00
<property name="halign">start</property>
<property name="xalign">0.0</property>
user-controls: Add a drop-down arrow next to the OARS age selector To make it more obvious that it triggers a drop-down menu. Potentially, this should be a `GtkComboBox` rather than reinventing the wheel using a `GtkMenuButton` — but that’s a change for another day. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-14 16:23:10 +01:00
</object>
</child>
<child>
<object class="GtkImage">
<property name="visible">True</property>
<property name="icon-name">pan-down-symbolic</property>
<property name="icon-size">4</property><!-- GTK_ICON_SIZE_BUTTON -->
</object>
</child>
</object>
</child>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
</object>
<packing>
<property name="left-attach">1</property>
<property name="top-attach">0</property>
<property name="height">2</property>
</packing>
</child>
</object>
</child>
</object>
</child>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
</object>
</child>
</object>
<packing>
malcontent-control: Redesign other controls on main window Following the redesign of the app filter controls, redesign the rest of the controls on the window to match the list-box-like new style. This doesn’t change their functionality. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:26:14 +01:00
<property name="top-attach">3</property>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<property name="left-attach">0</property>
</packing>
</child>
</template>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<object class="GtkPopoverMenu" id="oars_popover">
malcontent-control: Add basic accessibility support to g-c-c widgets Not submitting this upstream as it hasn’t been tested thoroughly enough. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-13 15:31:39 +01:00
<accessibility>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<relation target="oars_button" type="popup-for"/>
malcontent-control: Add basic accessibility support to g-c-c widgets Not submitting this upstream as it hasn’t been tested thoroughly enough. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-13 15:31:39 +01:00
</accessibility>
</object>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
<menu id="age_menu" />
<object class="GtkSizeGroup">
<property name="mode">horizontal</property>
<widgets>
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<widget name="oars_button" />
<widget name="oars_popover" />
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
</widgets>
</object>
<object class="GtkSizeGroup">
<property name="mode">horizontal</property>
<widgets>
user-controls: Relabel ‘allow web browsers’ as ‘restrict web browsers’ This is part of a move to make all the controls restrictive, rather than permissive. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-24 17:34:37 +01:00
<widget name="restrict_web_browsers_label" />
<widget name="restrict_web_browsers_description" />
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<widget name="restrict_applications_label" />
<widget name="restrict_applications_description" />
user-controls: Rename OARS widget variables to be more descriptive This doesn’t introduce any functional changes. Signed-off-by: Philip Withnall <withnall@endlessm.com> Helps: #11
2020-02-25 11:41:30 +01:00
<widget name="oars_label" />
malcontent-control: Drop ‘Restrict Application Installation for Others’ This simplifies the UI, as nobody really understood the difference between ‘Restrict Application Installation’ and ‘Restrict Application Installation for Others’. Now there’s just a ‘Restrict Application Installation’ checkbox, which controls application installation in the home and system flatpak repos. The underlying app-filter representation in libmalcontent still supports restricting installation to them separately, but the UI will always set them to the same value. There is a suggestion that we may want to support user repos again in future iff the user has added a remote to their user repo. However, figuring that out for other users (which is what the admin would have to do when setting this all up) starts to get tricky with permissions for reading other users’ home directories. Skip that for the moment — we can reconsider adding that option in future if someone argues a case for it. Signed-off-by: Philip Withnall <pwithnall@endlessos.org> Fixes: #30
2020-11-15 18:31:21 +01:00
<widget name="restrict_software_installation_label" />
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
</widgets>
</object>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<object class="MctRestrictApplicationsDialog" id="restrict_applications_dialog">
<property name="visible">False</property>
<property name="modal">True</property>
malcontent-control: Fix use-after-free when closing Sometimes, when closing the application, `flush_update_blacklisted_apps()` would be called after `MctRestrictApplicationsSelector` had been destroyed, leading to a critical. This was because the `MctRestrictApplicationsDialog` was being disposed early due to its `destroy-with-parent` property being set. The dispose function of `MctUserControls` was run several times due to GTK calling `g_object_run_dispose()`, and the critical would be emitted the second time. Make the dispose function’s call to `flush_update_blacklisted_apps()` be safe for multiple dispose calls, and ensure the dialog isn’t destroyed too early. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-29 18:37:12 +01:00
<property name="destroy-with-parent">False</property>
malcontent-control: Move the app restrictions into a separate dialogue Rather than having a scrollable listbox within a scrollable list of widgets, move the listbox out to a separate dialogue. This involves separating out all the code to query the apps, to get and to set the app filter, from `MctUserControls` out into the new `MctRestrictApplicationsSelector`. Most of it is unchanged, aside from its interaction with the filter: the filter is now provided to the widget by the calling code, rather than being queried by the widget itself. The widget’s status can be queried into an `MctAppFilterBuilder`, rather than being used to set the app filter directly. This commit redesigns the appearance of the relevant widgets in the main window so that they follow the new list-box-like visual design. A following commit will apply similar changes to the other widgest in the main screen. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-28 15:16:40 +01:00
<property name="use-header-bar">1</property>
<signal name="delete-event" handler="on_restrict_applications_dialog_delete_event_cb" />
<signal name="response" handler="on_restrict_applications_dialog_response_cb" />
</object>
malcontent-control: Add widgets from gnome-control-center Add `CcCarousel` and `CcAppPermissions` from gnome-control-center and rename the files. None of the contents of the files have been changed yet. The files are from git master of gnome-control-center on 2020-01-08. `carousel.{c,h,ui}` are licensed under GPLv2+, and are copyright 2016 Red Hat, Inc. The original author was Felipe Borges. `user-controls.{c,h,ui}` are licensed under GPLv3+, and are copyright 2018, 2019 Endless, Inc. `gs-content-rating.{c,h}` are originally from gnome-software, are licensed under GPLv2+, and are copyright 2015, 2016 Richard Hughes. He was also the original author. These files are needed by `user-controls.{c,h}`. `user-image.{c,h}` are licensed under GPLv2+ and are copyright 2015, Red Hat, Inc. The original author was Ondrej Holy. This code will not stay as copy-paste code for too long. The ultimate plan is to rework most of the widgets: • `CcCarousel`: Will be reworked to provide more information about the screen time usage of each user. It will become a summary widget as well as a selector. • `GsContentRating`: Will be abstracted out into libappstream-glib, or some other suitable library, where its implementation can be shared between gnome-software and malcontent. • `CcUserControls`: Will be reworked as the UI of malcontent evolves. Will also be removed from gnome-control-center once malcontent-control is released. • `CcUserImage`: As per `CcCarousel`, this will evolve into a new widget. Signed-off-by: Philip Withnall <withnall@endlessm.com>
2020-01-08 14:56:58 +01:00
</interface>