[gnome-photos/wip/libgd] Put back the copy of gd-style-text-renderer as it is not in libgd
- From: Ignacio Casal Quinteiro <icq src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-photos/wip/libgd] Put back the copy of gd-style-text-renderer as it is not in libgd
- Date: Mon, 12 Nov 2012 19:55:58 +0000 (UTC)
commit 2401964c4205f23bc7efde2aad748f9df08ad47d
Author: Ignacio Casal Quinteiro <icq gnome org>
Date: Mon Nov 12 20:55:34 2012 +0100
Put back the copy of gd-style-text-renderer as it is not in libgd
src/Makefile.am | 2 +
src/gd-styled-text-renderer.c | 124 +++++++++++++++++++++++++++++++++
src/gd-styled-text-renderer.h | 79 +++++++++++++++++++++
src/photos-organize-collection-view.c | 6 +-
4 files changed, 208 insertions(+), 3 deletions(-)
---
diff --git a/src/Makefile.am b/src/Makefile.am
index 1f5c9c4..443656a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -43,6 +43,8 @@ gnome_photos_SOURCES = \
eog-uri-converter.h \
eog-util.c \
eog-util.h \
+ gd-styled-text-renderer.c \
+ gd-styled-text-renderer.h \
photos-application.c \
photos-application.h \
photos-base-manager.c \
diff --git a/src/gd-styled-text-renderer.c b/src/gd-styled-text-renderer.c
new file mode 100644
index 0000000..50a315e
--- /dev/null
+++ b/src/gd-styled-text-renderer.c
@@ -0,0 +1,124 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Cosimo Cecchi <cosimoc redhat com>
+ *
+ */
+
+#include "gd-styled-text-renderer.h"
+
+G_DEFINE_TYPE (GdStyledTextRenderer, gd_styled_text_renderer, GTK_TYPE_CELL_RENDERER_TEXT);
+
+struct _GdStyledTextRendererPrivate {
+ GList *style_classes;
+};
+
+static void
+gd_styled_text_renderer_render (GtkCellRenderer *cell,
+ cairo_t *cr,
+ GtkWidget *widget,
+ const GdkRectangle *background_area,
+ const GdkRectangle *cell_area,
+ GtkCellRendererState flags)
+{
+ GdStyledTextRenderer *self = GD_STYLED_TEXT_RENDERER (cell);
+ GtkStyleContext *context;
+ const gchar *style_class;
+ GList *l;
+
+ context = gtk_widget_get_style_context (widget);
+ gtk_style_context_save (context);
+
+ for (l = self->priv->style_classes; l != NULL; l = l->next)
+ {
+ style_class = l->data;
+ gtk_style_context_add_class (context, style_class);
+ }
+
+ GTK_CELL_RENDERER_CLASS (gd_styled_text_renderer_parent_class)->render
+ (cell, cr, widget,
+ background_area, cell_area, flags);
+
+ gtk_style_context_restore (context);
+}
+
+static void
+gd_styled_text_renderer_finalize (GObject *obj)
+{
+ GdStyledTextRenderer *self = GD_STYLED_TEXT_RENDERER (obj);
+
+ if (self->priv->style_classes != NULL)
+ {
+ g_list_free_full (self->priv->style_classes, g_free);
+ self->priv->style_classes = NULL;
+ }
+
+ G_OBJECT_CLASS (gd_styled_text_renderer_parent_class)->finalize (obj);
+}
+
+static void
+gd_styled_text_renderer_class_init (GdStyledTextRendererClass *klass)
+{
+ GtkCellRendererClass *crclass = GTK_CELL_RENDERER_CLASS (klass);
+ GObjectClass *oclass = G_OBJECT_CLASS (klass);
+
+ oclass->finalize = gd_styled_text_renderer_finalize;
+ crclass->render = gd_styled_text_renderer_render;
+
+ g_type_class_add_private (klass, sizeof (GdStyledTextRendererPrivate));
+}
+
+static void
+gd_styled_text_renderer_init (GdStyledTextRenderer *self)
+{
+ self->priv = G_TYPE_INSTANCE_GET_PRIVATE (self, GD_TYPE_STYLED_TEXT_RENDERER,
+ GdStyledTextRendererPrivate);
+}
+
+GtkCellRenderer *
+gd_styled_text_renderer_new (void)
+{
+ return g_object_new (GD_TYPE_STYLED_TEXT_RENDERER,
+ NULL);
+}
+
+void
+gd_styled_text_renderer_add_class (GdStyledTextRenderer *self,
+ const gchar *class)
+{
+ if (g_list_find_custom (self->priv->style_classes, class, (GCompareFunc) g_strcmp0))
+ return;
+
+ self->priv->style_classes = g_list_append (self->priv->style_classes, g_strdup (class));
+}
+
+void
+gd_styled_text_renderer_remove_class (GdStyledTextRenderer *self,
+ const gchar *class)
+{
+ GList *class_element;
+
+ class_element = g_list_find_custom (self->priv->style_classes, class, (GCompareFunc) g_strcmp0);
+
+ if (class_element == NULL)
+ return;
+
+ self->priv->style_classes = g_list_remove_link (self->priv->style_classes,
+ class_element);
+ g_free (class_element->data);
+ g_list_free_1 (class_element);
+}
diff --git a/src/gd-styled-text-renderer.h b/src/gd-styled-text-renderer.h
new file mode 100644
index 0000000..fc1995b
--- /dev/null
+++ b/src/gd-styled-text-renderer.h
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2011 Red Hat, Inc.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2 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 Lesser General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ * Author: Cosimo Cecchi <cosimoc redhat com>
+ *
+ */
+
+#ifndef _GD_STYLED_TEXT_RENDERER_H
+#define _GD_STYLED_TEXT_RENDERER_H
+
+#include <glib-object.h>
+
+#include <gtk/gtk.h>
+
+G_BEGIN_DECLS
+
+#define GD_TYPE_STYLED_TEXT_RENDERER gd_styled_text_renderer_get_type()
+
+#define GD_STYLED_TEXT_RENDERER(obj) \
+ (G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ GD_TYPE_STYLED_TEXT_RENDERER, GdStyledTextRenderer))
+
+#define GD_STYLED_TEXT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_CAST ((klass), \
+ GD_TYPE_STYLED_TEXT_RENDERER, GdStyledTextRendererClass))
+
+#define GD_IS_STYLED_TEXT_RENDERER(obj) \
+ (G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ GD_TYPE_STYLED_TEXT_RENDERER))
+
+#define GD_IS_STYLED_TEXT_RENDERER_CLASS(klass) \
+ (G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ GD_TYPE_STYLED_TEXT_RENDERER))
+
+#define GD_STYLED_TEXT_RENDERER_GET_CLASS(obj) \
+ (G_TYPE_INSTANCE_GET_CLASS ((obj), \
+ GD_TYPE_STYLED_TEXT_RENDERER, GdStyledTextRendererClass))
+
+typedef struct _GdStyledTextRenderer GdStyledTextRenderer;
+typedef struct _GdStyledTextRendererClass GdStyledTextRendererClass;
+typedef struct _GdStyledTextRendererPrivate GdStyledTextRendererPrivate;
+
+struct _GdStyledTextRenderer
+{
+ GtkCellRendererText parent;
+
+ GdStyledTextRendererPrivate *priv;
+};
+
+struct _GdStyledTextRendererClass
+{
+ GtkCellRendererTextClass parent_class;
+};
+
+GType gd_styled_text_renderer_get_type (void) G_GNUC_CONST;
+
+GtkCellRenderer *gd_styled_text_renderer_new (void);
+void gd_styled_text_renderer_add_class (GdStyledTextRenderer *self,
+ const gchar *class);
+void gd_styled_text_renderer_remove_class (GdStyledTextRenderer *self,
+ const gchar *class);
+
+G_END_DECLS
+
+#endif /* _GD_STYLED_TEXT_RENDERER_H */
diff --git a/src/photos-organize-collection-view.c b/src/photos-organize-collection-view.c
index ebb50a0..a8ced2b 100644
--- a/src/photos-organize-collection-view.c
+++ b/src/photos-organize-collection-view.c
@@ -26,8 +26,8 @@
#include "config.h"
#include <glib.h>
-#include <libgd/gd.h>
+#include "gd-styled-text-renderer.h"
#include "photos-organize-collection-model.h"
#include "photos-organize-collection-view.h"
@@ -162,9 +162,9 @@ photos_organize_collection_view_init (PhotosOrganizeCollectionView *self)
G_CALLBACK (photos_organize_collection_view_text_editing_canceled),
self);
- priv->renderer_detail = gd_two_lines_renderer_new ();
+ priv->renderer_detail = gd_styled_text_renderer_new ();
gtk_cell_renderer_set_padding (priv->renderer_detail, 16, 0);
- //gd_styled_text_renderer_add_class (GD_STYLED_TEXT_RENDERER (priv->renderer_detail), "dim-label");
+ gd_styled_text_renderer_add_class (GD_STYLED_TEXT_RENDERER (priv->renderer_detail), "dim-label");
gtk_tree_view_column_pack_start (priv->view_col, priv->renderer_detail, FALSE);
gtk_tree_view_column_set_cell_data_func (priv->view_col,
priv->renderer_detail,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]