Menu
▾
▴
[Groundstation-commits] CVS: gpredict/src ChangeLog,1.107,1.108 Makefile.am,1.62,1.63 satconfig-locations.c,1.15,1.16 satconfig-tle-get.c,1.1,1.2 satconfig-tle.c,1.4,1.5 satconfig-tle.h,1.2,1.3 satconfig.c,1.7,1.8
|
From: Alexandru C. <cs...@us...> - 2003-01-26 17:09:40
|
Update of /cvsroot/groundstation/gpredict/src
In directory sc8-pr-cvs1:/tmp/cvs-serv4854a
Modified Files:
ChangeLog Makefile.am satconfig-locations.c
satconfig-tle-get.c satconfig-tle.c satconfig-tle.h
satconfig.c
Log Message:
Updated.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -C2 -d -r1.107 -r1.108
*** ChangeLog 24 Jan 2003 13:42:35 -0000 1.107
--- ChangeLog 26 Jan 2003 17:09:37 -0000 1.108
***************
*** 1,2 ****
--- 1,6 ----
+ 2003-01-26; Alexandru Csete <cs...@us...>
+ * satconfig-tle.c: Changed icon. Reordered radio buttons.
+ * satconfig-tle-get.c, satconfig-tle-get.h: New files.
+
2003-01-24; Alexandru Csete <cs...@us...>
* satconfig-locations.c: Rearranged widgets (better look).
Index: Makefile.am
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/Makefile.am,v
retrieving revision 1.62
retrieving revision 1.63
diff -C2 -d -r1.62 -r1.63
*** Makefile.am 23 Jan 2003 13:42:33 -0000 1.62
--- Makefile.am 26 Jan 2003 17:09:37 -0000 1.63
***************
*** 20,23 ****
--- 20,24 ----
satconfig-locations.c satconfig-locations.h \
satconfig-tle.c satconfig-tle.h \
+ satconfig-tle-get.c satconfig-tle-get.h \
satmodules.c satmodules.h\
sattabs.c sattabs.h \
Index: satconfig-locations.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satconfig-locations.c,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** satconfig-locations.c 24 Jan 2003 11:39:08 -0000 1.15
--- satconfig-locations.c 26 Jan 2003 17:09:37 -0000 1.16
***************
*** 295,299 ****
qthpage = gnome_druid_page_standard_new ();
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (qthpage),
! _("Default Location"));
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (qthpage), &logobg);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (qthpage), &mainbg);
--- 295,299 ----
qthpage = gnome_druid_page_standard_new ();
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (qthpage),
! _("Default Location:"));
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (qthpage), &logobg);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (qthpage), &mainbg);
Index: satconfig-tle-get.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satconfig-tle-get.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** satconfig-tle-get.c 26 Jan 2003 15:56:20 -0000 1.1
--- satconfig-tle-get.c 26 Jan 2003 17:09:37 -0000 1.2
***************
*** 43,46 ****
--- 43,49 ----
extern GdkColor logobg,mainbg;
extern GtkWidget *app;
+ extern sat_data_source_t source;
+
+ static void satconfig_tle_get_prepare (GnomeDruidPage *page, gpointer druid, gpointer data);
***************
*** 48,52 ****
satconfig_tle_get_open ()
{
! return NULL;
}
--- 51,82 ----
satconfig_tle_get_open ()
{
! GtkWidget *tlepage;
! GdkImlibImage *logo;
! gchar *fname;
!
! /* create the page */
! tlepage = gnome_druid_page_standard_new ();
! gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (tlepage),
! _("Get TLE Data:"));
! gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (tlepage), &logobg);
! gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (tlepage), &mainbg);
! gnome_druid_page_standard_set_logo_bg_color (GNOME_DRUID_PAGE_STANDARD (tlepage), &logobg);
!
! /* this page has dynamic content depending on what choice the user made on the previous page */
! gtk_signal_connect (GTK_OBJECT (tlepage), "prepare",
! GTK_SIGNAL_FUNC (satconfig_tle_get_prepare), NULL);
!
! /* add logo */
! fname = g_strconcat (PACKAGE_PIXMAPS_DIR, G_DIR_SEPARATOR_S,
! "icons", G_DIR_SEPARATOR_S, "gpredict-tle-web.png",
! NULL);
! logo = gdk_imlib_load_image (fname);
! g_free (fname);
! gnome_druid_page_standard_set_logo (GNOME_DRUID_PAGE_STANDARD (tlepage), logo);
! gdk_imlib_destroy_image (logo);
!
! gtk_container_set_border_width (GTK_CONTAINER (GNOME_DRUID_PAGE_STANDARD (tlepage)->vbox), 5);
!
! return tlepage;
}
***************
*** 63,65 ****
--- 93,113 ----
{
+ }
+
+
+ static void
+ satconfig_tle_get_prepare (GnomeDruidPage *page, gpointer druid, gpointer data)
+ {
+ switch (source) {
+ case SAT_DATA_SOURCE_DIST:
+ break;
+ case SAT_DATA_SOURCE_WEB:
+ break;
+ case SAT_DATA_SOURCE_FTP:
+ break;
+ case SAT_DATA_SOURCE_LOCAL:
+ break;
+ default:
+ break;
+ }
}
Index: satconfig-tle.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satconfig-tle.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** satconfig-tle.c 26 Jan 2003 15:42:23 -0000 1.4
--- satconfig-tle.c 26 Jan 2003 17:09:37 -0000 1.5
***************
*** 7,11 ****
! Copyright (C) 2002 Alexandru Csete.
Authors: Alexandru Csete <cs...@us...>
--- 7,11 ----
! Copyright (C) 2003 Alexandru Csete.
Authors: Alexandru Csete <cs...@us...>
***************
*** 51,54 ****
--- 51,67 ----
GtkWidget *localdir,*ftpserver;
+ /* following files will be downloaded if
+ the user selects the CelesTrak
+ option.
+ */
+ const gchar *celestrak_list[] = {
+ "amateur.txt",
+ "education.txt",
+ "geo.txt",
+ "iridium.txt",
+ "noaa.txt",
+ "science.txt",
+ NULL
+ };
***************
*** 118,122 ****
tlepage = gnome_druid_page_standard_new ();
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (tlepage),
! _("Select TLE Data Source"));
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (tlepage), &logobg);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (tlepage), &mainbg);
--- 131,135 ----
tlepage = gnome_druid_page_standard_new ();
gnome_druid_page_standard_set_title (GNOME_DRUID_PAGE_STANDARD (tlepage),
! _("Get TLE Data:"));
gnome_druid_page_standard_set_bg_color (GNOME_DRUID_PAGE_STANDARD (tlepage), &logobg);
gnome_druid_page_standard_set_title_color (GNOME_DRUID_PAGE_STANDARD (tlepage), &mainbg);
***************
*** 125,129 ****
/* add logo */
fname = g_strconcat (PACKAGE_PIXMAPS_DIR, G_DIR_SEPARATOR_S,
! "icons", G_DIR_SEPARATOR_S, "gpredict-home.png",
NULL);
logo = gdk_imlib_load_image (fname);
--- 138,142 ----
/* add logo */
fname = g_strconcat (PACKAGE_PIXMAPS_DIR, G_DIR_SEPARATOR_S,
! "icons", G_DIR_SEPARATOR_S, "gpredict-tle-web.png",
NULL);
logo = gdk_imlib_load_image (fname);
Index: satconfig-tle.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satconfig-tle.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** satconfig-tle.h 24 Jan 2003 13:42:35 -0000 1.2
--- satconfig-tle.h 26 Jan 2003 17:09:37 -0000 1.3
***************
*** 40,46 ****
SAT_DATA_SOURCE_NONE = 0, /* Unknown source */
SAT_DATA_SOURCE_DIST, /* Distributed sat data. */
- SAT_DATA_SOURCE_LOCAL, /* Sat data from a local dir. */
SAT_DATA_SOURCE_WEB, /* Data from the web. */
! SAT_DATA_SOURCE_FTP /* Data from FTP site. */
} sat_data_source_t;
--- 40,46 ----
SAT_DATA_SOURCE_NONE = 0, /* Unknown source */
SAT_DATA_SOURCE_DIST, /* Distributed sat data. */
SAT_DATA_SOURCE_WEB, /* Data from the web. */
! SAT_DATA_SOURCE_FTP, /* Data from FTP site. */
! SAT_DATA_SOURCE_LOCAL /* Sat data from a local dir. */
} sat_data_source_t;
Index: satconfig.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict/src/satconfig.c,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** satconfig.c 23 Jan 2003 13:42:34 -0000 1.7
--- satconfig.c 26 Jan 2003 17:09:37 -0000 1.8
***************
*** 12,16 ****
! Copyright (C) 2002 Alexandru Csete.
Authors: Alexandru Csete <cs...@us...>
--- 12,16 ----
! Copyright (C) 2002-2003 Alexandru Csete.
Authors: Alexandru Csete <cs...@us...>
***************
*** 44,47 ****
--- 44,48 ----
#include "satconfig-locations.h"
#include "satconfig-tle.h"
+ #include "satconfig-tle-get.h"
#ifdef HAVE_CONFIG_H
***************
*** 103,107 ****
gnome_druid_append_page (GNOME_DRUID (druid),
GNOME_DRUID_PAGE (satconfig_tle_open ()));
!
/* end page */
--- 104,109 ----
gnome_druid_append_page (GNOME_DRUID (druid),
GNOME_DRUID_PAGE (satconfig_tle_open ()));
! gnome_druid_append_page (GNOME_DRUID (druid),
! GNOME_DRUID_PAGE (satconfig_tle_get_open ()));
/* end page */
***************
*** 208,211 ****
--- 210,214 ----
satconfig_locations_cancel ();
satconfig_tle_cancel ();
+ satconfig_tle_get_cancel ();
gtk_widget_destroy (GTK_WIDGET (druidwin));
***************
*** 224,227 ****
--- 227,231 ----
satconfig_locations_finish ();
satconfig_tle_finish ();
+ satconfig_tle_get_finish ();
gtk_widget_destroy (GTK_WIDGET (druidwin));
|