diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | cut-n-paste/Makefile.am | 2 | ||||
| -rw-r--r-- | cut-n-paste/gimpcellrenderertoggle/Makefile.am | 38 | ||||
| -rw-r--r-- | cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c | 496 | ||||
| -rw-r--r-- | cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.h | 77 | ||||
| -rw-r--r-- | cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.list | 26 | ||||
| -rw-r--r-- | help/reference/shell/Makefile.am | 1 | ||||
| -rw-r--r-- | shell/Makefile.am | 2 | ||||
| -rw-r--r-- | shell/ev-sidebar-layers.c | 5 |
9 files changed, 3 insertions, 645 deletions
diff --git a/configure.ac b/configure.ac index de5d68f9..b0d22d03 100644 --- a/configure.ac +++ b/configure.ac @@ -672,7 +672,6 @@ backend/ps/Makefile backend/tiff/Makefile backend/xps/Makefile cut-n-paste/Makefile -cut-n-paste/gimpcellrenderertoggle/Makefile cut-n-paste/smclient/Makefile cut-n-paste/toolbar-editor/Makefile cut-n-paste/zoom-control/Makefile diff --git a/cut-n-paste/Makefile.am b/cut-n-paste/Makefile.am index b53b9b9e..bd953d76 100644 --- a/cut-n-paste/Makefile.am +++ b/cut-n-paste/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = zoom-control toolbar-editor totem-screensaver smclient gimpcellrenderertoggle synctex +SUBDIRS = zoom-control toolbar-editor totem-screensaver smclient synctex -include $(top_srcdir)/git.mk diff --git a/cut-n-paste/gimpcellrenderertoggle/Makefile.am b/cut-n-paste/gimpcellrenderertoggle/Makefile.am deleted file mode 100644 index fffeffa7..00000000 --- a/cut-n-paste/gimpcellrenderertoggle/Makefile.am +++ /dev/null @@ -1,38 +0,0 @@ -noinst_LTLIBRARIES = libgimpcellrenderertoggle.la - -libgimpcellrenderertoggle_la_sources = \ - gimpcellrenderertoggle.h \ - gimpcellrenderertoggle.c - -libgimpcellrenderertoggle_la_CFLAGS = \ - $(SHELL_CORE_CFLAGS) \ - $(WARNING_CFLAGS) \ - $(DISABLE_DEPRECATED) - -libgimpcellrenderertoggle_la_built_sources = \ - gimpwidgetsmarshal.h \ - gimpwidgetsmarshal.c - -libgimpcellrenderertoggle_la_SOURCES = \ - $(libgimpcellrenderertoggle_la_built_sources) \ - $(libgimpcellrenderertoggle_la_sources) - -libgimpcellrenderertoggle_la_extra_sources = gimpwidgetsmarshal.list - -gimpwidgetsmarshal.h: $(srcdir)/gimpwidgetsmarshal.list - $(AM_V_GEN)$(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --header >> xgen-wmh \ - && (cmp -s xgen-wmh $(@F) || cp xgen-wmh $(@F)) \ - && rm -f xgen-wmh xgen-wmh~ - -gimpwidgetsmarshal.c: gimpwidgetsmarshal.h - $(AM_V_GEN)echo "#include \"gimpwidgetsmarshal.h\"" >> xgen-wmc \ - && $(GLIB_GENMARSHAL) --prefix=_gimp_widgets_marshal $(srcdir)/gimpwidgetsmarshal.list --body >> xgen-wmc \ - && cp xgen-wmc $(@F) \ - && rm -f xgen-wmc xgen-wmc~ - -gen_sources = xgen-wmh xgen-wmc $(libgimpcellrenderertoggle_la_built_sources) -CLEANFILES = $(gen_sources) - -EXTRA_DIST = $(libgimpcellrenderertoggle_la_extra_sources) - --include $(top_srcdir)/git.mk diff --git a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c b/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c deleted file mode 100644 index 875d87bb..00000000 --- a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.c +++ /dev/null @@ -1,496 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * gimpcellrenderertoggle.c - * Copyright (C) 2003-2004 Sven Neumann <[email protected]> - * - * This library 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 library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#include <config.h> - -#include "gimpwidgetsmarshal.h" -#include "gimpcellrenderertoggle.h" - -#define DEFAULT_ICON_SIZE GTK_ICON_SIZE_BUTTON - -enum -{ - CLICKED, - LAST_SIGNAL -}; - -enum -{ - PROP_0, - PROP_STOCK_ID, - PROP_STOCK_SIZE -}; - - -static void gimp_cell_renderer_toggle_finalize (GObject *object); -static void gimp_cell_renderer_toggle_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec); -static void gimp_cell_renderer_toggle_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec); -static void gimp_cell_renderer_toggle_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - const GdkRectangle *rectangle, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height); -static void gimp_cell_renderer_toggle_render (GtkCellRenderer *cell, - cairo_t *cr, - GtkWidget *widget, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, - GtkCellRendererState flags); -static gboolean gimp_cell_renderer_toggle_activate (GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, - GtkCellRendererState flags); -static void gimp_cell_renderer_toggle_create_pixbuf (GimpCellRendererToggle *toggle, - GtkWidget *widget); - - -G_DEFINE_TYPE (GimpCellRendererToggle, gimp_cell_renderer_toggle, - GTK_TYPE_CELL_RENDERER_TOGGLE) - -#define parent_class gimp_cell_renderer_toggle_parent_class - -static guint toggle_cell_signals[LAST_SIGNAL] = { 0 }; - - -static void -gimp_cell_renderer_toggle_class_init (GimpCellRendererToggleClass *klass) -{ - GObjectClass *object_class = G_OBJECT_CLASS (klass); - GtkCellRendererClass *cell_class = GTK_CELL_RENDERER_CLASS (klass); - - toggle_cell_signals[CLICKED] = - g_signal_new ("clicked", - G_OBJECT_CLASS_TYPE (object_class), - G_SIGNAL_RUN_LAST, - G_STRUCT_OFFSET (GimpCellRendererToggleClass, clicked), - NULL, NULL, - _gimp_widgets_marshal_VOID__STRING_FLAGS, - G_TYPE_NONE, 2, - G_TYPE_STRING, - GDK_TYPE_MODIFIER_TYPE); - - object_class->finalize = gimp_cell_renderer_toggle_finalize; - object_class->get_property = gimp_cell_renderer_toggle_get_property; - object_class->set_property = gimp_cell_renderer_toggle_set_property; - - cell_class->get_size = gimp_cell_renderer_toggle_get_size; - cell_class->render = gimp_cell_renderer_toggle_render; - cell_class->activate = gimp_cell_renderer_toggle_activate; - - g_object_class_install_property (object_class, - PROP_STOCK_ID, - g_param_spec_string ("stock-id", - NULL, NULL, - NULL, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT)); - g_object_class_install_property (object_class, - PROP_STOCK_SIZE, - g_param_spec_int ("stock-size", - NULL, NULL, - 0, G_MAXINT, - DEFAULT_ICON_SIZE, - G_PARAM_READWRITE | - G_PARAM_CONSTRUCT)); -} - -static void -gimp_cell_renderer_toggle_init (GimpCellRendererToggle *toggle) -{ -} - -static void -gimp_cell_renderer_toggle_finalize (GObject *object) -{ - GimpCellRendererToggle *toggle = GIMP_CELL_RENDERER_TOGGLE (object); - - if (toggle->stock_id) - { - g_free (toggle->stock_id); - toggle->stock_id = NULL; - } - - if (toggle->pixbuf) - { - g_object_unref (toggle->pixbuf); - toggle->pixbuf = NULL; - } - - G_OBJECT_CLASS (parent_class)->finalize (object); -} - -static void -gimp_cell_renderer_toggle_get_property (GObject *object, - guint param_id, - GValue *value, - GParamSpec *pspec) -{ - GimpCellRendererToggle *toggle = GIMP_CELL_RENDERER_TOGGLE (object); - - switch (param_id) - { - case PROP_STOCK_ID: - g_value_set_string (value, toggle->stock_id); - break; - case PROP_STOCK_SIZE: - g_value_set_int (value, toggle->stock_size); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } -} - -static void -gimp_cell_renderer_toggle_set_property (GObject *object, - guint param_id, - const GValue *value, - GParamSpec *pspec) -{ - GimpCellRendererToggle *toggle = GIMP_CELL_RENDERER_TOGGLE (object); - - switch (param_id) - { - case PROP_STOCK_ID: - if (toggle->stock_id) - g_free (toggle->stock_id); - toggle->stock_id = g_value_dup_string (value); - break; - case PROP_STOCK_SIZE: - toggle->stock_size = g_value_get_int (value); - break; - - default: - G_OBJECT_WARN_INVALID_PROPERTY_ID (object, param_id, pspec); - break; - } - - if (toggle->pixbuf) - { - g_object_unref (toggle->pixbuf); - toggle->pixbuf = NULL; - } -} - -static void -gimp_cell_renderer_toggle_get_size (GtkCellRenderer *cell, - GtkWidget *widget, - const GdkRectangle *cell_area, - gint *x_offset, - gint *y_offset, - gint *width, - gint *height) -{ - GimpCellRendererToggle *toggle = GIMP_CELL_RENDERER_TOGGLE (cell); - GtkStyleContext *context = gtk_widget_get_style_context (widget); - GtkBorder border; - gint calc_width; - gint calc_height; - gint pixbuf_width; - gint pixbuf_height; - gfloat xalign; - gfloat yalign; - gint xpad; - gint ypad; - - if (! toggle->stock_id) - { - GTK_CELL_RENDERER_CLASS (parent_class)->get_size (cell, - widget, - cell_area, - x_offset, y_offset, - width, height); - return; - } - - gtk_cell_renderer_get_alignment (cell, &xalign, &yalign); - gtk_cell_renderer_get_padding (cell, &xpad, &ypad); - - gtk_style_context_get_border (context, 0, &border); - - if (! toggle->pixbuf) - gimp_cell_renderer_toggle_create_pixbuf (toggle, widget); - - pixbuf_width = gdk_pixbuf_get_width (toggle->pixbuf); - pixbuf_height = gdk_pixbuf_get_height (toggle->pixbuf); - - calc_width = (pixbuf_width + (gint) xpad * 2 + (border.left + border.right)); - calc_height = (pixbuf_height + (gint) ypad * 2 + (border.top + border.bottom)); - - if (width) - *width = calc_width; - - if (height) - *height = calc_height; - - if (cell_area) - { - if (x_offset) - { - *x_offset = (((gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL) ? - (1.0 - xalign) : xalign) * - (cell_area->width - calc_width)); - *x_offset = MAX (*x_offset, 0); - } - - if (y_offset) - { - *y_offset = yalign * (cell_area->height - calc_height); - *y_offset = MAX (*y_offset, 0); - } - } -} - -static void -gimp_cell_renderer_toggle_render (GtkCellRenderer *cell, - cairo_t *cr, - GtkWidget *widget, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, - GtkCellRendererState flags) -{ - GimpCellRendererToggle *toggle = GIMP_CELL_RENDERER_TOGGLE (cell); - GdkRectangle toggle_rect; - GdkRectangle draw_rect; - GtkStyleContext *context = gtk_widget_get_style_context (widget); - GdkRectangle clip_rect; - GtkStateFlags state; - gboolean active; - gint xpad; - gint ypad; - - if (! toggle->stock_id) - { - GTK_CELL_RENDERER_CLASS (parent_class)->render (cell, - cr, - widget, - background_area, - cell_area, - flags); - return; - } - - gtk_cell_renderer_get_size (cell, widget, cell_area, - &toggle_rect.x, - &toggle_rect.y, - &toggle_rect.width, - &toggle_rect.height); - - gtk_cell_renderer_get_padding (cell, &xpad, &ypad); - toggle_rect.x += cell_area->x + xpad; - toggle_rect.y += cell_area->y + ypad; - toggle_rect.width -= xpad * 2; - toggle_rect.height -= ypad * 2; - - if (toggle_rect.width <= 0 || toggle_rect.height <= 0) - return; - - active = - gtk_cell_renderer_toggle_get_active (GTK_CELL_RENDERER_TOGGLE (cell)); - - if (!gtk_cell_renderer_get_sensitive (cell)) - { - state = GTK_STATE_FLAG_INSENSITIVE; - } - else if ((flags & GTK_CELL_RENDERER_SELECTED) == GTK_CELL_RENDERER_SELECTED) - { - if (gtk_widget_has_focus (widget)) - state = GTK_STATE_FLAG_SELECTED; - else - state = GTK_STATE_FLAG_ACTIVE; - } - else - { - if (gtk_cell_renderer_toggle_get_activatable (GTK_CELL_RENDERER_TOGGLE (cell))) - state = GTK_STATE_FLAG_NORMAL; - else - state = GTK_STATE_FLAG_INSENSITIVE; - } - - if ((flags & GTK_CELL_RENDERER_PRELIT) && - gdk_cairo_get_clip_rectangle(cr, &clip_rect) && - gdk_rectangle_intersect (&clip_rect, cell_area, &draw_rect)) - { - cairo_save (cr); - gtk_style_context_save (context); - gdk_cairo_rectangle (cr, &draw_rect); - cairo_clip (cr); - gtk_render_frame (context, //gtk_widget_get_style_context (widget), - cr, - toggle_rect.x, toggle_rect.y, - toggle_rect.width, toggle_rect.height); - gtk_style_context_restore (context); - cairo_restore (cr); - } - - if (active) - { - GdkPixbuf *insensitive = NULL; - GdkPixbuf *pixbuf = toggle->pixbuf; - - GtkBorder border = { 1, 1, 1, 1 }; - -#if 0 - /* FIXME: for some reason calling gtk_style_context_get_border - * makes the icon only visible on hover, so use border = 1 - * for now as a workaround - */ - gtk_style_context_get_border (context, state, &border); -#endif - - toggle_rect.x += border.left; - toggle_rect.y += border.top; - toggle_rect.width -= (border.left + border.right); - toggle_rect.height -= (border.top + border.bottom); - - if (state & GTK_STATE_FLAG_INSENSITIVE) - { - GtkIconSource *source; - - source = gtk_icon_source_new (); - gtk_icon_source_set_pixbuf (source, pixbuf); - /* The size here is arbitrary; since size isn't - * wildcarded in the source, it isn't supposed to be - * scaled by the engine function - */ - gtk_icon_source_set_size (source, GTK_ICON_SIZE_SMALL_TOOLBAR); - gtk_icon_source_set_size_wildcarded (source, FALSE); - - gtk_style_context_save (context); - gtk_style_context_set_state (context, GTK_STATE_FLAG_INSENSITIVE); - insensitive = gtk_render_icon_pixbuf (context, source, (GtkIconSize)-1); - gtk_style_context_restore (context); - - gtk_icon_source_free (source); - - pixbuf = insensitive; - } - - if (gdk_rectangle_intersect (&draw_rect, &toggle_rect, &draw_rect)) - { - gdk_cairo_set_source_pixbuf (cr, pixbuf, toggle_rect.x, toggle_rect.y); - gdk_cairo_rectangle (cr, &draw_rect); - cairo_fill (cr); - } - - if (insensitive) - g_object_unref (insensitive); - } -} - -static gboolean -gimp_cell_renderer_toggle_activate (GtkCellRenderer *cell, - GdkEvent *event, - GtkWidget *widget, - const gchar *path, - const GdkRectangle *background_area, - const GdkRectangle *cell_area, - GtkCellRendererState flags) -{ - GtkCellRendererToggle *toggle = GTK_CELL_RENDERER_TOGGLE (cell); - - if (gtk_cell_renderer_toggle_get_activatable (toggle)) - { - GdkModifierType state = 0; - - GTK_CELL_RENDERER_CLASS (parent_class)->activate (cell, event, widget, - path, background_area, - cell_area, flags); - - if (event && ((GdkEventAny *) event)->type == GDK_BUTTON_PRESS) - state = ((GdkEventButton *) event)->state; - - gimp_cell_renderer_toggle_clicked (GIMP_CELL_RENDERER_TOGGLE (cell), - path, state); - - return TRUE; - } - - return FALSE; -} - -static void -gimp_cell_renderer_toggle_create_pixbuf (GimpCellRendererToggle *toggle, - GtkWidget *widget) -{ - if (toggle->pixbuf) - g_object_unref (toggle->pixbuf); - - toggle->pixbuf = gtk_widget_render_icon_pixbuf (widget, - toggle->stock_id, - toggle->stock_size); -} - -/** - * gimp_cell_renderer_toggle_new: - * @stock_id: the stock_id of the icon to use for the active state - * - * Creates a custom version of the #GtkCellRendererToggle. Instead of - * showing the standard toggle button, it shows a stock icon if the - * cell is active and no icon otherwise. This cell renderer is for - * example used in the Layers treeview to indicate and control the - * layer's visibility by showing %GIMP_STOCK_VISIBLE. - * - * Return value: a new #GimpCellRendererToggle - * - * Since: GIMP 2.2 - **/ -GtkCellRenderer * -gimp_cell_renderer_toggle_new (const gchar *stock_id) -{ - return g_object_new (GIMP_TYPE_CELL_RENDERER_TOGGLE, - "stock_id", stock_id, - NULL); -} - -/** - * gimp_cell_renderer_toggle_clicked: - * @cell: a #GimpCellRendererToggle - * @path: - * @state: - * - * Emits the "clicked" signal from a #GimpCellRendererToggle. - * - * Since: GIMP 2.2 - **/ -void -gimp_cell_renderer_toggle_clicked (GimpCellRendererToggle *cell, - const gchar *path, - GdkModifierType state) -{ - g_return_if_fail (GIMP_IS_CELL_RENDERER_TOGGLE (cell)); - g_return_if_fail (path != NULL); - - g_signal_emit (cell, toggle_cell_signals[CLICKED], 0, path, state); -} diff --git a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.h b/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.h deleted file mode 100644 index 6d516d73..00000000 --- a/cut-n-paste/gimpcellrenderertoggle/gimpcellrenderertoggle.h +++ /dev/null @@ -1,77 +0,0 @@ -/* LIBGIMP - The GIMP Library - * Copyright (C) 1995-1997 Peter Mattis and Spencer Kimball - * - * gimpcellrenderertoggle.h - * Copyright (C) 2003-2004 Sven Neumann <[email protected]> - * - * This library 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 library 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 - * Library General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA. - */ - -#ifndef __GIMP_CELL_RENDERER_TOGGLE_H__ -#define __GIMP_CELL_RENDERER_TOGGLE_H__ - -#include <gtk/gtk.h> -#include <glib-object.h> - -G_BEGIN_DECLS - -#define GIMP_TYPE_CELL_RENDERER_TOGGLE (gimp_cell_renderer_toggle_get_type ()) -#define GIMP_CELL_RENDERER_TOGGLE(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_CELL_RENDERER_TOGGLE, GimpCellRendererToggle)) -#define GIMP_CELL_RENDERER_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_CELL_RENDERER_TOGGLE, GimpCellRendererToggleClass)) -#define GIMP_IS_CELL_RENDERER_TOGGLE(obj) (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_CELL_RENDERER_TOGGLE)) -#define GIMP_IS_CELL_RENDERER_TOGGLE_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GIMP_TYPE_CELL_RENDERER_TOGGLE)) -#define GIMP_CELL_RENDERER_TOGGLE_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GIMP_TYPE_CELL_RENDERER_TOGGLE, GimpCellRendererToggleClass)) - -typedef struct _GimpCellRendererToggle GimpCellRendererToggle; -typedef struct _GimpCellRendererToggleClass GimpCellRendererToggleClass; - -struct _GimpCellRendererToggle -{ - GtkCellRendererToggle parent_instance; - - gchar *stock_id; - GtkIconSize stock_size; - GdkPixbuf *pixbuf; -}; - -struct _GimpCellRendererToggleClass -{ - GtkCellRendererToggleClass parent_class; - - void (* clicked) (GimpCellRendererToggle *cell, - const gchar *path, - GdkModifierType state); - - /* Padding for future expansion */ - void (* _gimp_reserved1) (void); - void (* _gimp_reserved2) (void); - void (* _gimp_reserved3) (void); - void (* _gimp_reserved4) (void); -}; - - -GType gimp_cell_renderer_toggle_get_type (void) G_GNUC_CONST; - -GtkCellRenderer * gimp_cell_renderer_toggle_new (const gchar *stock_id); - -void gimp_cell_renderer_toggle_clicked (GimpCellRendererToggle *cell, - const gchar *path, - GdkModifierType state); - - -G_END_DECLS - -#endif /* __GIMP_CELL_RENDERER_TOGGLE_H__ */ diff --git a/cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.list b/cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.list deleted file mode 100644 index f32f0f95..00000000 --- a/cut-n-paste/gimpcellrenderertoggle/gimpwidgetsmarshal.list +++ /dev/null @@ -1,26 +0,0 @@ -# see glib-genmarshal(1) for a detailed description of the file format, -# possible parameter types are: -# VOID indicates no return type, or no extra -# parameters. if VOID is used as the parameter -# list, no additional parameters may be present. -# BOOLEAN for boolean types (gboolean) -# CHAR for signed char types (gchar) -# UCHAR for unsigned char types (guchar) -# INT for signed integer types (gint) -# UINT for unsigned integer types (guint) -# LONG for signed long integer types (glong) -# ULONG for unsigned long integer types (gulong) -# ENUM for enumeration types (gint) -# FLAGS for flag enumeration types (guint) -# FLOAT for single-precision float types (gfloat) -# DOUBLE for double-precision float types (gdouble) -# STRING for string types (gchar*) -# BOXED for boxed (anonymous but reference counted) types (GBoxed*) -# POINTER for anonymous pointer types (gpointer) -# PARAM for GParamSpec or derived types (GParamSpec*) -# OBJECT for GObject or derived types (GObject*) -# NONE deprecated alias for VOID -# BOOL deprecated alias for BOOLEAN - -VOID: STRING, FLAGS - diff --git a/help/reference/shell/Makefile.am b/help/reference/shell/Makefile.am index 9996b466..bd83f9fe 100644 --- a/help/reference/shell/Makefile.am +++ b/help/reference/shell/Makefile.am @@ -117,7 +117,6 @@ GTKDOC_LIBS = \ $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ - $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \ $(top_builddir)/cut-n-paste/smclient/libsmclient.la \ $(top_builddir)/properties/libevproperties.la \ $(top_builddir)/libdocument/libatrildocument.la \ diff --git a/shell/Makefile.am b/shell/Makefile.am index 162c21b2..38774613 100644 --- a/shell/Makefile.am +++ b/shell/Makefile.am @@ -6,7 +6,6 @@ AM_CPPFLAGS= \ -I$(top_srcdir)/cut-n-paste/zoom-control/ \ -I$(top_srcdir)/cut-n-paste/toolbar-editor/ \ -I$(top_srcdir)/cut-n-paste/totem-screensaver/ \ - -I$(top_srcdir)/cut-n-paste/gimpcellrenderertoggle/ \ -I$(top_srcdir)/cut-n-paste/smclient/ \ -I$(top_srcdir)/libdocument \ -I$(top_builddir)/libdocument \ @@ -104,7 +103,6 @@ atril_LDADD= \ $(top_builddir)/cut-n-paste/zoom-control/libephyzoom.la \ $(top_builddir)/cut-n-paste/toolbar-editor/libtoolbareditor.la \ $(top_builddir)/cut-n-paste/totem-screensaver/libtotemscrsaver.la \ - $(top_builddir)/cut-n-paste/gimpcellrenderertoggle/libgimpcellrenderertoggle.la \ $(top_builddir)/cut-n-paste/smclient/libsmclient.la \ $(top_builddir)/properties/libevproperties.la \ $(top_builddir)/libdocument/libatrildocument.la \ diff --git a/shell/ev-sidebar-layers.c b/shell/ev-sidebar-layers.c index c28218c2..6a723abb 100644 --- a/shell/ev-sidebar-layers.c +++ b/shell/ev-sidebar-layers.c @@ -21,7 +21,6 @@ #include "config.h" #include <glib/gi18n.h> -#include "gimpcellrenderertoggle.h" #include "ev-document-layers.h" #include "ev-sidebar-page.h" @@ -245,7 +244,7 @@ ev_sidebar_layers_create_tree_view (EvSidebarLayers *ev_layers) column = gtk_tree_view_column_new (); - renderer = gimp_cell_renderer_toggle_new (EV_STOCK_VISIBLE); + renderer = gtk_cell_renderer_toggle_new (); gtk_tree_view_column_pack_start (column, renderer, FALSE); gtk_tree_view_column_set_attributes (column, renderer, "active", EV_DOCUMENT_LAYERS_COLUMN_VISIBLE, @@ -254,7 +253,7 @@ ev_sidebar_layers_create_tree_view (EvSidebarLayers *ev_layers) "sensitive", EV_DOCUMENT_LAYERS_COLUMN_ENABLED, NULL); g_object_set (G_OBJECT (renderer), - "xpad", 0, + "xpad", 4, "ypad", 0, NULL); g_signal_connect (renderer, "toggled", |