From 476ea8f55094eac8d21656188a13c3f3c723a461 Mon Sep 17 00:00:00 2001 From: Georges Basile Stavracas Neto Date: Fri, 29 Mar 2019 20:02:22 -0300 Subject: [PATCH] panel-list: Simplify placeholder widget setup I just learned that we can use and avoid C code to do that. Simplify CcPanelList as well. --- shell/cc-panel-list.c | 5 --- shell/cc-panel-list.ui | 89 ++++++++++++++++++++++-------------------- 2 files changed, 46 insertions(+), 48 deletions(-) diff --git a/shell/cc-panel-list.c b/shell/cc-panel-list.c index 5bdc4c899..67a0ac77f 100644 --- a/shell/cc-panel-list.c +++ b/shell/cc-panel-list.c @@ -55,8 +55,6 @@ struct _CcPanelList GtkListBoxRow *details_row; GtkListBoxRow *devices_row; - GtkWidget *empty_search_placeholder; - gchar *current_panel_id; gchar *search_query; @@ -827,7 +825,6 @@ cc_panel_list_class_init (CcPanelListClass *klass) gtk_widget_class_bind_template_child (widget_class, CcPanelList, details_row); gtk_widget_class_bind_template_child (widget_class, CcPanelList, devices_listbox); gtk_widget_class_bind_template_child (widget_class, CcPanelList, devices_row); - gtk_widget_class_bind_template_child (widget_class, CcPanelList, empty_search_placeholder); gtk_widget_class_bind_template_child (widget_class, CcPanelList, main_listbox); gtk_widget_class_bind_template_child (widget_class, CcPanelList, search_listbox); @@ -874,8 +871,6 @@ cc_panel_list_init (CcPanelList *self) filter_func, self, NULL); - - gtk_list_box_set_placeholder (GTK_LIST_BOX (self->search_listbox), self->empty_search_placeholder); } GtkWidget* diff --git a/shell/cc-panel-list.ui b/shell/cc-panel-list.ui index 3064a179e..32066fb93 100644 --- a/shell/cc-panel-list.ui +++ b/shell/cc-panel-list.ui @@ -160,6 +160,52 @@ True False + + + + + True + False + center + center + True + 18 + vertical + 6 + + + True + False + 64 + edit-find-symbolic + + + + + + True + False + No results found + + + + + + + + + True + False + Try a different search + + + + + search @@ -167,47 +213,4 @@ - - True - False - center - center - True - True - 18 - vertical - 6 - - - True - False - 64 - edit-find-symbolic - - - - - - True - False - No results found - - - - - - - - - True - False - Try a different search - - - -