From 00a71d46da7f2097e67873d250e5a3a389cc261c Mon Sep 17 00:00:00 2001 From: Felipe Borges Date: Wed, 10 May 2023 12:00:34 +0200 Subject: common: Introduce CcListRowInfoButton widget This simplifies the display of additional text information for our rows. See #1571 --- panels/common/cc-list-row-info-button.c | 153 +++++++++++++++++++++++++++++++ panels/common/cc-list-row-info-button.h | 38 ++++++++ panels/common/cc-list-row-info-button.ui | 32 +++++++ panels/common/common.gresource.xml | 1 + panels/common/meson.build | 2 + 5 files changed, 226 insertions(+) create mode 100644 panels/common/cc-list-row-info-button.c create mode 100644 panels/common/cc-list-row-info-button.h create mode 100644 panels/common/cc-list-row-info-button.ui diff --git a/panels/common/cc-list-row-info-button.c b/panels/common/cc-list-row-info-button.c new file mode 100644 index 000000000..b9ab1b1bc --- /dev/null +++ b/panels/common/cc-list-row-info-button.c @@ -0,0 +1,153 @@ +/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* cc-list-row.c + * + * Copyright 2023 Red Hat Inc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author(s): + * Felipe Borges + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#undef G_LOG_DOMAIN +#define G_LOG_DOMAIN "cc-list-row-info-button" + +#ifdef HAVE_CONFIG_H +# include +#endif + +#include "cc-common-resources.h" +#include "cc-list-row-info-button.h" + +struct _CcListRowInfoButton +{ + GtkWidget parent_instance; + + GtkWidget *button; + GtkLabel *label; +}; + +G_DEFINE_TYPE (CcListRowInfoButton, cc_list_row_info_button, GTK_TYPE_WIDGET) + + +enum { + PROP_0, + PROP_TEXT, + N_PROPS +}; + +static GParamSpec *properties[N_PROPS]; + +static void +cc_list_row_get_property (GObject *object, + guint prop_id, + GValue *value, + GParamSpec *pspec) +{ + CcListRowInfoButton *self = (CcListRowInfoButton *)object; + + switch (prop_id) + { + case PROP_TEXT: + g_value_set_string (value, gtk_label_get_label (self->label)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +static void +cc_list_row_set_property (GObject *object, + guint prop_id, + const GValue *value, + GParamSpec *pspec) +{ + CcListRowInfoButton *self = (CcListRowInfoButton *)object; + + switch (prop_id) + { + case PROP_TEXT: + gtk_label_set_label (self->label, g_value_get_string (value)); + break; + + default: + G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); + } +} + +static void +cc_list_row_info_button_dispose (GObject *object) +{ + CcListRowInfoButton *self = CC_LIST_ROW_INFO_BUTTON (object); + + g_clear_pointer (&self->button, gtk_widget_unparent); + + G_OBJECT_CLASS (cc_list_row_info_button_parent_class)->dispose (object); +} + +static void +cc_list_row_info_button_class_init (CcListRowInfoButtonClass *klass) +{ + GObjectClass *object_class = G_OBJECT_CLASS (klass); + GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (klass); + + object_class->dispose = cc_list_row_info_button_dispose; + object_class->get_property = cc_list_row_get_property; + object_class->set_property = cc_list_row_set_property; + + properties[PROP_TEXT] = + g_param_spec_string ("text", + "Text", + "Set text for the popover label", + NULL, + G_PARAM_READWRITE | G_PARAM_STATIC_STRINGS); + + g_object_class_install_properties (object_class, N_PROPS, properties); + + gtk_widget_class_set_template_from_resource (widget_class, + "/org/gnome/control-center/" + "common/cc-list-row-info-button.ui"); + + gtk_widget_class_bind_template_child (widget_class, CcListRowInfoButton, button); + gtk_widget_class_bind_template_child (widget_class, CcListRowInfoButton, label); + + gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT); +} + +static void +cc_list_row_info_button_init (CcListRowInfoButton *self) +{ + g_resources_register (cc_common_get_resource ()); + + gtk_widget_init_template (GTK_WIDGET (self)); +} + +void +cc_list_row_info_button_set_text (CcListRowInfoButton *self, + const gchar *text) +{ + g_return_if_fail (CC_IS_LIST_ROW_INFO_BUTTON (self)); + + if (!text) + text = ""; + + if (g_str_equal (text, gtk_label_get_label (self->label))) + return; + + gtk_label_set_text (self->label, text); + g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_TEXT]); +} diff --git a/panels/common/cc-list-row-info-button.h b/panels/common/cc-list-row-info-button.h new file mode 100644 index 000000000..ca21e22d0 --- /dev/null +++ b/panels/common/cc-list-row-info-button.h @@ -0,0 +1,38 @@ +/* -*- Mode: C; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* cc-list-row-info-button.h + * + * Copyright 2023 Red Hat Inc + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Author(s): + * Felipe Borges + * + * + * SPDX-License-Identifier: GPL-3.0-or-later + */ + +#pragma once + +#include + +G_BEGIN_DECLS + +#define CC_TYPE_LIST_ROW_INFO_BUTTON (cc_list_row_info_button_get_type()) +G_DECLARE_FINAL_TYPE (CcListRowInfoButton, cc_list_row_info_button, CC, LIST_ROW_INFO_BUTTON, GtkWidget) + +void cc_list_row_info_button_set_text (CcListRowInfoButton *self, + const gchar *text); + +G_END_DECLS diff --git a/panels/common/cc-list-row-info-button.ui b/panels/common/cc-list-row-info-button.ui new file mode 100644 index 000000000..c8f36e249 --- /dev/null +++ b/panels/common/cc-list-row-info-button.ui @@ -0,0 +1,32 @@ + + + + diff --git a/panels/common/common.gresource.xml b/panels/common/common.gresource.xml index eb28784ed..6f649f576 100644 --- a/panels/common/common.gresource.xml +++ b/panels/common/common.gresource.xml @@ -5,6 +5,7 @@ cc-language-chooser.ui cc-language-row.ui cc-list-row.ui + cc-list-row-info-button.ui cc-time-editor.ui cc-permission-infobar.ui cc-split-row.ui diff --git a/panels/common/meson.build b/panels/common/meson.build index 373c994ee..9b271d1c6 100644 --- a/panels/common/meson.build +++ b/panels/common/meson.build @@ -29,6 +29,7 @@ resource_data = files( 'cc-language-chooser.ui', 'cc-language-row.ui', 'cc-list-row.ui', + 'cc-list-row-info-button.ui', 'cc-time-editor.ui', 'cc-permission-infobar.ui', 'cc-split-row.ui', @@ -70,6 +71,7 @@ sources = common_sources + files( 'cc-language-chooser.c', 'cc-language-row.c', 'cc-list-row.c', + 'cc-list-row-info-button.c', 'cc-time-editor.c', 'cc-permission-infobar.c', 'cc-split-row.c', -- cgit v1.2.1