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

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

Revision: 88
          http://gpredict.svn.sourceforge.net/gpredict/?rev=88&view=rev
Author:   csete
Date:     2008-09-06 12:22:17 +0000 (Sat, 06 Sep 2008)

Log Message:
-----------
Added option to hide buttons. Changed label packing to fill and expand into all y-space.

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

Modified: trunk/src/gtk-freq-knob.c
===================================================================
--- trunk/src/gtk-freq-knob.c	2008-09-06 12:02:22 UTC (rev 87)
+++ trunk/src/gtk-freq-knob.c	2008-09-06 12:22:17 UTC (rev 88)
@@ -137,11 +137,12 @@
 
 /** \brief Create a new Frequency control widget.
  * \param[in] val The initial value of the control.
+ * \param[in] buttons Flag indicating whether buttons should be shown
  * \return A new frequency control widget.
  * 
  */
 GtkWidget *
-gtk_freq_knob_new (gdouble val)
+gtk_freq_knob_new (gdouble val, gboolean buttons)
 {
     GtkWidget *widget;
     GtkWidget *table;
@@ -161,39 +162,40 @@
         /* labels */
         GTK_FREQ_KNOB(widget)->digits[i] = gtk_label_new (NULL);
         gtk_table_attach (GTK_TABLE (table), GTK_FREQ_KNOB(widget)->digits[i],
-                          idx[i], idx[i]+1, 1, 2, GTK_SHRINK, GTK_SHRINK, 0, 0);
+                          idx[i], idx[i]+1, 1, 2, GTK_SHRINK, GTK_FILL | GTK_EXPAND, 0, 0);
     
-        /* UP buttons */
-        GTK_FREQ_KNOB(widget)->buttons[i] = gtk_button_new ();
-        
-        label = gtk_label_new ("\342\226\264");
-        gtk_container_add (GTK_CONTAINER(GTK_FREQ_KNOB(widget)->buttons[i]),
-                           label);
-        gtk_button_set_relief (GTK_BUTTON(GTK_FREQ_KNOB(widget)->buttons[i]),
-                               GTK_RELIEF_NONE);
-        delta = (gint) pow(10,9-i);
-        g_object_set_data (G_OBJECT (GTK_FREQ_KNOB(widget)->buttons[i]),
-                           "delta", GINT_TO_POINTER(delta)); 
-        gtk_table_attach (GTK_TABLE (table), GTK_FREQ_KNOB(widget)->buttons[i],
-                          idx[i], idx[i]+1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
-        g_signal_connect (GTK_FREQ_KNOB(widget)->buttons[i], "clicked",
-                          G_CALLBACK (button_clicked_cb), widget);
-        
-        /* DOWN buttons */
-        GTK_FREQ_KNOB(widget)->buttons[i+10] = gtk_button_new ();
-        
-        label = gtk_label_new ("\342\226\276");
-        gtk_container_add (GTK_CONTAINER(GTK_FREQ_KNOB(widget)->buttons[i+10]),
-                           label);
-        gtk_button_set_relief (GTK_BUTTON(GTK_FREQ_KNOB(widget)->buttons[i+10]),
-                               GTK_RELIEF_NONE);
-        g_object_set_data (G_OBJECT (GTK_FREQ_KNOB(widget)->buttons[i+10]),
-                           "delta", GINT_TO_POINTER(-delta));
-        gtk_table_attach (GTK_TABLE (table), GTK_FREQ_KNOB(widget)->buttons[i+10],
-                          idx[i], idx[i]+1, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
-        g_signal_connect (GTK_FREQ_KNOB(widget)->buttons[i+10], "clicked",
-                          G_CALLBACK (button_clicked_cb), widget);
-
+        if (buttons) {
+            /* UP buttons */
+            GTK_FREQ_KNOB(widget)->buttons[i] = gtk_button_new ();
+            
+            label = gtk_label_new ("\342\226\264");
+            gtk_container_add (GTK_CONTAINER(GTK_FREQ_KNOB(widget)->buttons[i]),
+                            label);
+            gtk_button_set_relief (GTK_BUTTON(GTK_FREQ_KNOB(widget)->buttons[i]),
+                                GTK_RELIEF_NONE);
+            delta = (gint) pow(10,9-i);
+            g_object_set_data (G_OBJECT (GTK_FREQ_KNOB(widget)->buttons[i]),
+                            "delta", GINT_TO_POINTER(delta)); 
+            gtk_table_attach (GTK_TABLE (table), GTK_FREQ_KNOB(widget)->buttons[i],
+                            idx[i], idx[i]+1, 0, 1, GTK_SHRINK, GTK_SHRINK, 0, 0);
+            g_signal_connect (GTK_FREQ_KNOB(widget)->buttons[i], "clicked",
+                            G_CALLBACK (button_clicked_cb), widget);
+            
+            /* DOWN buttons */
+            GTK_FREQ_KNOB(widget)->buttons[i+10] = gtk_button_new ();
+            
+            label = gtk_label_new ("\342\226\276");
+            gtk_container_add (GTK_CONTAINER(GTK_FREQ_KNOB(widget)->buttons[i+10]),
+                            label);
+            gtk_button_set_relief (GTK_BUTTON(GTK_FREQ_KNOB(widget)->buttons[i+10]),
+                                GTK_RELIEF_NONE);
+            g_object_set_data (G_OBJECT (GTK_FREQ_KNOB(widget)->buttons[i+10]),
+                            "delta", GINT_TO_POINTER(-delta));
+            gtk_table_attach (GTK_TABLE (table), GTK_FREQ_KNOB(widget)->buttons[i+10],
+                            idx[i], idx[i]+1, 2, 3, GTK_SHRINK, GTK_SHRINK, 0, 0);
+            g_signal_connect (GTK_FREQ_KNOB(widget)->buttons[i+10], "clicked",
+                            G_CALLBACK (button_clicked_cb), widget);
+        }
     }
     
     /* Add misc labels */

Modified: trunk/src/gtk-freq-knob.h
===================================================================
--- trunk/src/gtk-freq-knob.h	2008-09-06 12:02:22 UTC (rev 87)
+++ trunk/src/gtk-freq-knob.h	2008-09-06 12:22:17 UTC (rev 88)
@@ -77,7 +77,7 @@
 
 
 GtkType    gtk_freq_knob_get_type  (void);
-GtkWidget* gtk_freq_knob_new       (gdouble val);
+GtkWidget* gtk_freq_knob_new       (gdouble val, gboolean buttons);
 void       gtk_freq_knob_set_value (GtkFreqKnob *knob, gdouble val);
 gdouble    gtk_freq_knob_get_value (GtkFreqKnob *knob);
 


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