[Gpredict-svn] SF.net SVN: gpredict: [47] trunk/src

[<cs...@us...>]

Revision: 47
          http://gpredict.svn.sourceforge.net/gpredict/?rev=47&view=rev
Author:   csete
Date:     2008-05-01 07:01:17 -0700 (Thu, 01 May 2008)

Log Message:
-----------
Change GtkRotCtrl to GtkRotKnob.

Modified Paths:
--------------
    trunk/src/gtk-rot-knob.c
    trunk/src/gtk-rot-knob.h

Modified: trunk/src/gtk-rot-knob.c
===================================================================
--- trunk/src/gtk-rot-knob.c	2008-05-01 13:52:15 UTC (rev 46)
+++ trunk/src/gtk-rot-knob.c	2008-05-01 14:01:17 UTC (rev 47)
@@ -36,7 +36,7 @@
 #include <gtk/gtk.h>
 #include <glib/gi18n.h>
 #include <math.h>
-#include "gtk-rot-ctrl.h"
+#include "gtk-rot-knob.h"
 #ifdef HAVE_CONFIG_H
 #  include <build-config.h>
 #endif
@@ -45,11 +45,11 @@
 #define FMTSTR "<span size='xx-large'>%c</span>"
 
 
-static void gtk_rot_ctrl_class_init (GtkRotCtrlClass *class);
-static void gtk_rot_ctrl_init       (GtkRotCtrl      *list);
-static void gtk_rot_ctrl_destroy    (GtkObject       *object);
+static void gtk_rot_knob_class_init (GtkRotKnobClass *class);
+static void gtk_rot_knob_init       (GtkRotKnob      *list);
+static void gtk_rot_knob_destroy    (GtkObject       *object);
 
-static void gtk_rot_ctrl_update     (GtkRotCtrl *ctrl);
+static void gtk_rot_knob_update     (GtkRotKnob *knob);
 
 static void button_clicked_cb (GtkWidget *button, gpointer data);
 
@@ -58,36 +58,36 @@
 
 
 GType
-gtk_rot_ctrl_get_type ()
+gtk_rot_knob_get_type ()
 {
-	static GType gtk_rot_ctrl_type = 0;
+	static GType gtk_rot_knob_type = 0;
 
-	if (!gtk_rot_ctrl_type) {
+	if (!gtk_rot_knob_type) {
 
-		static const GTypeInfo gtk_rot_ctrl_info = {
-			sizeof (GtkRotCtrlClass),
+		static const GTypeInfo gtk_rot_knob_info = {
+			sizeof (GtkRotKnobClass),
 			NULL,  /* base_init */
 			NULL,  /* base_finalize */
-			(GClassInitFunc) gtk_rot_ctrl_class_init,
+			(GClassInitFunc) gtk_rot_knob_class_init,
 			NULL,  /* class_finalize */
 			NULL,  /* class_data */
-			sizeof (GtkRotCtrl),
+			sizeof (GtkRotKnob),
 			5,     /* n_preallocs */
-			(GInstanceInitFunc) gtk_rot_ctrl_init,
+			(GInstanceInitFunc) gtk_rot_knob_init,
 		};
 
-		gtk_rot_ctrl_type = g_type_register_static (GTK_TYPE_VBOX,
-												    "GtkRotCtrl",
-													&gtk_rot_ctrl_info,
+		gtk_rot_knob_type = g_type_register_static (GTK_TYPE_VBOX,
+												    "GtkRotKnob",
+													&gtk_rot_knob_info,
 													0);
 	}
 
-	return gtk_rot_ctrl_type;
+	return gtk_rot_knob_type;
 }
 
 
 static void
-gtk_rot_ctrl_class_init (GtkRotCtrlClass *class)
+gtk_rot_knob_class_init (GtkRotKnobClass *class)
 {
 	GObjectClass      *gobject_class;
 	GtkObjectClass    *object_class;
@@ -101,21 +101,21 @@
 
 	parent_class = g_type_class_peek_parent (class);
 
-	object_class->destroy = gtk_rot_ctrl_destroy;
+	object_class->destroy = gtk_rot_knob_destroy;
  
 }
 
 
 
 static void
-gtk_rot_ctrl_init (GtkRotCtrl *ctrl)
+gtk_rot_knob_init (GtkRotKnob *knob)
 {
 
     
 }
 
 static void
-gtk_rot_ctrl_destroy (GtkObject *object)
+gtk_rot_knob_destroy (GtkObject *object)
 {
 	(* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
@@ -130,160 +130,160 @@
  * 
  */
 GtkWidget *
-gtk_rot_ctrl_new (gfloat min, gfloat max, gfloat val)
+gtk_rot_knob_new (gfloat min, gfloat max, gfloat val)
 {
     GtkWidget *widget;
     GtkWidget *table;
     guint i;
 
-	widget = g_object_new (GTK_TYPE_ROT_CTRL, NULL);
+	widget = g_object_new (GTK_TYPE_ROT_KNOB, NULL);
 
-    GTK_ROT_CTRL(widget)->min = min;
-    GTK_ROT_CTRL(widget)->max = max;
-    GTK_ROT_CTRL(widget)->value = val;
+    GTK_ROT_KNOB(widget)->min = min;
+    GTK_ROT_KNOB(widget)->max = max;
+    GTK_ROT_KNOB(widget)->value = val;
     
     /* create table */
     table = gtk_table_new (3, 7, FALSE);
     
     /* create buttons */
     /* +100 deg */
-    GTK_ROT_CTRL(widget)->buttons[0] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[0]),
+    GTK_ROT_KNOB(widget)->buttons[0] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[0]),
                        gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[0]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[0]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[0]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[0]),
                        "delta", GINT_TO_POINTER(10000));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[0],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[0],
                       1, 2, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[0], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[0], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* +10 deg */
-    GTK_ROT_CTRL(widget)->buttons[1] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[1]),
+    GTK_ROT_KNOB(widget)->buttons[1] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[1]),
                        gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[1]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[1]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[1]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[1]),
                        "delta", GINT_TO_POINTER(1000));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[1],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[1],
                       2, 3, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[1], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[1], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* +1 deg */
-    GTK_ROT_CTRL(widget)->buttons[2] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[2]),
+    GTK_ROT_KNOB(widget)->buttons[2] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[2]),
                        gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[2]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[2]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[2]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[2]),
                        "delta", GINT_TO_POINTER(100));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[2],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[2],
                      3, 4, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[2], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[2], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* +0.1 deg */
-    GTK_ROT_CTRL(widget)->buttons[3] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[3]),
+    GTK_ROT_KNOB(widget)->buttons[3] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[3]),
                        gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[3]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[3]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[3]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[3]),
                        "delta", GINT_TO_POINTER(10));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[3],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[3],
                       5, 6, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[3], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[3], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* +0.01 deg */
-    GTK_ROT_CTRL(widget)->buttons[4] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[4]),
+    GTK_ROT_KNOB(widget)->buttons[4] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[4]),
                        gtk_arrow_new (GTK_ARROW_UP, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[4]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[4]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[4]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[4]),
                        "delta", GINT_TO_POINTER(1));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[4],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[4],
                       6, 7, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[4], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[4], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* -100 deg */
-    GTK_ROT_CTRL(widget)->buttons[5] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[5]),
+    GTK_ROT_KNOB(widget)->buttons[5] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[5]),
                        gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[5]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[5]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[5]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[5]),
                        "delta", GINT_TO_POINTER(-10000));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[5],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[5],
                       1, 2, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[5], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[5], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* -10 deg */
-    GTK_ROT_CTRL(widget)->buttons[6] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[6]),
+    GTK_ROT_KNOB(widget)->buttons[6] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[6]),
                        gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[6]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[6]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[6]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[6]),
                        "delta", GINT_TO_POINTER(-1000));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[6],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[6],
                       2, 3, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[6], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[6], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* -1 deg */
-    GTK_ROT_CTRL(widget)->buttons[7] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[7]),
+    GTK_ROT_KNOB(widget)->buttons[7] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[7]),
                        gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[7]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[7]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[7]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[7]),
                        "delta", GINT_TO_POINTER(-100));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[7],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[7],
                       3, 4, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[7], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[7], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* -0.1 deg */
-    GTK_ROT_CTRL(widget)->buttons[8] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[8]),
+    GTK_ROT_KNOB(widget)->buttons[8] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[8]),
                        gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[8]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[8]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[8]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[8]),
                        "delta", GINT_TO_POINTER(-10));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[8],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[8],
                       5, 6, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[8], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[8], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
     
     /* -0.01 deg */
-    GTK_ROT_CTRL(widget)->buttons[9] = gtk_button_new ();
-    gtk_container_add (GTK_CONTAINER(GTK_ROT_CTRL(widget)->buttons[9]),
+    GTK_ROT_KNOB(widget)->buttons[9] = gtk_button_new ();
+    gtk_container_add (GTK_CONTAINER(GTK_ROT_KNOB(widget)->buttons[9]),
                        gtk_arrow_new (GTK_ARROW_DOWN, GTK_SHADOW_NONE));
-    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_CTRL(widget)->buttons[9]),
+    gtk_button_set_relief (GTK_BUTTON(GTK_ROT_KNOB(widget)->buttons[9]),
                            GTK_RELIEF_NONE);
-    g_object_set_data (G_OBJECT (GTK_ROT_CTRL(widget)->buttons[9]),
+    g_object_set_data (G_OBJECT (GTK_ROT_KNOB(widget)->buttons[9]),
                        "delta", GINT_TO_POINTER(-1));
-    gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->buttons[9],
+    gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->buttons[9],
                       6, 7, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
-    g_signal_connect (GTK_ROT_CTRL(widget)->buttons[9], "clicked",
+    g_signal_connect (GTK_ROT_KNOB(widget)->buttons[9], "clicked",
                       G_CALLBACK (button_clicked_cb), widget);
 
     /* create labels */
     for (i = 0; i < 7; i++) {
-        GTK_ROT_CTRL(widget)->digits[i] = gtk_label_new (NULL);
-        gtk_table_attach (GTK_TABLE (table), GTK_ROT_CTRL(widget)->digits[i],
+        GTK_ROT_KNOB(widget)->digits[i] = gtk_label_new (NULL);
+        gtk_table_attach (GTK_TABLE (table), GTK_ROT_KNOB(widget)->digits[i],
                           i, i+1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
     }
     
-    gtk_rot_ctrl_update (GTK_ROT_CTRL(widget));
+    gtk_rot_knob_update (GTK_ROT_KNOB(widget));
 
     
     gtk_container_add (GTK_CONTAINER (widget), table);
@@ -295,86 +295,86 @@
 
 
 /** \brief Set the value of the rotor control widget.
- * \param[in] ctrl The rotor control widget.
+ * \param[in] knob The rotor control widget.
  * \param[in] val The new value.
  * 
  */
 void
-gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val)
+gtk_rot_knob_set_value (GtkRotKnob *knob, gfloat val)
 {
     /* set the new value */
-    if ((val >= ctrl->min) && (val <= ctrl->max))
-        ctrl->value = val;
+    if ((val >= knob->min) && (val <= knob->max))
+        knob->value = val;
     
     /* update the display */
-    gtk_rot_ctrl_update (ctrl);
+    gtk_rot_knob_update (knob);
 }
 
 
 /** \brief Get the current value of the rotor control widget.
- *  \param[in] ctrl The rotor control widget.
+ *  \param[in] knob The rotor control widget.
  *  \return The current value.
  * 
- * Hint: For reading the value you can also access ctrl->value.
+ * Hint: For reading the value you can also access knob->value.
  * 
  */
 gfloat
-gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl)
+gtk_rot_knob_get_value (GtkRotKnob *knob)
 {
-    return ctrl->value;
+    return knob->value;
 }
 
 
 
 /** \brief Update rotor display widget.
- *  \param[in] ctrl The rotor control widget.
+ *  \param[in] knob The rotor control widget.
  * 
  */
 static void
-gtk_rot_ctrl_update     (GtkRotCtrl *ctrl)
+gtk_rot_knob_update     (GtkRotKnob *knob)
 {
     gchar b[7];
     gchar *buff;
     guint i;
     
-    g_ascii_formatd (b, 8, "%6.2f", fabs(ctrl->value)); 
+    g_ascii_formatd (b, 8, "%6.2f", fabs(knob->value)); 
     
     /* set label markups */
     for (i = 0; i < 6; i++) {
         buff = g_strdup_printf (FMTSTR, b[i]);
-        gtk_label_set_markup (GTK_LABEL(ctrl->digits[i+1]), buff);
+        gtk_label_set_markup (GTK_LABEL(knob->digits[i+1]), buff);
         g_free (buff);
     }
     
-    if (ctrl->value <= 0)
+    if (knob->value <= 0)
         buff = g_strdup_printf (FMTSTR, '-');
     else
         buff = g_strdup_printf (FMTSTR, ' ');
     
-    gtk_label_set_markup (GTK_LABEL(ctrl->digits[0]), buff);
+    gtk_label_set_markup (GTK_LABEL(knob->digits[0]), buff);
     g_free (buff);
 }
 
 
 /** \brief Button clicked event.
  * \param button The button that was clicked.
- * \param data Pointer to the GtkRotCtrl widget.
+ * \param data Pointer to the GtkRotKnob widget.
  * 
  */
 static void
 button_clicked_cb (GtkWidget *button, gpointer data)
 {
-    GtkRotCtrl *ctrl = GTK_ROT_CTRL (data);
+    GtkRotKnob *knob = GTK_ROT_KNOB (data);
     gfloat delta = GPOINTER_TO_INT(g_object_get_data (G_OBJECT (button), "delta")) / 100.0;
     
-    if ((delta > 0.0) && ((ctrl->value + delta) <= ctrl->max)) {
-        ctrl->value += delta;
+    if ((delta > 0.0) && ((knob->value + delta) <= knob->max)) {
+        knob->value += delta;
     }
-    else if ((delta < 0.0) && ((ctrl->value + delta) >= ctrl->min)) {
-        ctrl->value += delta;
+    else if ((delta < 0.0) && ((knob->value + delta) >= knob->min)) {
+        knob->value += delta;
     }
     
-    gtk_rot_ctrl_update (ctrl);
+    gtk_rot_knob_update (knob);
     
-    g_print ("VAL: %.2f\n", ctrl->value);
+    g_print ("VAL: %.2f\n", knob->value);
 }

Modified: trunk/src/gtk-rot-knob.h
===================================================================
--- trunk/src/gtk-rot-knob.h	2008-05-01 13:52:15 UTC (rev 46)
+++ trunk/src/gtk-rot-knob.h	2008-05-01 14:01:17 UTC (rev 47)
@@ -25,8 +25,8 @@
   You should have received a copy of the GNU General Public License
   along with this program; if not, visit http://www.fsf.org/
 */
-#ifndef __GTK_ROT_CTRL_H__
-#define __GTK_ROT_CTRL_H__ 1
+#ifndef __GTK_ROT_KNOB_H__
+#define __GTK_ROT_KNOB_H__ 1
 
 #include <glib.h>
 #include <glib/gi18n.h>
@@ -40,24 +40,24 @@
 
 
 
-#define GTK_TYPE_ROT_CTRL          (gtk_rot_ctrl_get_type ())
-#define GTK_ROT_CTRL(obj)          GTK_CHECK_CAST (obj,\
-				                       gtk_rot_ctrl_get_type (),\
-						               GtkRotCtrl)
+#define GTK_TYPE_ROT_KNOB          (gtk_rot_knob_get_type ())
+#define GTK_ROT_KNOB(obj)          GTK_CHECK_CAST (obj,\
+				                   gtk_rot_knob_get_type (),\
+						           GtkRotKnob)
 
-#define GTK_ROT_CTRL_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass,\
-							 gtk_rot_ctrl_get_type (),\
-							 GtkRotCtrlClass)
+#define GTK_ROT_KNOB_CLASS(klass)  GTK_CHECK_CLASS_CAST (klass,\
+							 gtk_rot_knob_get_type (),\
+							 GtkRotKnobClass)
 
-#define IS_GTK_ROT_CTRL(obj)       GTK_CHECK_TYPE (obj, gtk_rot_ctrl_get_type ())
+#define IS_GTK_ROT_KNOB(obj)       GTK_CHECK_TYPE (obj, gtk_rot_knob_get_type ())
 
 
-typedef struct _gtk_rot_ctrl      GtkRotCtrl;
-typedef struct _GtkRotCtrlClass   GtkRotCtrlClass;
+typedef struct _gtk_rot_knob      GtkRotKnob;
+typedef struct _GtkRotKnobClass   GtkRotKnobClass;
 
 
 
-struct _gtk_rot_ctrl
+struct _gtk_rot_knob
 {
 	GtkVBox vbox;
     
@@ -69,17 +69,17 @@
     gfloat value;
 };
 
-struct _GtkRotCtrlClass
+struct _GtkRotKnobClass
 {
 	GtkVBoxClass parent_class;
 };
 
 
 
-GtkType    gtk_rot_ctrl_get_type  (void);
-GtkWidget* gtk_rot_ctrl_new       (gfloat min, gfloat max, gfloat val);
-void       gtk_rot_ctrl_set_value (GtkRotCtrl *ctrl, gfloat val);
-gfloat     gtk_rot_ctrl_get_value (GtkRotCtrl *ctrl);
+GtkType    gtk_rot_knob_get_type  (void);
+GtkWidget* gtk_rot_knob_new       (gfloat min, gfloat max, gfloat val);
+void       gtk_rot_knob_set_value (GtkRotKnob *knob, gfloat val);
+gfloat     gtk_rot_knob_get_value (GtkRotKnob *knob);
 
 
 
@@ -88,4 +88,4 @@
 }
 #endif /* __cplusplus */
 
-#endif /* __GTK_ROT_CTRL_H__ */
+#endif /* __GTK_ROT_knob_H__ */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.