[Groundstation-commits] CVS: gpredict2/src sat-pref.c,1.8,1.9 sat-pref-formats.c,1.3,1.4 sat-pref-ge

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 454-5900

Update of /cvsroot/groundstation/gpredict2/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2986

Modified Files:
	sat-pref.c sat-pref-formats.c sat-pref-general.c 
	sat-pref-interfaces.c sat-pref-list-view.c sat-pref-map-view.c 
	sat-pref-modules.c sat-pref-polar-view.c sat-pref-predict.c 
	sat-pref-qth.c sat-pref-rig.c sat-pref-rot.c 
	sat-pref-sky-at-glance.c sat-pref-formats.h sat-pref-general.h 
	sat-pref-interfaces.h sat-pref-list-view.h sat-pref-map-view.h 
	sat-pref-modules.h sat-pref-polar-view.h sat-pref-predict.h 
	sat-pref-qth.h sat-pref-rig.h sat-pref-rot.h 
	sat-pref-sky-at-glance.h 
Log Message:
- Use buttons instead of GtkIconBox (bad size request).
- Re-organised grouping and aded some new files during the pocess.
Implemented sat-pref-formats.c and added code to save config data back to configuration file.

Index: sat-pref.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** sat-pref.c	19 Oct 2005 08:40:08 -0000	1.8
--- sat-pref.c	22 Oct 2005 12:34:35 -0000	1.9
***************
*** 35,39 ****
  #endif
  #include "compat.h"
! #include "sat-log.h"
  #include "gpredict-utils.h"
  #include "sat-pref.h"
--- 35,39 ----
  #endif
  #include "compat.h"
! #include "sat-cfg.h"
  #include "gpredict-utils.h"
  #include "sat-pref.h"
***************
*** 54,58 ****

  static void button_press_cb (GtkWidget *widget, gpointer nbook);
- static void sat_pref_save_cfg_data (GKeyFile *config, const gchar *keyfile);

--- 54,57 ----
***************
*** 79,111 ****
          GtkWidget *butbox;
  	GtkWidget *genbut,*modbut,*ifbut,*predbut;
- 
-         GError    *error = NULL;
-         gchar     *msg;
          gchar     *iconfile;
- 	gchar     *keyfile;
-         GKeyFile  *config;
  	gint       response;

-         /* load the configuration file */
-         config = g_key_file_new ();
- 	keyfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- 			       ".gpredict2", G_DIR_SEPARATOR_S,
- 			       "gpredict.cfg", NULL);
- 	g_key_file_load_from_file (config, keyfile, G_KEY_FILE_KEEP_COMMENTS, &error);
- 
- 	if (error != NULL) {
- 
- 		msg = g_strdup_printf (_("%s: Error reading config file (%s)"),
- 				       __FUNCTION__, error->message);
- 		sat_log_log (SAT_LOG_LEVEL_WARN, msg);
- 		g_free (msg);
- 		msg = g_strdup_printf (_("%s: Using built-in defaults"), __FUNCTION__);
- 		sat_log_log (SAT_LOG_LEVEL_WARN, msg);
- 		g_free (msg);
- 
- 		g_clear_error (&error);
- 	}
- 			       

          /* Create notebook and add individual pages.
--- 78,85 ----
***************
*** 114,130 ****
          nbook = gtk_notebook_new ();
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_general_create (config),
                                    gtk_label_new (_("General")));
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_modules_create (config),
                                    gtk_label_new (_("Modules")));
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_interfaces_create (config),
                                    gtk_label_new (_("Interfaces")));
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_predict_create (config),
                                    gtk_label_new (_("Predictor")));

  	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE);

--- 88,105 ----
          nbook = gtk_notebook_new ();
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_general_create (),
                                    gtk_label_new (_("General")));
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_modules_create (),
                                    gtk_label_new (_("Modules")));
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_interfaces_create (),
                                    gtk_label_new (_("Interfaces")));
          gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
!                                   sat_pref_predict_create (),
                                    gtk_label_new (_("Predictor")));

  	gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE);
+ 	gtk_notebook_set_show_border (GTK_NOTEBOOK (nbook), FALSE);

***************
*** 196,205 ****
  	case GTK_RESPONSE_ACCEPT:

! 		sat_pref_general_ok (config);
! 		sat_pref_modules_ok (config);
! 		sat_pref_interfaces_ok (config);
! 		sat_pref_predict_ok (config);

! 		sat_pref_save_cfg_data (config, keyfile);

  		break;
--- 171,180 ----
  	case GTK_RESPONSE_ACCEPT:

! 		sat_pref_general_ok ();
! 		sat_pref_modules_ok ();
! 		sat_pref_interfaces_ok ();
! 		sat_pref_predict_ok ();

! 		sat_cfg_save ();

  		break;
***************
*** 207,220 ****
  	default:

! 		sat_pref_general_cancel (config);
! 		sat_pref_modules_cancel (config);
! 		sat_pref_interfaces_cancel (config);
! 		sat_pref_predict_cancel (config);

  		break;
  	}

- 	g_free (keyfile);
- 	g_key_file_free (config);
  	gtk_widget_destroy (window);

--- 182,193 ----
  	default:

! 		sat_pref_general_cancel ();
! 		sat_pref_modules_cancel ();
! 		sat_pref_interfaces_cancel ();
! 		sat_pref_predict_cancel ();

  		break;
  	}

  	gtk_widget_destroy (window);

***************
*** 234,308 ****
  }

- 
- 
- 
- static void
- sat_pref_save_cfg_data (GKeyFile *config, const gchar *keyfile)
- {
- 	/* Write config data back to file..
- 	   More compliated than absolutely neccessary because we whish
- 	   to keep user well informed if anything goes wrong. It will
- 	   make our life easier when people send bug reports.
- 	*/
- 	gsize   length;
- 	gsize   written;
- 	GError *error = NULL;
- 	gchar  *msg;
- 	gchar  *cfgstr;
- 
- 	cfgstr = g_key_file_to_data (config, &length, &error);
- 
- 	if (error != NULL) {
- 		msg = g_strdup_printf (_("%s: Could not create config data (%s)."),
- 				       __FUNCTION__, error->message);
- 		sat_log_log (SAT_LOG_LEVEL_ERROR, msg);
- 		g_free (msg);
- 		g_clear_error (&error);
- 	}
- 	else {
- 		GIOChannel *cfgfile = g_io_channel_new_file (keyfile,
- 							     "w",
- 							     &error);
- 		if (error != NULL) {
- 			msg = g_strdup_printf (_("%s: Could not create config file (%s)."),
- 					       __FUNCTION__, error->message);
- 			sat_log_log (SAT_LOG_LEVEL_ERROR, msg);
- 
- 			g_free (msg);
- 			g_clear_error (&error);
- 		}
- 		else {
- 			g_io_channel_write_chars (cfgfile,
- 						  cfgstr,
- 						  length,
- 						  &written,
- 						  &error);
- 
- 			g_io_channel_shutdown (cfgfile, TRUE, NULL);
- 			g_io_channel_unref (cfgfile);
- 
- 			if (error != NULL) {
- 				msg = g_strdup_printf (_("%s: Error writing config data (%s)."),
- 						       __FUNCTION__, error->message);
- 				sat_log_log (SAT_LOG_LEVEL_ERROR, msg);
- 				g_free (msg);
- 				g_clear_error (&error);
- 			}
- 			else if (length != written) {
- 				msg = g_strdup_printf (_("%s: Wrote only %d out of %d chars."),
- 						       __FUNCTION__, written, length);
- 				sat_log_log (SAT_LOG_LEVEL_WARN, msg);
- 				g_free (msg);
- 			}
- 			else {
- 				msg = g_strdup_printf (_("%s: Configuration saved."), __FUNCTION__);
- 				sat_log_log (SAT_LOG_LEVEL_MSG, msg);
- 				g_free (msg);
- 			}
- 		}
- 
- 		g_free (cfgstr);
- 	}
- 
- 
- }
--- 207,208 ----

Index: sat-pref-formats.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-formats.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sat-pref-formats.c	19 Oct 2005 08:39:47 -0000	1.3
--- sat-pref-formats.c	22 Oct 2005 12:34:35 -0000	1.4
***************
*** 28,40 ****
  #include <gtk/gtk.h>
  #include <glib/gi18n.h>
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
  #endif
! #include "sat-log.h"
! #include "defaults.h"
! #include "config-keys.h"
  #include "sat-pref-formats.h"

  static const gchar *tztips = N_("Display local time instead of UTC. Note: The local "\
  				"time is that of your operating system and not the "\
--- 28,43 ----
  #include <gtk/gtk.h>
  #include <glib/gi18n.h>
+ #include <time.h>
+ #include <sys/time.h>
  #ifdef HAVE_CONFIG_H
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-formats.h"

+ #define TIME_FORMAT_MAX_LENGTH 50
+ 
+ 
  static const gchar *tztips = N_("Display local time instead of UTC. Note: The local "\
  				"time is that of your operating system and not the "\
***************
*** 61,111 ****

  static GtkWidget *tzcheck;       /* "time zone" check button */
- static GtkWidget *tfcheck;       /* time format check button */
  static GtkWidget *tfentry;       /* time format entry */
  static GtkWidget *nsewcheck;     /* N/S/W/E check button */
  static GtkWidget *impcheck;      /* Use imperial units */

! static void sat_pref_formats_read_config_data (GKeyFile *config);
! static void sat_pref_formats_write_config_data (GKeyFile *config);
! static void tfcheck_toggle_cb (GtkWidget *widget, gpointer data);

  /** \brief Create and initialise widgets for number formats tab.
   *
-  * The widgets must be preloaded with values from config. If a config value
-  * is NULL, sensible default values, eg. those from defaults.h should
-  * be laoded.
   */
! GtkWidget *sat_pref_formats_create (GKeyFile *config)
  {
  	GtkWidget   *vbox,*tfbox;
  	GtkTooltips *tips;

! 	/* time format */
  	tzcheck = gtk_check_button_new_with_label (_("Show local time instead of UTC."));
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, tzcheck, tztips, NULL);

! 	tfcheck = gtk_check_button_new_with_label (_("Use this time format:"));
! 	g_signal_connect (G_OBJECT (tfcheck), "toggled",
! 			  G_CALLBACK (tfcheck_toggle_cb),
! 			  NULL);
  	tfentry = gtk_entry_new ();
! 	gtk_entry_set_max_length (GTK_ENTRY (tfentry), 50);
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, tfentry, tftips, NULL);
! 	/* example */
! 	tfbox = gtk_hbox_new (FALSE, 10);
! 	gtk_box_pack_start (GTK_BOX (tfbox), tfcheck, FALSE, FALSE, 0);
  	gtk_box_pack_start (GTK_BOX (tfbox), tfentry, TRUE, TRUE, 0);
! 	
  	/* N/S/W/E */
! 	nsewcheck = gtk_check_button_new_with_label (_("Use N/S/E/W suffix for coordinates."));
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, nsewcheck, nsewtips, NULL);

  	/* unit */
! 	impcheck = gtk_check_button_new_with_label (_("Use Imperial units."));
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, impcheck, imptips, NULL);
--- 64,132 ----

  static GtkWidget *tzcheck;       /* "time zone" check button */
  static GtkWidget *tfentry;       /* time format entry */
+ static GtkWidget *tflabel;       /* time format label, preview */
+ static GtkWidget *tfreset;       /* time format reset button */
  static GtkWidget *nsewcheck;     /* N/S/W/E check button */
  static GtkWidget *impcheck;      /* Use imperial units */
+ static guint      timer;

! static gboolean tfprev_cb (gpointer data);

  /** \brief Create and initialise widgets for number formats tab.
   *
   */
! GtkWidget *sat_pref_formats_create ()
  {
  	GtkWidget   *vbox,*tfbox;
  	GtkTooltips *tips;
+ 	gchar       *text;

! 	/* use local time */
  	tzcheck = gtk_check_button_new_with_label (_("Show local time instead of UTC."));
+ 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tzcheck),
+ 				      sat_cfg_get_bool (SAT_CFG_BOOL_USE_LOCAL_TIME));
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, tzcheck, tztips, NULL);

! 	/* time format */
  	tfentry = gtk_entry_new ();
! 	gtk_entry_set_max_length (GTK_ENTRY (tfentry), TIME_FORMAT_MAX_LENGTH);
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, tfentry, tftips, NULL);
! 
! 	text = sat_cfg_get_str (SAT_CFG_STR_TIME_FORMAT);
! 	gtk_entry_set_text (GTK_ENTRY (tfentry), text);
! 	g_free (text);
! 
! 	tflabel = gtk_label_new ("--/--/-- --:--:--");
! 
! 	/* periodic update of preview label */
! 	timer = g_timeout_add (1000,tfprev_cb, NULL);
! 
! 	/* reset button */
! 	tfreset = gtk_button_new_with_label (_("Reset"));
! 	tips = gtk_tooltips_new ();
! 	gtk_tooltips_set_tip (tips, tfreset, _("Reset to default value"), NULL);
! 
! 	tfbox = gtk_hbox_new (FALSE, 5);
! 	gtk_box_pack_start (GTK_BOX (tfbox), gtk_label_new (_("Time format:")),
! 			    FALSE, FALSE, 0);
  	gtk_box_pack_start (GTK_BOX (tfbox), tfentry, TRUE, TRUE, 0);
! 	gtk_box_pack_start (GTK_BOX (tfbox), tflabel, FALSE, FALSE, 0);
! 	gtk_box_pack_start (GTK_BOX (tfbox), tfreset, FALSE, FALSE, 5);
! 
  	/* N/S/W/E */
! 	nsewcheck = gtk_check_button_new_with_label (_("Use N/S/E/W for geographical coordinates."));
! 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nsewcheck),
! 				      sat_cfg_get_bool (SAT_CFG_BOOL_USE_NSEW));	
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, nsewcheck, nsewtips, NULL);

  	/* unit */
! 	impcheck = gtk_check_button_new_with_label (_("Use Imperial units instead of Metric."));
! 	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impcheck),
! 				      sat_cfg_get_bool (SAT_CFG_BOOL_USE_IMPERIAL));	
  	tips = gtk_tooltips_new ();
  	gtk_tooltips_set_tip (tips, impcheck, imptips, NULL);
***************
*** 120,145 ****
  	gtk_box_pack_start (GTK_BOX (vbox), impcheck, FALSE, FALSE, 0);

- 	sat_pref_formats_read_config_data (config);
- 
          return vbox;
  }

- /** \brief handle time format toggles
-  *
-  */
- static void
- tfcheck_toggle_cb (GtkWidget *widget, gpointer data)
- {
- 	gtk_widget_set_sensitive (tfentry,
- 				  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)));
- }
- 

  /** \brief User pressed cancel. Any changes to config must be cancelled.
   */
  void
! sat_pref_formats_cancel (GKeyFile *config)
  {
  }

--- 141,155 ----
  	gtk_box_pack_start (GTK_BOX (vbox), impcheck, FALSE, FALSE, 0);

          return vbox;
  }

  /** \brief User pressed cancel. Any changes to config must be cancelled.
   */
  void
! sat_pref_formats_cancel ()
  {
+ 	g_source_remove (timer);
  }

***************
*** 148,353 ****
   */
  void
! sat_pref_formats_ok     (GKeyFile *config)
! {
! 	sat_pref_formats_write_config_data (config);
! }
! 
! 
! /** \brief Read configuration data.
!  *
!  * FIXME: Too high complexity
!  *
!  **/
! static void
! sat_pref_formats_read_config_data (GKeyFile *config)
  {
! 	gboolean  bool;
! 	gchar    *str;
! 	GError   *error = NULL;
! 	gchar    *msg;
! 
! 	if (g_key_file_has_group (config, SAT_CFG_GLOBAL_SECTION)) {
! 
! 		/* local time check box */
! 		if (g_key_file_has_key (config,
! 					SAT_CFG_GLOBAL_SECTION,
! 					SAT_CFG_LOCAL_TIME_KEY,
! 					NULL)) {
! 			
! 			bool = g_key_file_get_boolean (config,
! 						       SAT_CFG_GLOBAL_SECTION,
! 						       SAT_CFG_LOCAL_TIME_KEY,
! 						       &error);
! 			if (error != NULL) {
! 				msg = g_strdup_printf (_("%s: Could not read %s (%s)."),
! 						       __FUNCTION__,
! 						       SAT_CFG_LOCAL_TIME_KEY,
! 						       error->message);
! 				sat_log_log (SAT_LOG_LEVEL_ERROR, msg);
! 				g_free (msg);
! 				g_clear_error (&error);
! 
! 				/* default value is FALSE, so no need to set widget */
! 			}
! 			else {
! 				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tzcheck),
! 							      bool);
! 			}
! 		}
! 
! 		/* time format */
! 		if (g_key_file_has_key (config,
! 					SAT_CFG_GLOBAL_SECTION,
! 					SAT_CFG_TIME_FORMAT_KEY,
! 					NULL)) {
! 			
! 			str = g_key_file_get_string (config,
! 						     SAT_CFG_GLOBAL_SECTION,
! 						     SAT_CFG_TIME_FORMAT_KEY,
! 						     &error);
! 			if (error != NULL) {
! 				msg = g_strdup_printf (_("%s: Could not read %s (%s)."),
! 						       __FUNCTION__,
! 						       SAT_CFG_TIME_FORMAT_KEY,
! 						       error->message);
! 				sat_log_log (SAT_LOG_LEVEL_ERROR, msg);
! 				g_free (msg);
! 				g_clear_error (&error);

! 				/* enter default time format into entry
! 				   and disable widget
! 				*/
! 				gtk_entry_set_text (GTK_ENTRY (tfentry),
! 						    DEFAULT_TIME_FORMAT);
! 				gtk_widget_set_sensitive (tfentry, FALSE);
! 			}
! 			else {
! 				gtk_entry_set_text (GTK_ENTRY (tfentry), str);

- 				gtk_widget_set_sensitive (tfentry, TRUE);
- 				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (tfcheck),
- 							      TRUE);

- 				g_free (str);
- 			}
- 		}
- 		else {
- 				/* enter default time format into entry
- 				   and disable widget
- 				*/
- 				gtk_entry_set_text (GTK_ENTRY (tfentry),
- 						    DEFAULT_TIME_FORMAT);
- 				gtk_widget_set_sensitive (tfentry, FALSE);
- 		}			

! 		/* Use N/S/E/W */
! 		if (g_key_file_has_key (config,
! 					SAT_CFG_GLOBAL_SECTION,
! 					SAT_CFG_SHOW_NSEW_KEY,
! 					NULL)) {
! 			
! 			bool = g_key_file_get_boolean (config,
! 						       SAT_CFG_GLOBAL_SECTION,
! 						       SAT_CFG_SHOW_NSEW_KEY,
! 						       &error);
! 			if (error != NULL) {
! 				msg = g_strdup_printf (_("%s: Could not read %s (%s)."),
! 						       __FUNCTION__,
! 						       SAT_CFG_SHOW_NSEW_KEY,
! 						       error->message);
! 				sat_log_log (SAT_LOG_LEVEL_ERROR, msg);
! 				g_free (msg);
! 				g_clear_error (&error);

- 				/* default value is FALSE, so no need to set widget */
- 			}
- 			else {
- 				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (nsewcheck),
- 							      bool);
- 			}
- 		}

! 		/* Imperial units */
! 		if (g_key_file_has_key (config,
! 					SAT_CFG_GLOBAL_SECTION,
! 					SAT_CFG_IMPERIAL_KEY,
! 					NULL)) {
! 			
! 			bool = g_key_file_get_boolean (config,
! 						       SAT_CFG_GLOBAL_SECTION,
! 						       SAT_CFG_IMPERIAL_KEY,
! 						       &error);
! 			if (error != NULL) {
! 				msg = g_strdup_printf (_("%s: Could not read %s (%s)."),
! 						       __FUNCTION__,
! 						       SAT_CFG_IMPERIAL_KEY,
! 						       error->message);
! 				sat_log_log (SAT_LOG_LEVEL_ERROR, msg);
! 				g_free (msg);
! 				g_clear_error (&error);

! 				/* default value is FALSE, so no need to set widget */
! 			}
! 			else {
! 				gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (impcheck),
! 							      bool);
! 			}
! 		}

! 	}
! 	else {
! 		/* there is no section, thus no need to read anything */

! 		/* except ... */

! 		/* enter default time format into entry
! 		   and disable widget
! 		*/
! 		gtk_entry_set_text (GTK_ENTRY (tfentry),
! 				    DEFAULT_TIME_FORMAT);
! 		gtk_widget_set_sensitive (tfentry, FALSE);
! 	}
  }

- /*** FIXME: Write comments if this is the first time */
- static void
- sat_pref_formats_write_config_data (GKeyFile *config)
- {
- 
- 
- 	/* local time */
- 	g_key_file_set_boolean (config,
- 				SAT_CFG_GLOBAL_SECTION,
- 				SAT_CFG_LOCAL_TIME_KEY,
- 				gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tzcheck)));
- 
- 	/* time format */
- 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tfcheck))) {
- 
- 		g_key_file_set_string (config,
- 				       SAT_CFG_GLOBAL_SECTION,
- 				       SAT_CFG_TIME_FORMAT_KEY,
- 				       gtk_entry_get_text (GTK_ENTRY (tfentry)));
- 	}
- 	/* delete key to avoid old data being written back */
- 	else {
- 		g_key_file_remove_key (config,
- 				       SAT_CFG_GLOBAL_SECTION,
- 				       SAT_CFG_TIME_FORMAT_KEY,
- 				       NULL);
- 	}
- 
- 	/* N/S/E/W */
- 	g_key_file_set_boolean (config,
- 				SAT_CFG_GLOBAL_SECTION,
- 				SAT_CFG_SHOW_NSEW_KEY,
- 				gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (nsewcheck)));
- 	/* Imperial units */
- 	g_key_file_set_boolean (config,
- 				SAT_CFG_GLOBAL_SECTION,
- 				SAT_CFG_IMPERIAL_KEY,
- 				gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impcheck)));
- 
- 
- }
--- 158,210 ----
   */
  void
! sat_pref_formats_ok     ()
  {
! 	g_source_remove (timer);

! 	sat_cfg_set_bool (SAT_CFG_BOOL_USE_LOCAL_TIME,
! 			  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tzcheck)));
! 	sat_cfg_set_str (SAT_CFG_STR_TIME_FORMAT,
! 			 gtk_entry_get_text (GTK_ENTRY (tfentry)));
! 	sat_cfg_set_bool (SAT_CFG_BOOL_USE_NSEW,
! 			  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (nsewcheck)));
! 	sat_cfg_set_bool (SAT_CFG_BOOL_USE_IMPERIAL,
! 			  gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (impcheck)));
! }

! static gboolean
! tfprev_cb (gpointer data)
! {
! 	const gchar *fmtstr;
! 	struct timeval tval;
! 	struct timezone tzone;
! 	time_t t;
! 	gint x;
! 	guint size;
! 	gchar buff[TIME_FORMAT_MAX_LENGTH+1];

! 	/* Unix time in sec since 01-Jan-1970 */
! 	x = gettimeofday (&tval, &tzone);
! 	t = (time_t ) tval.tv_sec;

! 	fmtstr = gtk_entry_get_text (GTK_ENTRY (tfentry));
! 	
! 	/* format either local time or UTC depending on check box */
! 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (tzcheck)))
! 		size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, localtime (&t));
! 	else
! 		size = strftime (buff, TIME_FORMAT_MAX_LENGTH, fmtstr, gmtime (&t));

! 	if (size < TIME_FORMAT_MAX_LENGTH)
! 		buff[size]='\0';
! 	else
! 		buff[TIME_FORMAT_MAX_LENGTH]='\0';

! 	gtk_label_set_text (GTK_LABEL (tflabel), buff);

! 	return TRUE;
  }

Index: sat-pref-general.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-general.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** sat-pref-general.c	18 Oct 2005 15:37:43 -0000	1.3
--- sat-pref-general.c	22 Oct 2005 12:34:35 -0000	1.4
***************
*** 31,35 ****
  #  include <config.h>
  #endif
- #include "defaults.h"
  #include "sat-pref-general.h"
  #include "sat-pref-formats.h"
--- 31,34 ----
***************
*** 43,47 ****
   * be laoded.
   */
! GtkWidget *sat_pref_general_create (GKeyFile *config)
  {
  	GtkWidget *nbook;
--- 42,46 ----
   * be laoded.
   */
! GtkWidget *sat_pref_general_create ()
  {
  	GtkWidget *nbook;
***************
*** 50,57 ****

  	gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
! 				  sat_pref_formats_create (config),
  				  gtk_label_new (_("Time and Number Formats")));
  	gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
! 				  sat_pref_qth_create (config),
  				  gtk_label_new (_("Locations")));

--- 49,56 ----

  	gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
! 				  sat_pref_formats_create (),
  				  gtk_label_new (_("Time and Number Formats")));
  	gtk_notebook_append_page (GTK_NOTEBOOK (nbook),
! 				  sat_pref_qth_create (),
  				  gtk_label_new (_("Locations")));

***************
*** 63,70 ****
   */
  void
! sat_pref_general_cancel (GKeyFile *config)
  {
! 	sat_pref_formats_cancel (config);
! 	sat_pref_qth_cancel (config);
  }

--- 62,69 ----
   */
  void
! sat_pref_general_cancel ()
  {
! 	sat_pref_formats_cancel ();
! 	sat_pref_qth_cancel ();
  }

***************
*** 73,80 ****
   */
  void
! sat_pref_general_ok     (GKeyFile *config)
  {
! 	sat_pref_formats_ok (config);
! 	sat_pref_qth_ok (config);
  }

--- 72,79 ----
   */
  void
! sat_pref_general_ok     ()
  {
! 	sat_pref_formats_ok ();
! 	sat_pref_qth_ok ();
  }

Index: sat-pref-interfaces.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-interfaces.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-interfaces.c	18 Oct 2005 10:19:56 -0000	1.1
--- sat-pref-interfaces.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-interfaces.h"
  #include "sat-pref-rig.h"
--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-interfaces.h"
  #include "sat-pref-rig.h"
***************
*** 43,47 ****
   * be laoded.
   */
! GtkWidget *sat_pref_interfaces_create (GKeyFile *config)
  {
          return gtk_label_new ("Interfaces");
--- 43,47 ----
   * be laoded.
   */
! GtkWidget *sat_pref_interfaces_create ()
  {
          return gtk_label_new ("Interfaces");
***************
*** 52,59 ****
   */
  void
! sat_pref_interfaces_cancel (GKeyFile *config)
  {
! 	sat_pref_rig_cancel (config);
! 	sat_pref_rot_cancel (config);
  }

--- 52,59 ----
   */
  void
! sat_pref_interfaces_cancel ()
  {
! 	sat_pref_rig_cancel ();
! 	sat_pref_rot_cancel ();
  }

***************
*** 62,69 ****
   */
  void
! sat_pref_interfaces_ok     (GKeyFile *config)
  {
! 	sat_pref_rig_ok (config);
! 	sat_pref_rot_ok (config);
  }

--- 62,69 ----
   */
  void
! sat_pref_interfaces_ok     ()
  {
! 	sat_pref_rig_ok ();
! 	sat_pref_rot_ok ();
  }

Index: sat-pref-list-view.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-list-view.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-list-view.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-list-view.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-list-view.h"

--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-list-view.h"

***************
*** 41,45 ****
   * be laoded.
   */
! GtkWidget *sat_pref_list_view_create (GKeyFile *config)
  {
          return gtk_label_new ("List View");
--- 41,45 ----
   * be laoded.
   */
! GtkWidget *sat_pref_list_view_create ()
  {
          return gtk_label_new ("List View");
***************
*** 50,54 ****
   */
  void
! sat_pref_list_view_cancel (GKeyFile *config)
  {
  }
--- 50,54 ----
   */
  void
! sat_pref_list_view_cancel ()
  {
  }
***************
*** 58,62 ****
   */
  void
! sat_pref_list_view_ok     (GKeyFile *config)
  {
  }
--- 58,62 ----
   */
  void
! sat_pref_list_view_ok     ()
  {
  }

Index: sat-pref-map-view.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-map-view.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-map-view.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-map-view.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-map-view.h"

--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-map-view.h"

***************
*** 41,45 ****
   * be laoded.
   */
! GtkWidget *sat_pref_map_view_create (GKeyFile *config)
  {
          return gtk_label_new ("Map View");
--- 41,45 ----
   * be laoded.
   */
! GtkWidget *sat_pref_map_view_create ()
  {
          return gtk_label_new ("Map View");
***************
*** 50,54 ****
   */
  void
! sat_pref_map_view_cancel (GKeyFile *config)
  {
  }
--- 50,54 ----
   */
  void
! sat_pref_map_view_cancel ()
  {
  }
***************
*** 58,62 ****
   */
  void
! sat_pref_map_view_ok     (GKeyFile *config)
  {
  }
--- 58,62 ----
   */
  void
! sat_pref_map_view_ok     ()
  {
  }

Index: sat-pref-modules.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-modules.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-modules.c	18 Oct 2005 10:15:34 -0000	1.1
--- sat-pref-modules.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-modules.h"
  #include "sat-pref-list-view.h"
--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-modules.h"
  #include "sat-pref-list-view.h"
***************
*** 44,48 ****
   * be laoded.
   */
! GtkWidget *sat_pref_modules_create (GKeyFile *config)
  {
          return gtk_label_new ("Modules");
--- 44,48 ----
   * be laoded.
   */
! GtkWidget *sat_pref_modules_create ()
  {
          return gtk_label_new ("Modules");
***************
*** 53,61 ****
   */
  void
! sat_pref_modules_cancel (GKeyFile *config)
  {
! 	sat_pref_list_view_cancel (config);
! 	sat_pref_map_view_cancel (config);
! 	sat_pref_polar_view_cancel (config);
  }

--- 53,61 ----
   */
  void
! sat_pref_modules_cancel ()
  {
! 	sat_pref_list_view_cancel ();
! 	sat_pref_map_view_cancel ();
! 	sat_pref_polar_view_cancel ();
  }

***************
*** 64,72 ****
   */
  void
! sat_pref_modules_ok     (GKeyFile *config)
  {
! 	sat_pref_list_view_ok (config);
! 	sat_pref_map_view_ok (config);
! 	sat_pref_polar_view_ok (config);
  }

--- 64,72 ----
   */
  void
! sat_pref_modules_ok     ()
  {
! 	sat_pref_list_view_ok ();
! 	sat_pref_map_view_ok ();
! 	sat_pref_polar_view_ok ();
  }

Index: sat-pref-polar-view.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-polar-view.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-polar-view.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-polar-view.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-polar-view.h"

--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-polar-view.h"

***************
*** 41,45 ****
   * be laoded.
   */
! GtkWidget *sat_pref_polar_view_create (GKeyFile *config)
  {
          return gtk_label_new ("Polar View");
--- 41,45 ----
   * be laoded.
   */
! GtkWidget *sat_pref_polar_view_create ()
  {
          return gtk_label_new ("Polar View");
***************
*** 50,54 ****
   */
  void
! sat_pref_polar_view_cancel (GKeyFile *config)
  {
  }
--- 50,54 ----
   */
  void
! sat_pref_polar_view_cancel ()
  {
  }
***************
*** 58,62 ****
   */
  void
! sat_pref_polar_view_ok     (GKeyFile *config)
  {
  }
--- 58,62 ----
   */
  void
! sat_pref_polar_view_ok     ()
  {
  }

Index: sat-pref-predict.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-predict.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-predict.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-predict.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-predict.h"

--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-predict.h"

***************
*** 41,45 ****
   * be laoded.
   */
! GtkWidget *sat_pref_predict_create (GKeyFile *config)
  {
          return gtk_label_new ("Predict");
--- 41,45 ----
   * be laoded.
   */
! GtkWidget *sat_pref_predict_create ()
  {
          return gtk_label_new ("Predict");
***************
*** 50,54 ****
   */
  void
! sat_pref_predict_cancel (GKeyFile *config)
  {
  }
--- 50,54 ----
   */
  void
! sat_pref_predict_cancel ()
  {
  }
***************
*** 58,62 ****
   */
  void
! sat_pref_predict_ok     (GKeyFile *config)
  {
  }
--- 58,62 ----
   */
  void
! sat_pref_predict_ok     ()
  {
  }

Index: sat-pref-qth.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-qth.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-qth.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-qth.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,47 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-qth.h"

  /** \brief Create and initialise widgets for the locations prefs tab.
   *
!  * The widgets must be preloaded with values from config. If a config value
!  * is NULL, sensible default values, eg. those from defaults.h should
!  * be laoded.
   */
! GtkWidget *sat_pref_qth_create (GKeyFile *config)
  {
!         return gtk_label_new ("Locations");
  }

--- 31,85 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-qth.h"

+ /** \brief Coumn definitions for QTH list. */
+ typedef enum {
+ 	QTH_LIST_COL_FILE = 0,   /*!< File name where this QTH info is stored. */
+ 	QTH_LIST_COL_NAME,       /*!< Name of the QTH. */
+ 	QTH_LIST_COL_LOC,        /*!< Location, eg. "Copenhagen, Denmark". */
+ 	QTH_LIST_COL_DESC,       /*!< Optional description. */
+ 	QTH_LIST_COL_LAT,        /*!< Latitude in dec. deg. North. */
+ 	QTH_LIST_COL_LON,        /*!< Longitude in dec. deg. East. */
+ 	QTH_LIST_COL_ALT,        /*!< Altitude in meters. */
+ 	QTH_LIST_COL_QRA,        /*!< QRA locator. */
+ 	QTH_LIST_COL_WX,         /*!< 4 letter weather station. */
+ 	QTH_LIST_COL_NUM         /*!< The number of fields. */
+ } qth_list_col_t;
+ 
+ 
+ 
+ /* private function prototypes */
+ static GtkWidget *create_qth_list (void);
+ static GtkWidget *create_detail_editor (void);
+ 
+ 
  /** \brief Create and initialise widgets for the locations prefs tab.
   *
!  * The QTH tab consists of two main parts: A list showing the configured
!  * locations (.qth files in $HOME/.gpredict2/ and a group of widgets showing
!  * detailed info about the QTH, which is curerntly selected in the list.
!  * Furthermore, there are two buttons beside the list: A button to add a
!  * new QTH entry to the list and a button to delete the currently selected
!  * entry.
!  *
!  * \note This module uses the gtk-sat-data infrastructure to read and write
!  *       .qth files.
!  *
!  * Add button always active.
!  * Delete button active only if a row is selected.
!  *
   */
! GtkWidget *sat_pref_qth_create ()
  {
! 	GtkWidget *vbox;    /* vbox containing the list part and the details part */
! 
! 	vbox = gtk_vbox_new (FALSE, 10);
! 	gtk_container_set_border_with (GTK_CONTAINER (vbox), 10);
! 	gtk_box_pack_start (GTK_BOX (vbox), create_qth_list (), TRUE, TRUE, 0);
! 	gtk_box_pack_start (GTK_BOX (vbox), create_detail_editor (), TRUE, FALSE, 0);
! 
!         return vbox;
  }

***************
*** 50,54 ****
   */
  void
! sat_pref_qth_cancel (GKeyFile *config)
  {
  }
--- 88,92 ----
   */
  void
! sat_pref_qth_cancel ()
  {
  }
***************
*** 58,63 ****
   */
  void
! sat_pref_qth_ok     (GKeyFile *config)
  {
  }

--- 96,136 ----
   */
  void
! sat_pref_qth_ok     ()
! {
! }
! 
! 
! /** \brief Create QTH list widgets.
!  *
!  * This function creates the widgets related to the QTH list (the upper part of the
!  * main vertical box). This consists of a horizontal box, containing a list on the
!  * right part and two buttons (Add and Delete) on the right side.
!  *
!  */
! static GtkWidget *
! create_qth_list ()
  {
+ 	GtkWidget *hbox;
+ 	GtkWidget *buttonbox;
+ 	GtkWidget *add;
+ 	GtkWidget *delete;
+ 
+ 	return gtk_label_new ("LIST");
+ }
+ 
+ 
+ /** \brief Create widgets for detail editor.
+  *
+  * This function creates the widgets used for editing the details of a QTH.
+  * Contents and layout TBD.
+  *
+  * Update button: Writes data to currently selected item in list
+  * Clear button: Clear the contents of all data fields.
+  */
+ static GtkWidget *
+ create_detail_editor ()
+ {
+ 	return gtk_label_new ("Details");
  }

+ 

Index: sat-pref-rig.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-rig.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-rig.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-rig.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-rig.h"

--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-rig.h"

***************
*** 41,45 ****
   * be laoded.
   */
! GtkWidget *sat_pref_rig_create (GKeyFile *config)
  {
          return gtk_label_new ("Radios");
--- 41,45 ----
   * be laoded.
   */
! GtkWidget *sat_pref_rig_create ()
  {
          return gtk_label_new ("Radios");
***************
*** 50,54 ****
   */
  void
! sat_pref_rig_cancel (GKeyFile *config)
  {
  }
--- 50,54 ----
   */
  void
! sat_pref_rig_cancel ()
  {
  }
***************
*** 58,62 ****
   */
  void
! sat_pref_rig_ok     (GKeyFile *config)
  {
  }
--- 58,62 ----
   */
  void
! sat_pref_rig_ok     ()
  {
  }

Index: sat-pref-rot.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-rot.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-rot.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-rot.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-rot.h"

--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-rot.h"

***************
*** 41,45 ****
   * be laoded.
   */
! GtkWidget *sat_pref_rot_create (GKeyFile *config)
  {
          return gtk_label_new ("Rotators");
--- 41,45 ----
   * be laoded.
   */
! GtkWidget *sat_pref_rot_create ()
  {
          return gtk_label_new ("Rotators");
***************
*** 50,54 ****
   */
  void
! sat_pref_rot_cancel (GKeyFile *config)
  {
  }
--- 50,54 ----
   */
  void
! sat_pref_rot_cancel ()
  {
  }
***************
*** 58,62 ****
   */
  void
! sat_pref_rot_ok     (GKeyFile *config)
  {
  }
--- 58,62 ----
   */
  void
! sat_pref_rot_ok     ()
  {
  }

Index: sat-pref-sky-at-glance.c
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-sky-at-glance.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-sky-at-glance.c	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-sky-at-glance.c	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 31,35 ****
  #  include <config.h>
  #endif
! #include "defaults.h"
  #include "sat-pref-sky-at-glance.h"

--- 31,35 ----
  #  include <config.h>
  #endif
! #include "sat-cfg.h"
  #include "sat-pref-sky-at-glance.h"

***************
*** 41,45 ****
   * be laoded.
   */
! GtkWidget *sat_pref_sky_at_glance_create (GKeyFile *config)
  {
          return gtk_label_new ("Sky at a Glance");
--- 41,45 ----
   * be laoded.
   */
! GtkWidget *sat_pref_sky_at_glance_create ()
  {
          return gtk_label_new ("Sky at a Glance");
***************
*** 50,54 ****
   */
  void
! sat_pref_sky_at_glance_cancel (GKeyFile *config)
  {
  }
--- 50,54 ----
   */
  void
! sat_pref_sky_at_glance_cancel ()
  {
  }
***************
*** 58,62 ****
   */
  void
! sat_pref_sky_at_glance_ok     (GKeyFile *config)
  {
  }
--- 58,62 ----
   */
  void
! sat_pref_sky_at_glance_ok     ()
  {
  }

Index: sat-pref-formats.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-formats.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-formats.h	18 Oct 2005 15:38:35 -0000	1.1
--- sat-pref-formats.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_formats_create (GKeyFile *config);
! void       sat_pref_formats_cancel (GKeyFile *config);
! void       sat_pref_formats_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_formats_create (void);
! void       sat_pref_formats_cancel (void);
! void       sat_pref_formats_ok     (void);

Index: sat-pref-general.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-general.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-general.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-general.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_general_create (GKeyFile *config);
! void       sat_pref_general_cancel (GKeyFile *config);
! void       sat_pref_general_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_general_create (void);
! void       sat_pref_general_cancel (void);
! void       sat_pref_general_ok     (void);

Index: sat-pref-interfaces.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-interfaces.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-interfaces.h	18 Oct 2005 10:19:56 -0000	1.1
--- sat-pref-interfaces.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_interfaces_create (GKeyFile *config);
! void       sat_pref_interfaces_cancel (GKeyFile *config);
! void       sat_pref_interfaces_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_interfaces_create (void);
! void       sat_pref_interfaces_cancel (void);
! void       sat_pref_interfaces_ok     (void);

Index: sat-pref-list-view.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-list-view.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-list-view.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-list-view.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_list_view_create (GKeyFile *config);
! void       sat_pref_list_view_cancel (GKeyFile *config);
! void       sat_pref_list_view_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_list_view_create (void);
! void       sat_pref_list_view_cancel (void);
! void       sat_pref_list_view_ok     (void);

Index: sat-pref-map-view.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-map-view.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-map-view.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-map-view.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_map_view_create (GKeyFile *config);
! void       sat_pref_map_view_cancel (GKeyFile *config);
! void       sat_pref_map_view_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_map_view_create (void);
! void       sat_pref_map_view_cancel (void);
! void       sat_pref_map_view_ok     (void);

Index: sat-pref-modules.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-modules.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-modules.h	18 Oct 2005 10:15:34 -0000	1.1
--- sat-pref-modules.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_modules_create (GKeyFile *config);
! void       sat_pref_modules_cancel (GKeyFile *config);
! void       sat_pref_modules_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_modules_create (void);
! void       sat_pref_modules_cancel (void);
! void       sat_pref_modules_ok     (void);

Index: sat-pref-polar-view.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-polar-view.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-polar-view.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-polar-view.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_polar_view_create (GKeyFile *config);
! void       sat_pref_polar_view_cancel (GKeyFile *config);
! void       sat_pref_polar_view_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_polar_view_create (void);
! void       sat_pref_polar_view_cancel (void);
! void       sat_pref_polar_view_ok     (void);

Index: sat-pref-predict.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-predict.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-predict.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-predict.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_predict_create (GKeyFile *config);
! void       sat_pref_predict_cancel (GKeyFile *config);
! void       sat_pref_predict_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_predict_create (void);
! void       sat_pref_predict_cancel (void);
! void       sat_pref_predict_ok     (void);

Index: sat-pref-qth.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-qth.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-qth.h	9 Oct 2005 10:55:35 -0000	1.1
--- sat-pref-qth.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_qth_create (GKeyFile *config);
! void       sat_pref_qth_cancel (GKeyFile *config);
! void       sat_pref_qth_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_qth_create (void);
! void       sat_pref_qth_cancel (void);
! void       sat_pref_qth_ok     (void);

Index: sat-pref-rig.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-rig.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-rig.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-rig.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_rig_create (GKeyFile *config);
! void       sat_pref_rig_cancel (GKeyFile *config);
! void       sat_pref_rig_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_rig_create (void);
! void       sat_pref_rig_cancel (void);
! void       sat_pref_rig_ok     (void);

Index: sat-pref-rot.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-rot.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-rot.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-rot.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_rot_create (GKeyFile *config);
! void       sat_pref_rot_cancel (GKeyFile *config);
! void       sat_pref_rot_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_rot_create (void);
! void       sat_pref_rot_cancel (void);
! void       sat_pref_rot_ok     (void);

Index: sat-pref-sky-at-glance.h
===================================================================
RCS file: /cvsroot/groundstation/gpredict2/src/sat-pref-sky-at-glance.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** sat-pref-sky-at-glance.h	9 Oct 2005 10:55:03 -0000	1.1
--- sat-pref-sky-at-glance.h	22 Oct 2005 12:34:35 -0000	1.2
***************
*** 30,36 ****

! GtkWidget *sat_pref_sky_at_glance_create (GKeyFile *config);
! void       sat_pref_sky_at_glance_cancel (GKeyFile *config);
! void       sat_pref_sky_at_glance_ok     (GKeyFile *config);

--- 30,36 ----

! GtkWidget *sat_pref_sky_at_glance_create (void);
! void       sat_pref_sky_at_glance_cancel (void);
! void       sat_pref_sky_at_glance_ok     (void);