diff options
author | Will Thompson <wjt@endlessos.org> | 2023-03-20 14:50:21 +0000 |
---|---|---|
committer | Will Thompson <wjt@endlessos.org> | 2023-03-20 14:50:21 +0000 |
commit | 43ce3ea58b4ec8ed511feb9f2ce9da7520bb3ea9 (patch) | |
tree | 1866529cd0b08562e07ed2baedc65e1cea1934db | |
parent | 94b6790499ceffb47f93ed91bb64bd7aa6e32015 (diff) | |
parent | b188fc57cfb7b3dd9977ad6bddcfa1035ef363ec (diff) | |
download | gnome-initial-setup-43ce3ea58b4ec8ed511feb9f2ce9da7520bb3ea9.tar.gz |
Merge branch 'wip/wjt/181-backport-to-gnome-43' into 'gnome-43'
privacy: Move subtitles to separate labels
See merge request GNOME/gnome-initial-setup!196
-rw-r--r-- | gnome-initial-setup/pages/privacy/gis-privacy-page.c | 6 | ||||
-rw-r--r-- | gnome-initial-setup/pages/privacy/gis-privacy-page.ui | 31 |
2 files changed, 33 insertions, 4 deletions
diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.c b/gnome-initial-setup/pages/privacy/gis-privacy-page.c index 3632142..21e5d48 100644 --- a/gnome-initial-setup/pages/privacy/gis-privacy-page.c +++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.c @@ -42,7 +42,7 @@ struct _GisPrivacyPagePrivate { GtkWidget *location_switch; GtkWidget *reporting_group; - GtkWidget *reporting_row; + GtkWidget *reporting_label; GtkWidget *reporting_switch; GSettings *location_settings; GSettings *privacy_settings; @@ -82,7 +82,7 @@ update_os_data (GisPrivacyPage *page) subtitle = g_strdup_printf (_("Sends technical reports that have personal information automatically " "removed. Data is collected by %s."), name); } - adw_action_row_set_subtitle (ADW_ACTION_ROW (priv->reporting_row), subtitle); + gtk_label_set_markup (GTK_LABEL (priv->reporting_label), subtitle); } static void @@ -244,7 +244,7 @@ gis_privacy_page_class_init (GisPrivacyPageClass *klass) gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (klass), "/org/gnome/initial-setup/gis-privacy-page.ui"); gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisPrivacyPage, location_switch); gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisPrivacyPage, reporting_group); - gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisPrivacyPage, reporting_row); + gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisPrivacyPage, reporting_label); gtk_widget_class_bind_template_child_private (GTK_WIDGET_CLASS (klass), GisPrivacyPage, reporting_switch); gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (klass), activate_link); diff --git a/gnome-initial-setup/pages/privacy/gis-privacy-page.ui b/gnome-initial-setup/pages/privacy/gis-privacy-page.ui index 84ea8e3..6c48d5f 100644 --- a/gnome-initial-setup/pages/privacy/gis-privacy-page.ui +++ b/gnome-initial-setup/pages/privacy/gis-privacy-page.ui @@ -25,7 +25,6 @@ <object class="AdwActionRow"> <property name="use-markup">True</property> <property name="title" translatable="yes">Location Services</property> - <property name="subtitle" translatable="yes">Allows applications to determine your geographical location. Uses the Mozilla Location Service (<a href='https://location.services.mozilla.com/privacy'>privacy policy</a>).</property> <property name="activatable-widget">location_switch</property> <child> <object class="GtkSwitch" id="location_switch"> @@ -34,11 +33,27 @@ </child> </object> </child> + <child> + <object class="GtkLabel"> + <property name="margin-top">12</property> + <property name="wrap">True</property> + <property name="wrap-mode">word-char</property> + <property name="use-markup">True</property> + <property name="ellipsize">none</property> + <property name="xalign">0.0</property> + <property name="label" translatable="yes">Allows applications to determine your geographical location. Uses the Mozilla Location Service (<a href='https://location.services.mozilla.com/privacy'>privacy policy</a>).</property> + <signal name="activate-link" handler="activate_link" object="GisPrivacyPage" swapped="no" /> + <style> + <class name="caption" /> + </style> + </object> + </child> </object> </child> <child> <object class="AdwPreferencesGroup" id="reporting_group"> + <property name="margin-top">12</property> <child> <object class="AdwActionRow" id="reporting_row"> <property name="title" translatable="yes">Automatic Problem Reporting</property> @@ -50,6 +65,20 @@ </child> </object> </child> + <child> + <object class="GtkLabel" id="reporting_label"> + <property name="margin-top">12</property> + <property name="wrap">True</property> + <property name="wrap-mode">word-char</property> + <property name="use-markup">True</property> + <property name="ellipsize">none</property> + <property name="xalign">0.0</property> + <signal name="activate-link" handler="activate_link" object="GisPrivacyPage" swapped="no" /> + <style> + <class name="caption" /> + </style> + </object> + </child> </object> </child> |