[Gpredict-svn] SF.net SVN: gpredict:[943] trunk

[<aa...@us...>]

Revision: 943
          http://gpredict.svn.sourceforge.net/gpredict/?rev=943&view=rev
Author:   aa1vs
Date:     2011-10-29 21:46:55 +0000 (Sat, 29 Oct 2011)
Log Message:
-----------
Add current pass menuitem to popups. (Bug 3292729: Show next pass shows the current pass.)

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/src/gtk-event-list-popup.c
    trunk/src/gtk-polar-view-popup.c
    trunk/src/gtk-sat-list-popup.c
    trunk/src/gtk-sat-map-popup.c
    trunk/src/gtk-single-sat.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/ChangeLog	2011-10-29 21:46:55 UTC (rev 943)
@@ -1,5 +1,22 @@
-2011-10-27 Charles Suprin <hamaa1vs at gmail.com>
+2011-10-29 Charles Suprin <hamaa1vs at gmail.com>
 
+    * data/trsp/37841.trsp
+    Move SRVMU to correct catalog number.
+
+    * data/trsp/37841.trsp
+    Add transponder data for JUGNU.
+
+    * src/gtk-event-list-popup.c
+    * src/gtk-sat-list-popup.c
+    * src/gtk-sat-map-popup.c
+    * src/gtk-polar-view-popup.c
+    * src/gtk-single-sat.c
+    * NEWS
+    Add current pass menuitem to popups. (Bug 3292729: Show next pass shows the current pass.)
+
+
+2011-10-28 Charles Suprin <hamaa1vs at gmail.com>
+
     * src/gtk-sat-popup-common.c
     * src/gtk-sat-popup-common.h
     * src/gtk-sat-map-popup.c

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/NEWS	2011-10-29 21:46:55 UTC (rev 943)
@@ -19,6 +19,7 @@
 - Fixed bug 3416451: No ground track for new satellites.
 - Fixed bug 3417553: Gpredict crashes
 - Fixed bug 3419879: gpredict doesn't change the satellite names on world map.
+- Fixed bug 3292729: Show next pass shows the current pass.
 
 Changes in version 1.3 (1 Mar 2011)
 

Modified: trunk/src/gtk-event-list-popup.c
===================================================================
--- trunk/src/gtk-event-list-popup.c	2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-event-list-popup.c	2011-10-29 21:46:55 UTC (rev 943)
@@ -86,32 +86,10 @@
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
 
-    /* next pass and predict passes */
-    menuitem = gtk_image_menu_item_new_with_label (_("Show next pass"));
-    image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL,
-                                      GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-    g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-    g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-    g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
-    g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_next_pass_cb),
-                      list);
-    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+    /* add the menu items for current,next, and future passes. */
+    add_pass_menu_items(menu,sat,qth,&list->tstamp,GTK_WIDGET(list));
 
-    menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
-    image = gtk_image_new_from_stock (GTK_STOCK_INDEX,
-                                      GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-    g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-    g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-    g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
-    g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_future_passes_cb),
-                      list);
-    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
 
-
     gtk_widget_show_all (menu);
 
     /* Note: event can be NULL here when called from view_onPopupMenu;

Modified: trunk/src/gtk-polar-view-popup.c
===================================================================
--- trunk/src/gtk-polar-view-popup.c	2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-polar-view-popup.c	2011-10-29 21:46:55 UTC (rev 943)
@@ -100,26 +100,10 @@
     /* separator */
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+    
+    /* add the menu items for current,next, and future passes. */
+    add_pass_menu_items(menu,sat,qth,&pview->tstamp,GTK_WIDGET(pview));
 
-    /* next pass and predict passes */
-    menuitem = gtk_image_menu_item_new_with_label (_("Show next pass"));
-    image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-    g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-    g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-    g_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp));
-    g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), pview);
-    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
-    menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
-    image = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-    g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-    g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-    g_object_set_data (G_OBJECT (menuitem), "tstamp", &(pview->tstamp));
-    g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), pview);
-    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-
     /* separator */
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);

Modified: trunk/src/gtk-sat-list-popup.c
===================================================================
--- trunk/src/gtk-sat-list-popup.c	2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-sat-list-popup.c	2011-10-29 21:46:55 UTC (rev 943)
@@ -87,32 +87,9 @@
      menuitem = gtk_separator_menu_item_new ();
      gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
 
-     /* next pass and predict passes */
-     menuitem = gtk_image_menu_item_new_with_label (_("Show next pass"));
-     image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL,
-                           GTK_ICON_SIZE_MENU);
-     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-     g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-     g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-     g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
-     g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_next_pass_cb),
-                      list);
-     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-          
-     menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
-     image = gtk_image_new_from_stock (GTK_STOCK_INDEX,
-                           GTK_ICON_SIZE_MENU);
-     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-     g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-     g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-     g_object_set_data (G_OBJECT (menuitem), "tstamp", &(list->tstamp));
-     g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_future_passes_cb),
-                      list);
-     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+     /* add the menu items for current,next, and future passes. */
+     add_pass_menu_items(menu,sat,qth,&list->tstamp,GTK_WIDGET(list));
 
-
      gtk_widget_show_all (menu);
 
      /* Note: event can be NULL here when called from view_onPopupMenu;

Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c	2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-sat-map-popup.c	2011-10-29 21:46:55 UTC (rev 943)
@@ -99,38 +99,10 @@
      /* separator */
      menuitem = gtk_separator_menu_item_new ();
      gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-#if 1
+
+     /* add the menu items for current,next, and future passes. */
      add_pass_menu_items(menu,sat,qth,&satmap->tstamp,GTK_WIDGET(satmap));
-#else
-     /* next pass and predict passes */
-     if (sat->el > 0.0) {
-         menuitem = gtk_image_menu_item_new_with_label (_("Show current pass"));
-         image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU);
-         gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-         g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-         g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-         g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
-         g_signal_connect (menuitem, "activate", G_CALLBACK (show_current_pass_cb), satmap);
-         gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-     }
-     menuitem = gtk_image_menu_item_new_with_label (_("Show next pass"));
-     image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL, GTK_ICON_SIZE_MENU);
-     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-     g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-     g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-     g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
-     g_signal_connect (menuitem, "activate", G_CALLBACK (show_next_pass_cb), satmap);
-     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-          
-     menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
-     image = gtk_image_new_from_stock (GTK_STOCK_INDEX, GTK_ICON_SIZE_MENU);
-     gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-     g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-     g_object_set_data (G_OBJECT (menuitem), "qth", qth);
-     g_object_set_data (G_OBJECT (menuitem), "tstamp", &(satmap->tstamp));
-     g_signal_connect (menuitem, "activate", G_CALLBACK (show_future_passes_cb), satmap);
-     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-#endif
+
      /* separator */
      menuitem = gtk_separator_menu_item_new ();
      gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);

Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c	2011-10-29 11:28:58 UTC (rev 942)
+++ trunk/src/gtk-single-sat.c	2011-10-29 21:46:55 UTC (rev 943)
@@ -847,36 +847,8 @@
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
 
-    /* Show next pass */
-    menuitem = gtk_image_menu_item_new_with_label (_("Show next pass"));
-    image = gtk_image_new_from_stock (GTK_STOCK_JUSTIFY_FILL,
-                                      GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-    g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-    g_object_set_data (G_OBJECT (menuitem), "qth", single_sat->qth);
-    g_object_set_data (G_OBJECT (menuitem), "tstamp", &(single_sat->tstamp));
-/*    g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_next_pass),
-                      gtk_widget_get_toplevel (button));*/
-    g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_next_pass_cb), data);
-    
-    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
-        
-    /* Show future passes */
-    menuitem = gtk_image_menu_item_new_with_label (_("Future passes"));
-    image = gtk_image_new_from_stock (GTK_STOCK_INDEX,
-                                      GTK_ICON_SIZE_MENU);
-    gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menuitem), image);
-    g_object_set_data (G_OBJECT (menuitem), "sat", sat);
-    g_object_set_data (G_OBJECT (menuitem), "qth", single_sat->qth);
-    g_object_set_data (G_OBJECT (menuitem), "tstamp", &(single_sat->tstamp));
-/*    g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_future_passes),
-                      gtk_widget_get_toplevel (button));*/
-    g_signal_connect (menuitem, "activate",
-                      G_CALLBACK (show_future_passes_cb), data);
-    gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
+    /* add the menu items for current,next, and future passes. */
+    add_pass_menu_items(menu,sat,single_sat->qth,&single_sat->tstamp,data);
 
     /* separator */
 //     menuitem = gtk_separator_menu_item_new ();

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