diff --git a/panels/applications/cc-applications-panel.ui b/panels/applications/cc-applications-panel.ui index 984fc12dc..35b845600 100644 --- a/panels/applications/cc-applications-panel.ui +++ b/panels/applications/cc-applications-panel.ui @@ -435,7 +435,6 @@ <b>Total</b> - 1 Unknown diff --git a/panels/applications/cc-info-row.c b/panels/applications/cc-info-row.c index e86b82e01..cb835df12 100644 --- a/panels/applications/cc-info-row.c +++ b/panels/applications/cc-info-row.c @@ -28,7 +28,6 @@ struct _CcInfoRow { GtkListBoxRow parent; - GtkWidget *title; GtkWidget *info; GtkWidget *expander; @@ -36,13 +35,11 @@ struct _CcInfoRow gboolean link; }; -G_DEFINE_TYPE (CcInfoRow, cc_info_row, GTK_TYPE_LIST_BOX_ROW) +G_DEFINE_TYPE (CcInfoRow, cc_info_row, ADW_TYPE_ACTION_ROW) enum { PROP_0, - PROP_TITLE, - PROP_USE_MARKUP, PROP_INFO, PROP_HAS_EXPANDER, PROP_IS_LINK, @@ -59,18 +56,12 @@ cc_info_row_get_property (GObject *object, switch (prop_id) { - case PROP_TITLE: - g_value_set_string (value, gtk_label_get_label (GTK_LABEL (row->title))); - break; case PROP_INFO: g_value_set_string (value, gtk_label_get_label (GTK_LABEL (row->info))); break; case PROP_HAS_EXPANDER: g_value_set_boolean (value, gtk_widget_get_visible (row->expander)); break; - case PROP_USE_MARKUP: - g_value_set_boolean (value, gtk_label_get_use_markup (GTK_LABEL (row->title))); - break; case PROP_IS_LINK: g_value_set_boolean (value, row->link); break; @@ -104,10 +95,6 @@ cc_info_row_set_property (GObject *object, switch (prop_id) { - case PROP_TITLE: - gtk_label_set_label (GTK_LABEL (row->title), g_value_get_string (value)); - break; - case PROP_INFO: gtk_label_set_label (GTK_LABEL (row->info), g_value_get_string (value)); break; @@ -117,10 +104,6 @@ cc_info_row_set_property (GObject *object, gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), g_value_get_boolean (value)); break; - case PROP_USE_MARKUP: - gtk_label_set_use_markup (GTK_LABEL (row->title), g_value_get_boolean (value)); - break; - case PROP_IS_LINK: row->link = g_value_get_boolean (value); update_expander (row); @@ -147,21 +130,11 @@ cc_info_row_class_init (CcInfoRowClass *klass) gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/control-center/applications/cc-info-row.ui"); - g_object_class_install_property (object_class, - PROP_TITLE, - g_param_spec_string ("title", "title", "title", - NULL, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_INFO, g_param_spec_string ("info", "info", "info", NULL, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, - PROP_USE_MARKUP, - g_param_spec_boolean ("use-markup", "use-markup", "use-markup", - FALSE, G_PARAM_READWRITE)); - g_object_class_install_property (object_class, PROP_HAS_EXPANDER, g_param_spec_boolean ("has-expander", "has-expander", "has-expander", @@ -177,7 +150,6 @@ cc_info_row_class_init (CcInfoRowClass *klass) g_param_spec_boolean ("is-link", "is-link", "is-link", FALSE, G_PARAM_READWRITE)); - gtk_widget_class_bind_template_child (widget_class, CcInfoRow, title); gtk_widget_class_bind_template_child (widget_class, CcInfoRow, info); gtk_widget_class_bind_template_child (widget_class, CcInfoRow, expander); } diff --git a/panels/applications/cc-info-row.h b/panels/applications/cc-info-row.h index 57b9d4a9e..f1376dcd4 100644 --- a/panels/applications/cc-info-row.h +++ b/panels/applications/cc-info-row.h @@ -20,12 +20,12 @@ #pragma once -#include +#include G_BEGIN_DECLS #define CC_TYPE_INFO_ROW (cc_info_row_get_type()) -G_DECLARE_FINAL_TYPE (CcInfoRow, cc_info_row, CC, INFO_ROW, GtkListBoxRow) +G_DECLARE_FINAL_TYPE (CcInfoRow, cc_info_row, CC, INFO_ROW, AdwActionRow) CcInfoRow* cc_info_row_new (void); diff --git a/panels/applications/cc-info-row.ui b/panels/applications/cc-info-row.ui index 341bcb3a7..d5c92155a 100644 --- a/panels/applications/cc-info-row.ui +++ b/panels/applications/cc-info-row.ui @@ -1,39 +1,19 @@ -