applications/gnome-control-center
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

applications: Replace GtkStack child names with widget references

Browse source 
The child names are easier to break if widgets are changed - this can't be
detected by the compiler.
This commit is contained in:
Robert Ancell 2019-11-20 14:37:27 +13:00 • committed by Robert Ancell
parent 0beed338af
commit 23db1e9933
2 changed files with 9 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

10
panels/applications/cc-applications-panel.c
View file

@ -75,6 +75,8 @@ struct _CcApplicationsPanel
GSettings *search_settings;
GtkStack *stack;
GtkBox *empty_box;
GtkBox *settings_box;
GtkBox *permission_section;
GtkListBox *permission_list;
@ -93,7 +95,7 @@ struct _CcApplicationsPanel
GtkListBox *integration_list;
CcToggleRow *notification;
CcToggleRow *background;
GtkToggleRow *wallpaper;
CcToggleRow *wallpaper;
CcToggleRow *sound;
CcInfoRow *no_sound;
CcToggleRow *search;
@ -1561,7 +1563,7 @@ update_panel (CcApplicationsPanel *self,
if (row == NULL)
{
gtk_label_set_label (self->title_label, _("Applications"));
gtk_stack_set_visible_child_name (self->stack, "empty");
gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->empty_box));
gtk_widget_hide (GTK_WIDGET (GTK_WIDGET (self->header_button)));
return;
}
@ -1569,7 +1571,7 @@ update_panel (CcApplicationsPanel *self,
info = cc_applications_row_get_info (CC_APPLICATIONS_ROW (row));
gtk_label_set_label (self->title_label, g_app_info_get_display_name (info));
gtk_stack_set_visible_child_name (self->stack, "settings");
gtk_stack_set_visible_child (self->stack, GTK_WIDGET (self->settings_box));
gtk_widget_show (GTK_WIDGET (self->header_button));
g_clear_pointer (&self->current_app_id, g_free);
@ -1856,6 +1858,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, camera);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, clear_cache_button);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, data);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, empty_box);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, header_button);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_section);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, handler_reset);
@ -1878,6 +1881,7 @@ cc_applications_panel_class_init (CcApplicationsPanelClass *klass)
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sidebar_listbox);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sidebar_search_entry);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, search);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, settings_box);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, sound);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, stack);
gtk_widget_class_bind_template_child (widget_class, CcApplicationsPanel, storage);

10
panels/applications/cc-applications-panel.ui
View file

@ -20,7 +20,7 @@
<object class="GtkStack" id="stack">
<property name="visible">1</property>
<child>
<object class="GtkBox">
<object class="GtkBox" id="empty_box">
<property name="visible">1</property>
<property name="orientation">vertical</property>
<property name="valign">center</property>
@ -69,12 +69,9 @@
</packing>
</child>
</object>
<packing>
<property name="name">empty</property>
</packing>
</child>
<child>
<object class="GtkBox">
<object class="GtkBox" id="settings_box">
<property name="visible">1</property>
<property name="orientation">vertical</property>
<property name="spacing">24</property>
@ -402,9 +399,6 @@
</object>
</child>
</object>
<packing>
<property name="name">settings</property>
</packing>
</child>
</object>
</child>