[Gpredict-svn] SF.net SVN: gpredict:[802] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[802] trunk
|
From: <aa...@us...> - 2011-03-30 23:16:08
|
Revision: 802
http://gpredict.svn.sourceforge.net/gpredict/?rev=802&view=rev
Author: aa1vs
Date: 2011-03-30 23:16:02 +0000 (Wed, 30 Mar 2011)
Log Message:
-----------
Check-in 1.3 windows packaging diff.
Modified Paths:
--------------
trunk/src/gpredict-utils.c
trunk/src/gpredict-utils.h
trunk/src/gtk-sat-map-popup.c
trunk/src/gtk-sat-selector.c
trunk/src/qth-data.c
trunk/src/qth-editor.c
trunk/src/sat-pref-qth-editor.c
trunk/src/sat-pref-qth.c
trunk/win32/Makefile
trunk/win32/build-config.h
trunk/win32/config.mk
Modified: trunk/src/gpredict-utils.c
===================================================================
--- trunk/src/gpredict-utils.c 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/gpredict-utils.c 2011-03-30 23:16:02 UTC (rev 802)
@@ -498,3 +498,18 @@
return strnatcasecmp(s1,s2);
#endif
}
+
+char * gpredict_strcasestr(const char *s1, const char *s2)
+{
+ size_t s1_len = strlen(s1);
+ size_t s2_len = strlen(s2);
+ while (s1_len >= s2_len) {
+ if (strncasecmp(s1, s2, s2_len) == 0)
+ return (char *) s1;
+
+ s1++;
+ s1_len--;
+ }
+
+ return NULL;
+}
Modified: trunk/src/gpredict-utils.h
===================================================================
--- trunk/src/gpredict-utils.h 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/gpredict-utils.h 2011-03-30 23:16:02 UTC (rev 802)
@@ -63,4 +63,5 @@
void gdk2rgba (const GdkColor *color, guint16 alpha, guint *rgba);
gchar *rgba2html (guint rgba);
int gpredict_strcmp (const char *s1, const char *s2);
+char *gpredict_strcasestr(const char *s1, const char *s2);
#endif
Modified: trunk/src/gtk-sat-map-popup.c
===================================================================
--- trunk/src/gtk-sat-map-popup.c 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/gtk-sat-map-popup.c 2011-03-30 23:16:02 UTC (rev 802)
@@ -345,7 +345,7 @@
sat = SAT(g_object_get_data (G_OBJECT (menuitem), "sat"));
qth = (qth_t *) (g_object_get_data (G_OBJECT (menuitem), "qth"));
- /* check wheather sat actially has AOS */
+ /* check whether sat actually has AOS */
if (has_aos (sat, qth)) {
if (sat_cfg_get_bool(SAT_CFG_BOOL_PRED_USE_REAL_T0)) {
Modified: trunk/src/gtk-sat-selector.c
===================================================================
--- trunk/src/gtk-sat-selector.c 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/gtk-sat-selector.c 2011-03-30 23:16:02 UTC (rev 802)
@@ -924,7 +924,7 @@
/*if it is already selected then remove it from the available list*/
if (selected)
return( FALSE);
- if( strcasestr( satname, searchstring ) != (char *)NULL )
+ if( gpredict_strcasestr( satname, searchstring ) != (char *)NULL )
return( TRUE );
else
return( FALSE );
Modified: trunk/src/qth-data.c
===================================================================
--- trunk/src/qth-data.c 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/qth-data.c 2011-03-30 23:16:02 UTC (rev 802)
@@ -41,7 +41,7 @@
#include "time-tools.h"
#include "locator.h"
#if HAS_LIBGPS
-#include <gps.h>
+# include <gps.h>
#endif
void qth_validate(qth_t*qth);
Modified: trunk/src/qth-editor.c
===================================================================
--- trunk/src/qth-editor.c 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/qth-editor.c 2011-03-30 23:16:02 UTC (rev 802)
@@ -348,10 +348,10 @@
gtk_table_attach_defaults (GTK_TABLE (table), alt, 1, 2, 6, 7);
if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_IMPERIAL)) {
- label = gtk_label_new (_("ft asl"));
+ label = gtk_label_new (_("ft above sea level"));
}
else {
- label = gtk_label_new (_("m asl"));
+ label = gtk_label_new (_("m above sea level"));
}
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 6, 7);
@@ -376,6 +376,7 @@
GUINT_TO_POINTER (SELECTION_MODE_WX));
gtk_table_attach_defaults (GTK_TABLE (table), wxbut, 3, 4, 7, 8);
+# if HAS_LIBGPS
/* GPSD enabled*/
label = gtk_label_new (_("QTH Type"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -414,8 +415,8 @@
_("Set the port for GPSD to use. Default for gpsd is 2947."),
NULL);
gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 10, 11);
+# endif
-
if (qth->name != NULL)
update_widgets (qth);
Modified: trunk/src/sat-pref-qth-editor.c
===================================================================
--- trunk/src/sat-pref-qth-editor.c 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/sat-pref-qth-editor.c 2011-03-30 23:16:02 UTC (rev 802)
@@ -333,10 +333,10 @@
gtk_table_attach_defaults (GTK_TABLE (table), alt, 1, 2, 6, 7);
if (sat_cfg_get_bool (SAT_CFG_BOOL_USE_IMPERIAL)) {
- label = gtk_label_new (_("ft asl"));
+ label = gtk_label_new (_("ft above sea level"));
}
else {
- label = gtk_label_new (_("m asl"));
+ label = gtk_label_new (_("m above sea level"));
}
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_table_attach_defaults (GTK_TABLE (table), label, 2, 3, 6, 7);
@@ -360,6 +360,8 @@
G_CALLBACK (select_location),
GUINT_TO_POINTER (SELECTION_MODE_WX));
gtk_table_attach_defaults (GTK_TABLE (table), wxbut, 3, 4, 7, 8);
+
+# if HAS_LIBGPS
/* GPSD enabled*/
label = gtk_label_new (_("QTH Type"));
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
@@ -398,8 +400,8 @@
_("Set the port for GPSD to use. Default for gpsd is 2947."),
NULL);
gtk_table_attach_defaults (GTK_TABLE (table), port, 1, 2, 10, 11);
+# endif
-
if (!new)
update_widgets (treeview);
Modified: trunk/src/sat-pref-qth.c
===================================================================
--- trunk/src/sat-pref-qth.c 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/src/sat-pref-qth.c 2011-03-30 23:16:02 UTC (rev 802)
@@ -187,6 +187,7 @@
column = gtk_tree_view_column_new_with_attributes (_("Name"), renderer,
"text", QTH_LIST_COL_NAME,
NULL);
+ gtk_tree_view_column_set_expand(column, TRUE);
gtk_tree_view_insert_column (GTK_TREE_VIEW (qthlist), column, -1);
/* location column */
@@ -194,6 +195,7 @@
column = gtk_tree_view_column_new_with_attributes (_("Location"), renderer,
"text", QTH_LIST_COL_LOC,
NULL);
+ gtk_tree_view_column_set_expand(column, TRUE);
gtk_tree_view_insert_column (GTK_TREE_VIEW (qthlist), column, -1);
/* lat column */
@@ -267,6 +269,9 @@
g_signal_connect (qthlist, "row-activated", G_CALLBACK (row_activated_cb), NULL);
+
+# if HAS_LIBGPS
+ /* GPSD enabled*/
/*server*/
renderer = gtk_cell_renderer_text_new ();
column = gtk_tree_view_column_new_with_attributes (_("GPSD\nServer"), renderer,
@@ -289,6 +294,7 @@
NULL);
gtk_tree_view_insert_column (GTK_TREE_VIEW (qthlist), column, -1);
gtk_tree_view_column_set_alignment (column, 0.5);
+# endif
return qthlist;
}
@@ -827,7 +833,7 @@
/* function below not used */
#if 0
-/** \brief Callback function to check each QTH for beeing the default */
+/** \brief Callback function to check each QTH for being the default */
static gboolean
check_and_set_default_qth (GtkTreeModel *model,
GtkTreePath *path,
Modified: trunk/win32/Makefile
===================================================================
--- trunk/win32/Makefile 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/win32/Makefile 2011-03-30 23:16:02 UTC (rev 802)
@@ -5,8 +5,10 @@
# directories
topsrc = ..
-gcincdir = c:/mingw/include/goocanvas-0.10/goocanvas/
-gcsrcdir = $(topsrc)/goocanv8/src
+glibdir = c:/mingw/include/glib-2.0
+gcincdir = c:/mingw/include/goocanvas/
+gcsrcdir = $(topsrc)/goocanvas-0.15/src
+
gpreddir = $(topsrc)/src
sgpsdpdir = $(gpreddir)/sgpsdp
@@ -22,13 +24,12 @@
# libraries
GTKLIBS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs gtk+-win32-2.0)
GLIBLIB := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --libs glib-2.0 gthread-2.0)
-GUI_LIBS = $(GTKLIBS) $(GLIBLIB) -lgoocanvas libsgpsdp.lib -lcurldll -lwinmm -lws2_32
+GUI_LIBS = $(GTKLIBS) $(GLIBLIB) -lgoocanvas libsgpsdp.lib -lcurl.dll -lwinmm -lws2_32
LIBS = -lm
-
# flags/defines
CFLAGS = -DHAVE_CONFIG_H -DHAVE_LIBCURL -DPACKAGE_LOCALE_DIR=\"/\" \
- -I. -I.. -I$(gpreddir) -I$(gcincdir) -I$(gcsrcdir) -I$(CROSSDIR)/include
+ -I. -I.. -I$(glibdir) -I$(gpreddir) -I$(gcincdir) -I$(gcsrcdir) -I$(CROSSDIR)/include
GTK_CFLAGS := $(shell PKG_CONFIG_PATH=$(PKG_CONFIG_PATH) pkg-config --cflags gtk+-win32-2.0)
# source paths
@@ -121,6 +122,7 @@
pass-popup-menu.c \
pass-to-txt.c \
predict-tools.c \
+ print-pass.c \
qth-data.c \
qth-editor.c \
radio-conf.c \
@@ -159,6 +161,7 @@
sat-pref-tle.c \
sat-vis.c \
save-pass.c \
+ strnatcmp.c \
time-tools.c \
tle-tools.c \
tle-update.c \
Modified: trunk/win32/build-config.h
===================================================================
--- trunk/win32/build-config.h 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/win32/build-config.h 2011-03-30 23:16:02 UTC (rev 802)
@@ -86,4 +86,9 @@
#undef STDC_HEADERS
/* Version number of package */
-#define VERSION "1.1"
+#define VERSION "1.3"
+
+#define GETTEXT_PACKAGE "gpredict"
+
+#define HAS_LIBGPS 0
+
Modified: trunk/win32/config.mk
===================================================================
--- trunk/win32/config.mk 2011-03-29 00:55:07 UTC (rev 801)
+++ trunk/win32/config.mk 2011-03-30 23:16:02 UTC (rev 802)
@@ -1,7 +1,7 @@
# Configuration variables governing the build of grig for win32
# directory containing the cross tools
-#CROSSDIR = /grga/mingw32/buildenv
+CROSSDIR = /cygdrive/c/mingw
# prefix for mingw tools (e.g. i586-mingw32msvc-gcc)
#MGW_PREFIX = i586-mingw32msvc-
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
