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

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
This commit is contained in:
Philip Withnall 2020-02-14 15:23:10 +00:00
parent 7ad804835a
commit 008b75edd1
2 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -82,6 +82,7 @@ struct _MctUserControls
GtkSwitch *restrict_web_browsers_switch; GtkSwitch *restrict_web_browsers_switch;
GtkLabel *restrict_web_browsers_description; GtkLabel *restrict_web_browsers_description;
GtkButton *oars_button; GtkButton *oars_button;
GtkLabel *oars_button_label;
GtkPopover *oars_popover; GtkPopover *oars_popover;
MctRestrictApplicationsDialog *restrict_applications_dialog; MctRestrictApplicationsDialog *restrict_applications_dialog;
GtkLabel *restrict_applications_description; GtkLabel *restrict_applications_description;
@ -399,7 +400,7 @@ update_oars_level (MctUserControls *self)
if (rating_age_category == NULL || all_categories_unset) if (rating_age_category == NULL || all_categories_unset)
rating_age_category = _("All Ages"); rating_age_category = _("All Ages");
gtk_button_set_label (self->oars_button, rating_age_category); gtk_label_set_label (self->oars_button_label, rating_age_category);
} }
static void static void
@ -670,13 +671,13 @@ on_set_age_action_activated (GSimpleAction *action,
/* Update the button */ /* Update the button */
if (age == oars_disabled_age) if (age == oars_disabled_age)
gtk_button_set_label (self->oars_button, _("All Ages")); gtk_label_set_label (self->oars_button_label, _("All Ages"));
for (i = 0; age != oars_disabled_age && entries[i] != NULL; i++) for (i = 0; age != oars_disabled_age && entries[i] != NULL; i++)
{ {
if (ages[i] == age) if (ages[i] == age)
{ {
gtk_button_set_label (self->oars_button, entries[i]); gtk_label_set_label (self->oars_button_label, entries[i]);
break; break;
} }
} }
@ -966,6 +967,7 @@ mct_user_controls_class_init (MctUserControlsClass *klass)
gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_web_browsers_switch); gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_web_browsers_switch);
gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_web_browsers_description); gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_web_browsers_description);
gtk_widget_class_bind_template_child (widget_class, MctUserControls, oars_button); gtk_widget_class_bind_template_child (widget_class, MctUserControls, oars_button);
gtk_widget_class_bind_template_child (widget_class, MctUserControls, oars_button_label);
gtk_widget_class_bind_template_child (widget_class, MctUserControls, oars_popover); gtk_widget_class_bind_template_child (widget_class, MctUserControls, oars_popover);
gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_applications_dialog); gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_applications_dialog);
gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_applications_description); gtk_widget_class_bind_template_child (widget_class, MctUserControls, restrict_applications_description);

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

@ -487,6 +487,27 @@
<property name="halign">end</property> <property name="halign">end</property>
<property name="valign">center</property> <property name="valign">center</property>
<property name="popover">oars_popover</property> <property name="popover">oars_popover</property>
<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>
<property name="halign">center</property>
</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>
</object> </object>
<packing> <packing>
<property name="left-attach">1</property> <property name="left-attach">1</property>