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

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

Revision: 518
          http://gpredict.svn.sourceforge.net/gpredict/?rev=518&view=rev
Author:   csete
Date:     2009-11-18 17:06:56 +0000 (Wed, 18 Nov 2009)

Log Message:
-----------
Changed satellite selector to list satellites in the main pop-up menu instead of a submbenu (fewer mouse clicks).

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/src/gtk-single-sat.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-18 16:41:02 UTC (rev 517)
+++ trunk/ChangeLog	2009-11-18 17:06:56 UTC (rev 518)
@@ -7,7 +7,11 @@
     Pack transponder list into a scrolled window to prevent long transponder lists from
     resizing the satellite info dialog.
 
+    * src/gtk-single-sat.c:
+    Changed satellite selector to list satellites in the main pop-up menu instead of a
+    submbenu (fewer mouse clicks).
 
+
 2009-11-06 Alexandru Csete <oz9aec at gmail.com>
 
     * src/gtk-rig-ctrl.c:

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2009-11-18 16:41:02 UTC (rev 517)
+++ trunk/NEWS	2009-11-18 17:06:56 UTC (rev 518)
@@ -13,6 +13,7 @@
 - Applied patch 2877918: Fixes segfault in TLE updater (thanks Charles Suprin AA1VS).
 - Applied patch 2881367: Updated Flags to Locks (thanks Charles Suprin AA1VS).
 - Applied patch 2893617: Patches for fixing Windows build (thanks Valentin Yakovenkov).
+- Slightly improved UI for the single-satellite view.
 
 
 Changes in version 1.1 (5 Oct 2009)

Modified: trunk/src/gtk-single-sat.c
===================================================================
--- trunk/src/gtk-single-sat.c	2009-11-18 16:41:02 UTC (rev 517)
+++ trunk/src/gtk-single-sat.c	2009-11-18 17:06:56 UTC (rev 518)
@@ -791,7 +791,6 @@
 {
     GtkSingleSat *single_sat = GTK_SINGLE_SAT (data);
     GtkWidget    *menu;
-    GtkWidget    *select_menu;
     GtkWidget    *menuitem;
     GtkWidget    *image;
     GtkWidget    *label;
@@ -833,7 +832,7 @@
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
 
-    /* next pass and predict passes */
+    /* 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);
@@ -848,6 +847,7 @@
     
     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);
@@ -879,8 +879,7 @@
     menuitem = gtk_separator_menu_item_new ();
     gtk_menu_shell_append (GTK_MENU_SHELL(menu), menuitem);
 
-    select_menu = gtk_menu_new ();
-
+    /* select sat */
     for (i = 0; i < n; i++) {
 
         sati = SAT (g_slist_nth_data (single_sat->sats, i));
@@ -899,16 +898,12 @@
         g_signal_connect_after (menuitem, "activate",
                                 G_CALLBACK (select_satellite), single_sat);
 
-        gtk_menu_shell_append (GTK_MENU_SHELL (select_menu), menuitem);
+        //gtk_menu_shell_append (GTK_MENU_SHELL (select_menu), menuitem);
+        gtk_menu_shell_append (GTK_MENU_SHELL (menu), menuitem);
         //gtk_widget_show (menuitem);
     }
 
 
-    /* select sat */
-    menuitem = gtk_menu_item_new_with_label (_("Select satellite"));
-    gtk_menu_item_set_submenu (GTK_MENU_ITEM (menuitem), select_menu);
-    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;


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