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

Merge branch '11-more-ui-tweaks' into 'master' 

More small UI tweaks

Closes #11

See merge request pwithnall/malcontent!34
This commit is contained in:
Philip Withnall 2020-02-27 13:06:59 +00:00
parent 8bde311b9c 82ecf17079
commit 240c5e1c69
3 changed files with 8 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libmalcontent-ui/restrict-applications-dialog.ui
View File

@ -10,7 +10,7 @@
<child internal-child="headerbar"> <child internal-child="headerbar">
<object class="GtkHeaderBar"> <object class="GtkHeaderBar">
<property name="title" translatable="yes">Restrict Applications</property> <property name="title" translatable="yes">Restrict Applications</property>
<property name="show-close-button">False</property> <property name="show-close-button">True</property>
</object> </object>
</child> </child>
<child internal-child="vbox"> <child internal-child="vbox">
@ -46,16 +46,5 @@
</child> </child>
</object> </object>
</child> </child>
<child type="action">
<object class="GtkButton" id="button_save">
<property name="can-default">True</property>
<property name="visible">True</property>
<property name="label" translatable="yes">_Save</property>
<property name="use-underline">True</property>
</object>
</child>
<action-widgets>
<action-widget response="apply" default="true">button_save</action-widget>
</action-widgets>
</template> </template>
</interface> </interface>

4
libmalcontent-ui/user-controls.c
View File

@ -486,7 +486,7 @@ update_labels_from_name (MctUserControls *self)
g_autofree gchar *l = NULL; g_autofree gchar *l = NULL;
/* Translators: The placeholder is a user’s display name. */ /* Translators: The placeholder is a user’s display name. */
l = g_strdup_printf (_("Prevents %s from running web browsers. Note that limited web content may still be available in other applications."), self->user_display_name); l = g_strdup_printf (_("Prevents %s from running web browsers. Limited web content may still be available in other applications."), self->user_display_name);
gtk_label_set_label (self->restrict_web_browsers_description, l); gtk_label_set_label (self->restrict_web_browsers_description, l);
g_clear_pointer (&l, g_free); g_clear_pointer (&l, g_free);
@ -501,7 +501,7 @@ update_labels_from_name (MctUserControls *self)
g_clear_pointer (&l, g_free); g_clear_pointer (&l, g_free);
/* Translators: The placeholder is a user’s display name. */ /* Translators: The placeholder is a user’s display name. */
l = g_strdup_printf (_("Prevents %s’s application installations from being available to all users."), self->user_display_name); l = g_strdup_printf (_("Applications installed by %s will not appear for other users."), self->user_display_name);
gtk_label_set_label (self->restrict_system_installation_description, l); gtk_label_set_label (self->restrict_system_installation_description, l);
g_clear_pointer (&l, g_free); g_clear_pointer (&l, g_free);
} }

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

@ -86,7 +86,7 @@
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<!-- Set dynamically from user-controls.c: --> <!-- Set dynamically from user-controls.c: -->
<property name="label">Prevents {username} from running web browsers. Note that limited web content may still be available in other applications.</property> <property name="label">Prevents {username} from running web browsers. Limited web content may still be available in other applications.</property>
<attributes> <attributes>
<attribute name="scale" value="0.88"/> <attribute name="scale" value="0.88"/>
</attributes> </attributes>
@ -384,7 +384,7 @@
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<!-- Set dynamically from user-controls.c: --> <!-- Set dynamically from user-controls.c: -->
<property name="label">Prevents {username}’s application installations from being available to all users.</property> <property name="label">Applications installed by {username} will not appear for other users.</property>
<attributes> <attributes>
<attribute name="scale" value="0.88"/> <attribute name="scale" value="0.88"/>
</attributes> </attributes>
@ -469,7 +469,7 @@
<property name="ellipsize">none</property> <property name="ellipsize">none</property>
<property name="wrap">True</property> <property name="wrap">True</property>
<property name="xalign">0</property> <property name="xalign">0</property>
<property name="label" translatable="yes">Restricts application installation to those suitable for certain ages or above.</property> <property name="label" translatable="yes">Restricts browsing or installation of applications to applications suitable for certain ages or above.</property>
<attributes> <attributes>
<attribute name="scale" value="0.88"/> <attribute name="scale" value="0.88"/>
</attributes> </attributes>
@ -501,7 +501,8 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="label"></property> <property name="label"></property>
<property name="expand">True</property> <property name="expand">True</property>
<property name="halign">center</property> <property name="halign">start</property>
<property name="xalign">0.0</property>
</object> </object>
</child> </child>
<child> <child>