gimp r25803 - in trunk: . app/widgets

[neo svn gnome org]

Author: neo
Date: Mon May 26 15:01:36 2008
New Revision: 25803
URL: http://svn.gnome.org/viewvc/gimp?rev=25803&view=rev

Log:
2008-05-26  Sven Neumann  <sven gimp org>

	* app/widgets/Makefile.am
	* app/widgets/widgets-types.h
	* app/widgets/gimpscalebutton.[ch]: added simple scale button widget
	derived from GtkScaleButton.


Added:
   trunk/app/widgets/gimpscalebutton.c   (contents, props changed)
   trunk/app/widgets/gimpscalebutton.h   (contents, props changed)
Modified:
   trunk/ChangeLog
   trunk/app/widgets/Makefile.am
   trunk/app/widgets/widgets-types.h

Modified: trunk/app/widgets/Makefile.am
==============================================================================
--- trunk/app/widgets/Makefile.am	(original)
+++ trunk/app/widgets/Makefile.am	Mon May 26 15:01:36 2008
@@ -239,6 +239,8 @@
 	gimprender.h			\
 	gimpsamplepointeditor.c		\
 	gimpsamplepointeditor.h		\
+	gimpscalebutton.c		\
+	gimpscalebutton.h		\
 	gimpselectiondata.c		\
 	gimpselectiondata.h		\
 	gimpselectioneditor.c		\

Added: trunk/app/widgets/gimpscalebutton.c
==============================================================================
--- (empty file)
+++ trunk/app/widgets/gimpscalebutton.c	Mon May 26 15:01:36 2008
@@ -0,0 +1,116 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpscalebutton.c
+ * Copyright (C) 2008 Sven Neumann <sven gimp org>
+ *
+ * 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 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#include "config.h"
+
+#include <gtk/gtk.h>
+
+#include "widgets-types.h"
+
+#include "gimpscalebutton.h"
+
+
+static gboolean  gimp_scale_button_image_expose (GtkWidget       *widget,
+                                                 GdkEventExpose  *event,
+                                                 GimpScaleButton *button);
+
+
+G_DEFINE_TYPE (GimpScaleButton, gimp_scale_button, GTK_TYPE_SCALE_BUTTON)
+
+
+static void
+gimp_scale_button_class_init (GimpScaleButtonClass *klass)
+{
+
+}
+
+static void
+gimp_scale_button_init (GimpScaleButton *button)
+{
+  GtkWidget *image;
+
+  image = gtk_bin_get_child (GTK_BIN (button));
+
+  g_signal_connect (image, "expose-event",
+                    G_CALLBACK (gimp_scale_button_image_expose),
+                    button);
+}
+
+static gboolean
+gimp_scale_button_image_expose (GtkWidget       *widget,
+                                GdkEventExpose  *event,
+                                GimpScaleButton *button)
+{
+  GtkAdjustment *adj;
+  cairo_t       *cr;
+  gint           value;
+  gint           steps;
+  gint           i;
+
+  adj = gtk_scale_button_get_adjustment (GTK_SCALE_BUTTON (button));
+
+  steps = MIN (widget->allocation.width, widget->allocation.height) / 2;
+
+  if (steps < 1)
+    return TRUE;
+
+  value = 0.5 + ((adj->value - adj->lower) * (gdouble) steps /
+                 (adj->upper - adj->lower));
+
+  cr = gdk_cairo_create (widget->window);
+
+  gdk_cairo_rectangle (cr, &event->area);
+  cairo_clip (cr);
+
+  cairo_set_line_width (cr, 1.0);
+
+  cairo_translate (cr, widget->allocation.x + 0.5, widget->allocation.y + 0.5);
+  cairo_scale (cr, 1.0, -2.0);
+
+  for (i = 0; i < value; i++)
+    {
+      cairo_move_to (cr, 0, i);
+      cairo_line_to (cr, i, i);
+    }
+
+  gdk_cairo_set_source_color (cr, &widget->style->fg[widget->state]);
+  cairo_stroke (cr);
+
+  for ( ; i < steps; i++)
+    {
+      cairo_move_to (cr, 0, i);
+      cairo_line_to (cr, i, i);
+    }
+
+  gdk_cairo_set_source_color (cr, &widget->style->light[widget->state]);
+  cairo_stroke (cr);
+
+  cairo_destroy (cr);
+
+  return TRUE;
+}
+
+GtkWidget *
+gimp_scale_button_new (void)
+{
+  return g_object_new (GIMP_TYPE_SCALE_BUTTON, NULL);
+}
+

Added: trunk/app/widgets/gimpscalebutton.h
==============================================================================
--- (empty file)
+++ trunk/app/widgets/gimpscalebutton.h	Mon May 26 15:01:36 2008
@@ -0,0 +1,52 @@
+/* GIMP - The GNU Image Manipulation Program
+ * Copyright (C) 1995 Spencer Kimball and Peter Mattis
+ *
+ * gimpscalebutton.h
+ * Copyright (C) 2008 Sven Neumann <sven gimp org>
+ *
+ * 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 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 General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GIMP_SCALE_BUTTON_H__
+#define __GIMP_SCALE_BUTTON_H__
+
+
+#define GIMP_TYPE_SCALE_BUTTON            (gimp_scale_button_get_type ())
+#define GIMP_SCALE_BUTTON(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GIMP_TYPE_SCALE_BUTTON, GimpScaleButton))
+#define GIMP_SCALE_BUTTON_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GIMP_TYPE_SCALE_BUTTON, GimpScaleButtonClass))
+#define GIMP_IS_SCALE_BUTTON(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GIMP_TYPE_SCALE_BUTTON))
+#define GIMP_IS_SCALE_BUTTON_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((obj), GIMP_TYPE_SCALE_BUTTON))
+#define GIMP_SCALE_BUTTON_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS((obj), GIMP_TYPE_SCALE_BUTTON, GimpScaleButtonClass))
+
+
+typedef struct _GimpScaleButtonClass GimpScaleButtonClass;
+
+struct _GimpScaleButton
+{
+  GtkScaleButton      parent_instance;
+};
+
+struct _GimpScaleButtonClass
+{
+  GtkScaleButtonClass parent_class;
+};
+
+
+GType       gimp_scale_button_get_type (void) G_GNUC_CONST;
+
+GtkWidget * gimp_scale_button_new      (void);
+
+
+#endif  /* __GIMP_SCALE_BUTTON_H__ */

Modified: trunk/app/widgets/widgets-types.h
==============================================================================
--- trunk/app/widgets/widgets-types.h	(original)
+++ trunk/app/widgets/widgets-types.h	Mon May 26 15:01:36 2008
@@ -174,6 +174,7 @@
 typedef struct _GimpLanguageEntry            GimpLanguageEntry;
 typedef struct _GimpMessageBox               GimpMessageBox;
 typedef struct _GimpProgressBox              GimpProgressBox;
+typedef struct _GimpScaleButton              GimpScaleButton;
 typedef struct _GimpSizeBox                  GimpSizeBox;
 typedef struct _GimpStrokeEditor             GimpStrokeEditor;
 typedef struct _GimpTemplateEditor           GimpTemplateEditor;