psppire-cell-renderer-button: Add "slash" property.

When "slash" is set to true, the button gets a diagonal slash drawn
across it.  This is ugly, but it matches what SPSS does for cases
that are filtered out.

diff --git a/src/ui/gui/psppire-button-editable.c b/src/ui/gui/psppire-button-editable.c
index cefc7a594d92e2fe0f52c41324fab2281b192fca..2e6335053fb06279750273b86dd678fa45ab1843 100644 (file)
--- a/src/ui/gui/psppire-button-editable.c
+++ b/src/ui/gui/psppire-button-editable.c
@@ -40,7 +40,8 @@ G_DEFINE_TYPE_EXTENDED (PsppireButtonEditable,
 enum
   {
     PROP_0,
-    PROP_PATH
+    PROP_PATH,
+    PROP_SLASH
   };
 
 static void
@@ -58,6 +59,10 @@ psppire_button_editable_set_property (GObject      *object,
       obj->path = g_value_dup_string (value);
       break;
 
+    case PROP_SLASH:
+      psppire_button_editable_set_slash (obj, g_value_get_boolean (value));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -78,6 +83,10 @@ psppire_button_editable_get_property (GObject      *object,
       g_value_set_string (value, obj->path);
       break;
 
+    case PROP_SLASH:
+      g_value_set_boolean (value, psppire_button_editable_get_slash (obj));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -110,6 +119,28 @@ psppire_button_editable_button_release (GtkWidget      *widget,
   return TRUE;
 }
 
+static gboolean
+psppire_button_editable_expose_event (GtkWidget      *widget,
+                                      GdkEventExpose *event)
+{
+  GtkWidgetClass *widget_class;
+  GtkStyle *style = gtk_widget_get_style (widget);
+  GtkAllocation allocation;
+  gboolean retval;
+
+  widget_class = GTK_WIDGET_CLASS (psppire_button_editable_parent_class);
+  retval = widget_class->expose_event (widget, event);
+
+  gtk_widget_get_allocation (widget, &allocation);
+  if (PSPPIRE_BUTTON_EDITABLE (widget)->slash)
+    gdk_draw_line (gtk_widget_get_window (widget), style->black_gc,
+                   allocation.x,
+                   allocation.y + allocation.height,
+                   allocation.x + allocation.width,
+                   allocation.y);
+  return retval;
+}
+
 static void
 psppire_button_editable_class_init (PsppireButtonEditableClass *class)
 {
@@ -124,20 +155,31 @@ psppire_button_editable_class_init (PsppireButtonEditableClass *class)
   gobject_class->dispose = psppire_button_editable_dispose;
 
   widget_class->button_release_event = psppire_button_editable_button_release;
+  widget_class->expose_event = psppire_button_editable_expose_event;
 
-  g_object_class_install_property (G_OBJECT_CLASS (class),
+  g_object_class_install_property (gobject_class,
                                    PROP_PATH,
                                    g_param_spec_string ("path",
                                                        _("TreeView path"),
                                                        _("The path to the row in the GtkTreeView, as a string"),
                                                        "",
                                                        G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_SLASH,
+                                   g_param_spec_boolean ("slash",
+                                                         _("Diagonal slash"),
+                                                         _("Whether to draw a diagonal slash across the button."),
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+
 }
 
 static void
 psppire_button_editable_init (PsppireButtonEditable *obj)
 {
   obj->path = g_strdup ("");
+  obj->slash = FALSE;
 }
 
 PsppireButtonEditable *
@@ -145,6 +187,25 @@ psppire_button_editable_new (void)
 {
   return PSPPIRE_BUTTON_EDITABLE (g_object_new (PSPPIRE_TYPE_BUTTON_EDITABLE, NULL));
 }
+
+void
+psppire_button_editable_set_slash (PsppireButtonEditable *button,
+                                   gboolean slash)
+{
+  g_return_if_fail (button != NULL);
+  if ((button->slash != 0) != (slash != 0))
+    {
+      button->slash = slash;
+      gtk_widget_queue_draw (GTK_WIDGET (button));
+    }
+}
+
+gboolean
+psppire_button_editable_get_slash (const PsppireButtonEditable *button)
+{
+  g_return_val_if_fail (button != NULL, FALSE);
+  return button->slash;
+}
 \f
 /* GtkCellEditable interface. */
 

diff --git a/src/ui/gui/psppire-button-editable.h b/src/ui/gui/psppire-button-editable.h
index 7949b876c789a2db7815f70c91983f956e148ca2..a0eb3497c4b8b44c3b4b5aaddbdfe44b42f549c9 100644 (file)
--- a/src/ui/gui/psppire-button-editable.h
+++ b/src/ui/gui/psppire-button-editable.h
@@ -1,5 +1,5 @@
 /* PSPPIRE - a graphical user interface for PSPP.
-   Copyright (C) 2011 Free Software Foundation, Inc.
+   Copyright (C) 2011, 2012 Free Software Foundation, 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
@@ -34,6 +34,7 @@ typedef struct _PsppireButtonEditableClass PsppireButtonEditableClass;
 struct _PsppireButtonEditable {
   GtkButton parent;
   gchar *path;
+  gboolean slash;
 };
 
 struct _PsppireButtonEditableClass {
@@ -43,6 +44,10 @@ struct _PsppireButtonEditableClass {
 GType psppire_button_editable_get_type (void) G_GNUC_CONST;
 PsppireButtonEditable* psppire_button_editable_new (void);
 
+void psppire_button_editable_set_slash (PsppireButtonEditable *,
+                                        gboolean slash);
+gboolean psppire_button_editable_get_slash (const PsppireButtonEditable *);
+
 G_END_DECLS
 
 #endif /* PSPPIRE_BUTTON_EDITABLE_H */

diff --git a/src/ui/gui/psppire-cell-renderer-button.c b/src/ui/gui/psppire-cell-renderer-button.c
index 6f7269842505e3bebe8a0f701af25f59936eccf1..88de4bc655459b02286c93336bf80c10c232edd0 100644 (file)
--- a/src/ui/gui/psppire-cell-renderer-button.c
+++ b/src/ui/gui/psppire-cell-renderer-button.c
@@ -59,7 +59,8 @@ enum
   {
     PROP_0,
     PROP_EDITABLE,
-    PROP_LABEL
+    PROP_LABEL,
+    PROP_SLASH
   };
 
 static void
@@ -85,6 +86,11 @@ psppire_cell_renderer_button_set_property (GObject      *object,
       obj->label = g_value_dup_string (value);
       break;
 
+    case PROP_SLASH:
+      psppire_cell_renderer_button_set_slash (obj,
+                                              g_value_get_boolean (value));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -109,6 +115,11 @@ psppire_cell_renderer_button_get_property (GObject      *object,
       g_value_set_string (value, obj->label);
       break;
 
+    case PROP_SLASH:
+      g_value_set_boolean (value,
+                           psppire_cell_renderer_button_get_slash (obj));
+      break;
+
     default:
       G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
       break;
@@ -222,6 +233,13 @@ psppire_cell_renderer_button_render (GtkCellRenderer      *cell,
                         state_type,
                         button->label_style, button->label, button->xpad,
                         button->ypad, cell->xalign, cell->yalign);
+
+  if (button->slash)
+    gdk_draw_line (window, button->button_style->black_gc,
+                   cell_area->x,
+                   cell_area->y + cell_area->height,
+                   cell_area->x + cell_area->width,
+                   cell_area->y);
 }
 
 static void
@@ -404,6 +422,7 @@ psppire_cell_renderer_button_start_editing (GtkCellRenderer      *cell,
                                       "xalign", xalign,
                                       "yalign", yalign,
                                       "path", path,
+                                      "slash", cell_button->slash,
                                       NULL);
 
   g_signal_connect (G_OBJECT (cell_button->button), "focus-out-event",
@@ -493,6 +512,15 @@ psppire_cell_renderer_button_class_init (PsppireCellRendererButtonClass *class)
                                                         "Text to appear in button.",
                                                         "",
                                                         G_PARAM_READWRITE));
+
+  g_object_class_install_property (gobject_class,
+                                   PROP_SLASH,
+                                   g_param_spec_boolean ("slash",
+                                                         _("Diagonal slash"),
+                                                         _("Whether to draw a diagonal slash across the button."),
+                                                         FALSE,
+                                                         G_PARAM_READWRITE));
+
 }
 
 static void
@@ -504,6 +532,8 @@ psppire_cell_renderer_button_init (PsppireCellRendererButton *obj)
   obj->xpad = 0;
   obj->ypad = 0;
 
+  obj->slash = FALSE;
+
   obj->button = NULL;
 
   obj->button_style = NULL;
@@ -536,3 +566,18 @@ psppire_cell_renderer_button_new (void)
 {
   return GTK_CELL_RENDERER (g_object_new (PSPPIRE_TYPE_CELL_RENDERER_BUTTON, NULL));
 }
+
+void
+psppire_cell_renderer_button_set_slash (PsppireCellRendererButton *button,
+                                        gboolean slash)
+{
+  g_return_if_fail (button != NULL);
+  button->slash = slash;
+}
+
+gboolean
+psppire_cell_renderer_button_get_slash (const PsppireCellRendererButton *button)
+{
+  g_return_val_if_fail (button != NULL, FALSE);
+  return button->slash;
+}

diff --git a/src/ui/gui/psppire-cell-renderer-button.h b/src/ui/gui/psppire-cell-renderer-button.h
index 821a6e9ea44c0dfba2f110686c51a2a399e093af..a878f516b278ac9926c9320a9f2bec181158f2d7 100644 (file)
--- a/src/ui/gui/psppire-cell-renderer-button.h
+++ b/src/ui/gui/psppire-cell-renderer-button.h
@@ -40,6 +40,8 @@ struct _PsppireCellRendererButton {
   gint xpad;
   gint ypad;
 
+  gboolean slash;
+
   GtkWidget *button;
   guint32 click_time;
   gdouble click_x;
@@ -60,6 +62,10 @@ struct _PsppireCellRendererButtonClass {
 GType psppire_cell_renderer_button_get_type (void) G_GNUC_CONST;
 GtkCellRenderer* psppire_cell_renderer_button_new (void);
 
+void psppire_cell_renderer_button_set_slash (PsppireCellRendererButton *,
+                                             gboolean slash);
+gboolean psppire_cell_renderer_button_get_slash (const PsppireCellRendererButton *);
+
 G_END_DECLS
 
 #endif /* PSPPIRE_CELL_RENDERER_BUTTON_H */