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

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

Revision: 85
          http://gpredict.svn.sourceforge.net/gpredict/?rev=85&view=rev
Author:   csete
Date:     2008-09-05 19:00:01 +0000 (Fri, 05 Sep 2008)

Log Message:
-----------
Use new radio controller widget.

Modified Paths:
--------------
    trunk/src/Makefile.am
    trunk/src/gtk-sat-module-popup.c
    trunk/src/gtk-sat-module.h

Modified: trunk/src/Makefile.am
===================================================================
--- trunk/src/Makefile.am	2008-09-05 18:59:10 UTC (rev 84)
+++ trunk/src/Makefile.am	2008-09-05 19:00:01 UTC (rev 85)
@@ -40,6 +40,7 @@
 	gtk-polar-plot.c gtk-polar-plot.h \
 	gtk-polar-view.c gtk-polar-view.h \
 	gtk-polar-view-popup.c gtk-polar-view-popup.h \
+	gtk-rig-ctrl.c gtk.rig-ctrl.h \
 	gtk-rot-ctrl.c gtk-rot-ctrl.h \
 	gtk-rot-knob.c gtk-rot-knob.h \
 	gtk-sat-data.c gtk-sat-data.h \

Modified: trunk/src/gtk-sat-module-popup.c
===================================================================
--- trunk/src/gtk-sat-module-popup.c	2008-09-05 18:59:10 UTC (rev 84)
+++ trunk/src/gtk-sat-module-popup.c	2008-09-05 19:00:01 UTC (rev 85)
@@ -41,6 +41,7 @@
 #include "gtk-sat-module.h"
 #include "gtk-sat-module-tmg.h"
 #include "gtk-sat-module-popup.h"
+#include "gtk-rig-ctrl.h"
 #include "gtk-rot-ctrl.h"
 #include "config-keys.h"
 
@@ -867,7 +868,6 @@
 rigctrl_cb          (GtkWidget *menuitem, gpointer data)
 {
     GtkSatModule *module = GTK_SAT_MODULE (data);
-    GtkWidget *rigctrl;
     gchar *buff;
     
     if (module->rigctrlwin != NULL) {
@@ -876,7 +876,7 @@
         return;
     }
 
-    //rigctrl = gtk_rot_ctrl_new ();
+    module->rigctrl = gtk_rig_ctrl_new (module);
     
     /* create a window */
     module->rigctrlwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -884,7 +884,7 @@
     gtk_window_set_title (GTK_WINDOW (module->rigctrlwin), buff);
     g_free (buff);
     g_signal_connect (G_OBJECT (module->rigctrlwin), "delete_event",
-                      G_CALLBACK (window_delete), NULL);    
+                      G_CALLBACK (window_delete), NULL);
     g_signal_connect (G_OBJECT (module->rigctrlwin), "destroy",
                       G_CALLBACK (destroy_rigctrl), module);
 
@@ -893,7 +893,7 @@
     gtk_window_set_icon_from_file (GTK_WINDOW (module->rigctrlwin), buff, NULL);
     g_free (buff);
     
-    //gtk_container_add (GTK_CONTAINER (module->rigctrlwin), rigctrl);
+    gtk_container_add (GTK_CONTAINER (module->rigctrlwin), module->rigctrl);
     
     gtk_widget_show_all (module->rigctrlwin);
 
@@ -912,6 +912,7 @@
     GtkSatModule *module = GTK_SAT_MODULE (data);
     
     module->rigctrlwin = NULL;
+    module->rigctrl = NULL;
 }
 
 
@@ -923,7 +924,6 @@
 rotctrl_cb          (GtkWidget *menuitem, gpointer data)
 {
     GtkSatModule *module = GTK_SAT_MODULE (data);
-    GtkWidget *rotctrl;
     gchar *buff;
     
     if (module->rotctrlwin != NULL) {
@@ -932,8 +932,7 @@
         return;
     }
 
-    rotctrl = gtk_rot_ctrl_new (module);
-    module->rotctrl = rotctrl;
+    module->rotctrl = gtk_rot_ctrl_new (module);
     
     /* create a window */
     module->rotctrlwin = gtk_window_new (GTK_WINDOW_TOPLEVEL);
@@ -950,7 +949,7 @@
     gtk_window_set_icon_from_file (GTK_WINDOW (module->rotctrlwin), buff, NULL);
     g_free (buff);
     
-    gtk_container_add (GTK_CONTAINER (module->rotctrlwin), rotctrl);
+    gtk_container_add (GTK_CONTAINER (module->rotctrlwin), module->rotctrl);
     
     gtk_widget_show_all (module->rotctrlwin);
 }

Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h	2008-09-05 18:59:10 UTC (rev 84)
+++ trunk/src/gtk-sat-module.h	2008-09-05 19:00:01 UTC (rev 85)
@@ -96,7 +96,8 @@
     GtkWidget     *rotctrlwin;  /*!< Rotator controller window */
     GtkWidget     *rotctrl;
     GtkWidget     *rigctrlwin;  /*!< Radio controller window */
-                              
+    GtkWidget     *rigctrl;
+
 	GtkWidget     *header;
 	guint          head_count;
 	guint          head_timeout;


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