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

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

Revision: 840
          http://gpredict.svn.sourceforge.net/gpredict/?rev=840&view=rev
Author:   aa1vs
Date:     2011-07-03 14:05:23 +0000 (Sun, 03 Jul 2011)

Log Message:
-----------
Show catalog number in satellite selector.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/src/gtk-sat-selector.c
    trunk/src/gtk-sat-selector.h
    trunk/src/mod-cfg.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2011-07-02 19:55:16 UTC (rev 839)
+++ trunk/ChangeLog	2011-07-03 14:05:23 UTC (rev 840)
@@ -1,5 +1,13 @@
-2011-06-29 Charles Suprin <hamaa1vs at gmail.com>
+2011-07-03 Charles Suprin <hamaa1vs at gmail.com>
 
+    * src/gtk-sat-selector.c
+    * src/gtk-sat-selector.h
+    * src/mod-cfg.c
+    Show catalog number in satellite selector.
+    Address 3322786: Show More Information in Edit Module Sat Selection.
+
+2011-07-01 Charles Suprin <hamaa1vs at gmail.com>
+
     * src/gtk-sat-map.c
     Add check on satellite map object allocation.
 

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2011-07-02 19:55:16 UTC (rev 839)
+++ trunk/NEWS	2011-07-03 14:05:23 UTC (rev 840)
@@ -3,6 +3,7 @@
 - New menu item in the module menu for selecting a satellite in all views.
 - Feature request 3141555: gpsd support.
 - Feature request 2130926: Change frequency using mouse wheel. Also for rotator controller.
+- Feature request 3322786: Show More Information in Edit Module Sat Selection.
 - Applied and extended patch 3237220: natural sort for sat list in module config
 - Improve handling of decayed satellites.
 - Fixed bug 3250344: Win32 build not working with hamlib.

Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c	2011-07-02 19:55:16 UTC (rev 839)
+++ trunk/src/gtk-sat-selector.c	2011-07-03 14:05:23 UTC (rev 840)
@@ -916,18 +916,28 @@
 {
     const gchar *searchstring;
     gchar       *satname;
+    gint         catnr;
+    gchar       *catnrstr;
     gboolean     selected;
-   
+    gboolean     retval = FALSE;
+    
     gtk_tree_model_get( model, iter, GTK_SAT_SELECTOR_COL_NAME, &satname, -1 );
+    gtk_tree_model_get( model, iter, GTK_SAT_SELECTOR_COL_CATNUM, &catnr, -1 );
     gtk_tree_model_get( model, iter, GTK_SAT_SELECTOR_COL_SELECTED, &selected, -1 );
     searchstring = gtk_entry_get_text( entry );
+    catnrstr = g_strdup_printf("%d",catnr);
+    //printf("satname %s catnr %s searchstring %s\n",satname,catnrstr,searchstring);
     /*if it is already selected then remove it from the available list*/
     if (selected)
-        return( FALSE);
-    if( gpredict_strcasestr( satname, searchstring ) != (char *)NULL )
-        return( TRUE );
-    else
-        return( FALSE );
+        retval = FALSE;
+    else if( gpredict_strcasestr( satname, searchstring ) != (char *)NULL )
+        retval = TRUE;
+    else if( gpredict_strcasestr( catnrstr, searchstring ) != (char *)NULL )
+        retval = TRUE;
+
+    g_free (catnrstr);
+    return (retval);
+
 } 
 
 /** \brief Searches through all the models for the given satellite and sets its selected value.

Modified: trunk/src/gtk-sat-selector.h
===================================================================
--- trunk/src/gtk-sat-selector.h	2011-07-02 19:55:16 UTC (rev 839)
+++ trunk/src/gtk-sat-selector.h	2011-07-03 14:05:23 UTC (rev 840)
@@ -57,7 +57,7 @@
 
 
 
-#define GTK_SAT_SELECTOR_DEFAULT_FLAGS (GTK_SAT_SELECTOR_FLAG_NAME | GTK_SAT_SELECTOR_COL_CATNUM)
+#define GTK_SAT_SELECTOR_DEFAULT_FLAGS (GTK_SAT_SELECTOR_FLAG_NAME | GTK_SAT_SELECTOR_FLAG_CATNUM)
 
 
 #define GTK_TYPE_SAT_SELECTOR  (gtk_sat_selector_get_type ())

Modified: trunk/src/mod-cfg.c
===================================================================
--- trunk/src/mod-cfg.c	2011-07-02 19:55:16 UTC (rev 839)
+++ trunk/src/mod-cfg.c	2011-07-03 14:05:23 UTC (rev 840)
@@ -623,7 +623,7 @@
                                                        "text", GTK_SAT_SELECTOR_COL_CATNUM,
                                                        NULL);
     gtk_tree_view_insert_column (GTK_TREE_VIEW (satlist), column, -1);
-    gtk_tree_view_column_set_visible (column, FALSE);
+    gtk_tree_view_column_set_visible (column, TRUE);
 
     /* epoch */
     renderer = gtk_cell_renderer_text_new ();


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