[Gpredict-svn] SF.net SVN: gpredict:[268] trunk
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
Menu
▾
▴
[Gpredict-svn] SF.net SVN: gpredict:[268] trunk
|
From: <cs...@us...> - 2009-04-14 21:06:58
|
Revision: 268
http://gpredict.svn.sourceforge.net/gpredict/?rev=268&view=rev
Author: csete
Date: 2009-04-14 21:06:51 +0000 (Tue, 14 Apr 2009)
Log Message:
-----------
Reverted TLE updater to libcurl instead of GIO (was patch 2688135, see reason in comments).
Modified Paths:
--------------
trunk/ChangeLog
trunk/NEWS
trunk/README
trunk/configure.ac
trunk/src/sat-cfg.c
trunk/src/sat-cfg.h
trunk/src/sat-pref-tle.c
trunk/src/tle-update.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/ChangeLog 2009-04-14 21:06:51 UTC (rev 268)
@@ -1,3 +1,14 @@
+2009-04-14 Alexandru Csete <oz...@gm...>
+
+ * configure.ac:
+ Require libcur 7.16.0 or later as mandatory dependency.
+
+ * src/tle-update.c:
+ * src/sat-cfg.[ch]:
+ * src/sat-pref-tle.c:
+ Reverted TLE update to libcurl version.
+
+
2009-04-13 Alexandru Csete <oz...@gm...>
* src/predict-tools.c:
Modified: trunk/NEWS
===================================================================
--- trunk/NEWS 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/NEWS 2009-04-14 21:06:51 UTC (rev 268)
@@ -20,8 +20,6 @@
- Fixed bug 2130914: Gpredict doesn't handle PTT.
- Fixed bug 2170642: Small error in user manual.
- Fixed bug 2750119: Unable to set the time correctly in Time Controller.
-- Applied patch 2688135: Use GIO instead of libcurl for TLE download.
- Note: This removes proxy management from gpredict.
- Updated PDF user manual.
- French translation.
Modified: trunk/README
===================================================================
--- trunk/README 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/README 2009-04-14 21:06:51 UTC (rev 268)
@@ -45,7 +45,7 @@
- Gtk+ 2.12 or later
- GLib 2.16 or later
-- Gio 2.16 or later (including gvfs)
+- Libcurl 7.16.0 or later
- GooCanvas 0.9 or later
- Hamlib (runtime only, not required for build)
Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/configure.ac 2009-04-14 21:06:51 UTC (rev 268)
@@ -21,11 +21,12 @@
fi
dnl check for glib, gtk, and goocanvas libraries
-pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.16.0 gio-2.0 >= 2.16.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.9"
+pkg_modules="gtk+-2.0 >= 2.12.0 glib-2.0 >= 2.16.0 gthread-2.0 >= 2.14.0 goocanvas >= 0.9 libcurl >= 7.16.0"
PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
AC_SUBST(PACKAGE_CFLAGS)
AC_SUBST(PACKAGE_LIBS)
+
dnl Hamlib not needed if we go for the TCP based I/F
dnl check for hamlib
dnl PKG_CHECK_MODULES(HAMLIB, hamlib, [
@@ -65,6 +66,7 @@
GDK_V=`pkg-config --modversion gdk-2.0`
GTK_V=`pkg-config --modversion gtk+-2.0`
GOOC_V=`pkg-config --modversion goocanvas`
+CURL_V=`pkg-config --modversion libcurl`
dnl SQL_V=`pkg-config --modversion sqlite3`
dnl if test "$havehamlib" = true ; then
dnl HAML_V=`pkg-config --modversion hamlib`
@@ -100,6 +102,7 @@
echo Gdk version........ : $GDK_V
echo Gtk+ version....... : $GTK_V
echo GooCanvas version.. : $GOOC_V
+echo Liburl version..... : $CURL_V
dnl echo SQLite version..... : $SQL_V
dnl if test "$havehamlib" = true ; then
dnl echo Hamlib version..... : $HAML_V
Modified: trunk/src/sat-cfg.c
===================================================================
--- trunk/src/sat-cfg.c 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/src/sat-cfg.c 2009-04-14 21:06:51 UTC (rev 268)
@@ -47,176 +47,178 @@
#define LIST_COLUMNS_DEFAULTS (SAT_LIST_FLAG_NAME |\
- SAT_LIST_FLAG_AZ |\
- SAT_LIST_FLAG_EL |\
- SAT_LIST_FLAG_RANGE |\
- SAT_LIST_FLAG_DIR |\
- SAT_LIST_FLAG_NEXT_EVENT |\
- SAT_LIST_FLAG_ALT |\
- SAT_LIST_FLAG_ORBIT)
+ SAT_LIST_FLAG_AZ |\
+ SAT_LIST_FLAG_EL |\
+ SAT_LIST_FLAG_RANGE |\
+ SAT_LIST_FLAG_DIR |\
+ SAT_LIST_FLAG_NEXT_EVENT |\
+ SAT_LIST_FLAG_ALT |\
+ SAT_LIST_FLAG_ORBIT)
#define SINGLE_PASS_COL_DEFAULTS (SINGLE_PASS_FLAG_TIME |\
- SINGLE_PASS_FLAG_AZ |\
- SINGLE_PASS_FLAG_EL |\
- SINGLE_PASS_FLAG_RANGE |\
- SINGLE_PASS_FLAG_FOOTPRINT)
+ SINGLE_PASS_FLAG_AZ |\
+ SINGLE_PASS_FLAG_EL |\
+ SINGLE_PASS_FLAG_RANGE |\
+ SINGLE_PASS_FLAG_FOOTPRINT)
#define MULTI_PASS_COL_DEFAULTS (MULTI_PASS_FLAG_AOS_TIME |\
- MULTI_PASS_FLAG_LOS_TIME |\
- MULTI_PASS_FLAG_DURATION |\
- MULTI_PASS_FLAG_AOS_AZ |\
- MULTI_PASS_FLAG_MAX_EL |\
- MULTI_PASS_FLAG_LOS_AZ)
+ MULTI_PASS_FLAG_LOS_TIME |\
+ MULTI_PASS_FLAG_DURATION |\
+ MULTI_PASS_FLAG_AOS_AZ |\
+ MULTI_PASS_FLAG_MAX_EL |\
+ MULTI_PASS_FLAG_LOS_AZ)
#define SINGLE_SAT_FIELD_DEF (SINGLE_SAT_FLAG_AZ |\
SINGLE_SAT_FLAG_EL |\
- SINGLE_SAT_FLAG_RANGE |\
- SINGLE_SAT_FLAG_RANGE_RATE |\
- SINGLE_SAT_FLAG_NEXT_EVENT |\
- SINGLE_SAT_FLAG_SSP |\
- SINGLE_SAT_FLAG_FOOTPRINT |\
- SINGLE_SAT_FLAG_ALT |\
- SINGLE_SAT_FLAG_VEL |\
- SINGLE_SAT_FLAG_DOPPLER |\
- SINGLE_SAT_FLAG_LOSS |\
- SINGLE_SAT_FLAG_DELAY |\
- SINGLE_SAT_FLAG_MA |\
- SINGLE_SAT_FLAG_PHASE |\
- SINGLE_SAT_FLAG_ORBIT |\
- SINGLE_SAT_FLAG_VISIBILITY)
+ SINGLE_SAT_FLAG_RANGE |\
+ SINGLE_SAT_FLAG_RANGE_RATE |\
+ SINGLE_SAT_FLAG_NEXT_EVENT |\
+ SINGLE_SAT_FLAG_SSP |\
+ SINGLE_SAT_FLAG_FOOTPRINT |\
+ SINGLE_SAT_FLAG_ALT |\
+ SINGLE_SAT_FLAG_VEL |\
+ SINGLE_SAT_FLAG_DOPPLER |\
+ SINGLE_SAT_FLAG_LOSS |\
+ SINGLE_SAT_FLAG_DELAY |\
+ SINGLE_SAT_FLAG_MA |\
+ SINGLE_SAT_FLAG_PHASE |\
+ SINGLE_SAT_FLAG_ORBIT |\
+ SINGLE_SAT_FLAG_VISIBILITY)
/** \brief Structure representing a boolean value */
typedef struct {
- gchar *group; /*!< The configration group */
- gchar *key; /*!< The configuration key */
- gboolean defval; /*!< The default value */
+ gchar *group; /*!< The configration group */
+ gchar *key; /*!< The configuration key */
+ gboolean defval; /*!< The default value */
} sat_cfg_bool_t;
/** \brief Structure representing an integer value */
typedef struct {
- gchar *group; /*!< The configration group */
- gchar *key; /*!< The configuration key */
- gint defval; /*!< The default value */
+ gchar *group; /*!< The configration group */
+ gchar *key; /*!< The configuration key */
+ gint defval; /*!< The default value */
} sat_cfg_int_t;
/** \brief Structure representing a string value */
typedef struct {
- gchar *group; /*!< The configration group */
- gchar *key; /*!< The configuration key */
- gchar *defval; /*!< The default value */
+ gchar *group; /*!< The configration group */
+ gchar *key; /*!< The configuration key */
+ gchar *defval; /*!< The default value */
} sat_cfg_str_t;
/** \brief Array containing the boolean configuration values */
sat_cfg_bool_t sat_cfg_bool[SAT_CFG_BOOL_NUM] = {
- { "GLOBAL", "USE_LOCAL_TIME", FALSE},
- { "GLOBAL", "USE_NSEW", FALSE},
- { "GLOBAL", "USE_IMPERIAL", FALSE},
- { "GLOBAL", "MAIN_WIN_POS", FALSE},
- { "GLOBAL", "MOD_WIN_POS", FALSE},
+ { "GLOBAL", "USE_LOCAL_TIME", FALSE},
+ { "GLOBAL", "USE_NSEW", FALSE},
+ { "GLOBAL", "USE_IMPERIAL", FALSE},
+ { "GLOBAL", "MAIN_WIN_POS", FALSE},
+ { "GLOBAL", "MOD_WIN_POS", FALSE},
{ "GLOBAL", "MOD_STATE", FALSE},
- { "MODULES", "RULES_HINT", TRUE},
- { "MODULES", "MAP_QTH_INFO", TRUE},
- { "MODULES", "MAP_NEXT_EVENT", TRUE},
- { "MODULES", "MAP_CURSOR_TRACK", FALSE},
- { "MODULES", "MAP_SHOW_GRID", FALSE},
- { "MODULES", "MAP_KEEP_RATIO", FALSE},
- { "MODULES", "POLAR_QTH_INFO", TRUE},
- { "MODULES", "POLAR_NEXT_EVENT", TRUE},
- { "MODULES", "POLAR_CURSOR_TRACK", TRUE},
+ { "MODULES", "RULES_HINT", TRUE},
+ { "MODULES", "MAP_QTH_INFO", TRUE},
+ { "MODULES", "MAP_NEXT_EVENT", TRUE},
+ { "MODULES", "MAP_CURSOR_TRACK", FALSE},
+ { "MODULES", "MAP_SHOW_GRID", FALSE},
+ { "MODULES", "MAP_KEEP_RATIO", FALSE},
+ { "MODULES", "POLAR_QTH_INFO", TRUE},
+ { "MODULES", "POLAR_NEXT_EVENT", TRUE},
+ { "MODULES", "POLAR_CURSOR_TRACK", TRUE},
{ "MODULES", "POLAR_EXTRA_AZ_TICKS", FALSE},
{ "TLE", "SERVER_AUTH", FALSE},
+ { "TLE", "PROXY_AUTH", FALSE},
{ "TLE", "ADD_NEW_SATS", TRUE},
- { "LOG", "KEEP_LOG_FILES", FALSE},
+ { "LOG", "KEEP_LOG_FILES", FALSE},
{ "PREDICT", "USE_REAL_T0", FALSE}
};
/** \brief Array containing the integer configuration parameters */
sat_cfg_int_t sat_cfg_int[SAT_CFG_INT_NUM] = {
- { "MODULES", "DATA_TIMEOUT", 300},
- { "MODULES", "LAYOUT", GTK_SAT_MOD_LAYOUT_3},
- { "MODULES", "VIEW_1", GTK_SAT_MOD_VIEW_MAP},
- { "MODULES", "VIEW_2", GTK_SAT_MOD_VIEW_POLAR},
- { "MODULES", "VIEW_3", GTK_SAT_MOD_VIEW_SINGLE},
- { "GLOBAL", "WARP", 1},
- { "MODULES", "LIST_REFRESH", 1},
- { "MODULES", "LIST_COLUMNS", LIST_COLUMNS_DEFAULTS},
- { "MODULES", "MAP_REFRESH", 10},
- { "MODULES", "MAP_INFO_COLOUR", 0x00FF00FF},
- { "MODULES", "MAP_INFO_BGD_COLOUR", 0x000000FF},
- { "MODULES", "MAP_QTH_COLOUR", 0x00FFFFFF},
- { "MODULES", "MAP_SAT_COLOUR", 0xF0F000FF},
- { "MODULES", "MAP_SELECTED_SAT_COLOUR", 0xFFFFFFFF},
- { "MODULES", "MAP_COV_AREA_COLOUR", 0xFFFFFF1F},
- { "MODULES", "MAP_GRID_COLOUR", 0x7F7F7F7F},
- { "MODULES", "MAP_TICK_COLOUR", 0x7F7F7F7F},
- { "MODULES", "MAP_TRACK_COLOUR", 0x00FFFFFF},
- { "MODULES", "MAP_TRACK_NUM", 1},
- { "MODULES", "POLAR_REFRESH", 3},
- { "MODULES", "POLAR_CHART_ORIENT", POLAR_VIEW_NESW},
- { "MODULES", "POLAR_BGD_COLOUR", 0xFFFFFFFF},
- { "MODULES", "POLAR_AXIS_COLOUR", 0x0F0F0F7F},
- { "MODULES", "POLAR_TICK_COLOUR", 0x007F00FF},
- { "MODULES", "POLAR_SAT_COLOUR", 0x8F0000FF},
- { "MODULES", "POLAR_SELECTED_SAT_COL", 0xFF0D0BFF},
- { "MODULES", "POLAR_TRACK_COLOUR", 0x0000FFFF},
- { "MODULES", "POLAR_INFO_COLOUR", 0x00007FFF},
- { "MODULES", "SINGLE_SAT_REFRESH", 1},
- { "MODULES", "SINGLE_SAT_FIELDS", SINGLE_SAT_FIELD_DEF},
- { "PREDICT", "MINIMUM_ELEV", 5},
- { "PREDICT", "NUMBER_OF_PASSES", 10},
- { "PREDICT", "LOOK_AHEAD", 3},
- { "PREDICT", "TIME_RESOLUTION", 10},
- { "PREDICT", "NUMBER_OF_ENTRIES", 20},
- { "PREDICT", "SINGLE_PASS_COL", SINGLE_PASS_COL_DEFAULTS},
- { "PREDICT", "MULTI_PASS_COL", MULTI_PASS_COL_DEFAULTS},
- { "PREDICT", "SAVE_FORMAT", 0},
- { "PREDICT", "SAVE_CONTENTS", 0},
+ { "MODULES", "DATA_TIMEOUT", 300},
+ { "MODULES", "LAYOUT", GTK_SAT_MOD_LAYOUT_3},
+ { "MODULES", "VIEW_1", GTK_SAT_MOD_VIEW_MAP},
+ { "MODULES", "VIEW_2", GTK_SAT_MOD_VIEW_POLAR},
+ { "MODULES", "VIEW_3", GTK_SAT_MOD_VIEW_SINGLE},
+ { "GLOBAL", "WARP", 1},
+ { "MODULES", "LIST_REFRESH", 1},
+ { "MODULES", "LIST_COLUMNS", LIST_COLUMNS_DEFAULTS},
+ { "MODULES", "MAP_REFRESH", 10},
+ { "MODULES", "MAP_INFO_COLOUR", 0x00FF00FF},
+ { "MODULES", "MAP_INFO_BGD_COLOUR", 0x000000FF},
+ { "MODULES", "MAP_QTH_COLOUR", 0x00FFFFFF},
+ { "MODULES", "MAP_SAT_COLOUR", 0xF0F000FF},
+ { "MODULES", "MAP_SELECTED_SAT_COLOUR", 0xFFFFFFFF},
+ { "MODULES", "MAP_COV_AREA_COLOUR", 0xFFFFFF1F},
+ { "MODULES", "MAP_GRID_COLOUR", 0x7F7F7F7F},
+ { "MODULES", "MAP_TICK_COLOUR", 0x7F7F7F7F},
+ { "MODULES", "MAP_TRACK_COLOUR", 0x00FFFFFF},
+ { "MODULES", "MAP_TRACK_NUM", 1},
+ { "MODULES", "POLAR_REFRESH", 3},
+ { "MODULES", "POLAR_CHART_ORIENT", POLAR_VIEW_NESW},
+ { "MODULES", "POLAR_BGD_COLOUR", 0xFFFFFFFF},
+ { "MODULES", "POLAR_AXIS_COLOUR", 0x0F0F0F7F},
+ { "MODULES", "POLAR_TICK_COLOUR", 0x007F00FF},
+ { "MODULES", "POLAR_SAT_COLOUR", 0x8F0000FF},
+ { "MODULES", "POLAR_SELECTED_SAT_COL", 0xFF0D0BFF},
+ { "MODULES", "POLAR_TRACK_COLOUR", 0x0000FFFF},
+ { "MODULES", "POLAR_INFO_COLOUR", 0x00007FFF},
+ { "MODULES", "SINGLE_SAT_REFRESH", 1},
+ { "MODULES", "SINGLE_SAT_FIELDS", SINGLE_SAT_FIELD_DEF},
+ { "PREDICT", "MINIMUM_ELEV", 5},
+ { "PREDICT", "NUMBER_OF_PASSES", 10},
+ { "PREDICT", "LOOK_AHEAD", 3},
+ { "PREDICT", "TIME_RESOLUTION", 10},
+ { "PREDICT", "NUMBER_OF_ENTRIES", 20},
+ { "PREDICT", "SINGLE_PASS_COL", SINGLE_PASS_COL_DEFAULTS},
+ { "PREDICT", "MULTI_PASS_COL", MULTI_PASS_COL_DEFAULTS},
+ { "PREDICT", "SAVE_FORMAT", 0},
+ { "PREDICT", "SAVE_CONTENTS", 0},
{ "PREDICT", "TWILIGHT_THRESHOLD", -6},
- { "SKY_AT_GLANCE", "TIME_SPAN_HOURS", 8},
- { "SKY_AT_GLANCE", "COLOUR_01", 0x3c46c8},
- { "SKY_AT_GLANCE", "COLOUR_02", 0x00500a},
- { "SKY_AT_GLANCE", "COLOUR_03", 0xd5472b},
- { "SKY_AT_GLANCE", "COLOUR_04", 0xd06b38},
- { "SKY_AT_GLANCE", "COLOUR_05", 0xcf477a},
- { "SKY_AT_GLANCE", "COLOUR_06", 0xbf041f},
- { "SKY_AT_GLANCE", "COLOUR_07", 0x04bf20},
- { "SKY_AT_GLANCE", "COLOUR_08", 0x0420bf},
- { "SKY_AT_GLANCE", "COLOUR_09", 0xa304bf},
- { "SKY_AT_GLANCE", "COLOUR_10", 0x04bdbf},
- { "GLOBAL", "WINDOW_POS_X", 0},
- { "GLOBAL", "WINDOW_POS_Y", 0},
- { "GLOBAL", "WINDOW_WIDTH", 700},
- { "GLOBAL", "WINDOW_HEIGHT", 700},
- { "GLOBAL", "HTML_BROWSER_TYPE", 0},
- { "TLE", "AUTO_UPDATE_FREQ", 2},
- { "TLE", "AUTO_UPDATE_ACTION", 1},
- { "TLE", "LAST_UPDATE", 0},
- { "LOG", "CLEAN_AGE", 0}, /* 0 = Never clean */
- { "LOG", "LEVEL", 4}
+ { "SKY_AT_GLANCE", "TIME_SPAN_HOURS", 8},
+ { "SKY_AT_GLANCE", "COLOUR_01", 0x3c46c8},
+ { "SKY_AT_GLANCE", "COLOUR_02", 0x00500a},
+ { "SKY_AT_GLANCE", "COLOUR_03", 0xd5472b},
+ { "SKY_AT_GLANCE", "COLOUR_04", 0xd06b38},
+ { "SKY_AT_GLANCE", "COLOUR_05", 0xcf477a},
+ { "SKY_AT_GLANCE", "COLOUR_06", 0xbf041f},
+ { "SKY_AT_GLANCE", "COLOUR_07", 0x04bf20},
+ { "SKY_AT_GLANCE", "COLOUR_08", 0x0420bf},
+ { "SKY_AT_GLANCE", "COLOUR_09", 0xa304bf},
+ { "SKY_AT_GLANCE", "COLOUR_10", 0x04bdbf},
+ { "GLOBAL", "WINDOW_POS_X", 0},
+ { "GLOBAL", "WINDOW_POS_Y", 0},
+ { "GLOBAL", "WINDOW_WIDTH", 700},
+ { "GLOBAL", "WINDOW_HEIGHT", 700},
+ { "GLOBAL", "HTML_BROWSER_TYPE", 0},
+ { "TLE", "AUTO_UPDATE_FREQ", 2},
+ { "TLE", "AUTO_UPDATE_ACTION", 1},
+ { "TLE", "LAST_UPDATE", 0},
+ { "LOG", "CLEAN_AGE", 0}, /* 0 = Never clean */
+ { "LOG", "LEVEL", 4}
};
/** \brief Array containing the string configuration values */
sat_cfg_str_t sat_cfg_str[SAT_CFG_STR_NUM] = {
- { "GLOBAL", "TIME_FORMAT", "%Y/%m/%d %H:%M:%S"},
- { "GLOBAL", "DEFAULT_QTH", "sample.qth"},
- { "GLOBAL", "OPEN_MODULES", "Amateur"},
- { "GLOBAL", "HTML_BROWSER", NULL},
- { "MODULES", "MAP_FILE", "nasa-topo_800.png"},
- { "MODULES", "MAP_FONT", "Sans 10"},
- { "MODULES", "POLAR_FONT", "Sans 10"},
- { "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
- { "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\
- "iridium.txt;military.txt;radar.txt;science.txt;weather.txt"},
- { "TLE", "FILE_DIR", NULL},
- { "TLE", "EXTENSION", "*.*"},
- { "PREDICT", "SAVE_DIR", NULL}
+ { "GLOBAL", "TIME_FORMAT", "%Y/%m/%d %H:%M:%S"},
+ { "GLOBAL", "DEFAULT_QTH", "sample.qth"},
+ { "GLOBAL", "OPEN_MODULES", "Amateur"},
+ { "GLOBAL", "HTML_BROWSER", NULL},
+ { "MODULES", "MAP_FILE", "nasa-topo_800.png"},
+ { "MODULES", "MAP_FONT", "Sans 10"},
+ { "MODULES", "POLAR_FONT", "Sans 10"},
+ { "TLE", "SERVER", "http://www.celestrak.com/NORAD/elements/"},
+ { "TLE", "FILES", "amateur.txt;cubesat.txt;galileo.txt;geo.txt;gps-ops.txt;"\
+ "iridium.txt;military.txt;radar.txt;science.txt;weather.txt"},
+ { "TLE", "PROXY", NULL},
+ { "TLE", "FILE_DIR", NULL},
+ { "TLE", "EXTENSION", "*.*"},
+ { "PREDICT", "SAVE_DIR", NULL}
};
@@ -239,42 +241,42 @@
guint
sat_cfg_load ()
{
- gchar *keyfile;
- GError *error = NULL;
+ gchar *keyfile;
+ GError *error = NULL;
- if (config != NULL)
- sat_cfg_close ();
+ if (config != NULL)
+ sat_cfg_close ();
- /* 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);
+ /* 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);
+ g_key_file_load_from_file (config, keyfile, G_KEY_FILE_KEEP_COMMENTS, &error);
- g_free (keyfile);
+ g_free (keyfile);
- if (error != NULL) {
+ if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Error reading config file (%s)"),
- __FUNCTION__, error->message);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Error reading config file (%s)"),
+ __FUNCTION__, error->message);
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Using built-in defaults"),
- __FUNCTION__);
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Using built-in defaults"),
+ __FUNCTION__);
- g_clear_error (&error);
+ g_clear_error (&error);
- return 1;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_DEBUG,
- _("%s: Everything OK."), __FUNCTION__);
- }
-
- return 0;
+ return 1;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_DEBUG,
+ _("%s: Everything OK."), __FUNCTION__);
+ }
+
+ return 0;
}
@@ -287,84 +289,84 @@
guint
sat_cfg_save ()
{
- gsize length;
- gsize written;
- GError *error = NULL;
- gchar *cfgstr;
- gchar *keyfile;
- GIOChannel *cfgfile;
- guint err = 0;
+ gsize length;
+ gsize written;
+ GError *error = NULL;
+ gchar *cfgstr;
+ gchar *keyfile;
+ GIOChannel *cfgfile;
+ guint err = 0;
- /* convert configuration data struct to charachter string */
- cfgstr = g_key_file_to_data (config, &length, &error);
+ /* convert configuration data struct to charachter string */
+ cfgstr = g_key_file_to_data (config, &length, &error);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not create config data (%s)."),
- __FUNCTION__, error->message);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create config data (%s)."),
+ __FUNCTION__, error->message);
- g_clear_error (&error);
+ g_clear_error (&error);
- err = 1;
- }
- else {
+ err = 1;
+ }
+ else {
- /* create and open a file for writing */
- keyfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".gpredict2", G_DIR_SEPARATOR_S,
- "gpredict.cfg", NULL);
- cfgfile = g_io_channel_new_file (keyfile, "w", &error);
- g_free (keyfile);
+ /* create and open a file for writing */
+ keyfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S,
+ ".gpredict2", G_DIR_SEPARATOR_S,
+ "gpredict.cfg", NULL);
+ cfgfile = g_io_channel_new_file (keyfile, "w", &error);
+ g_free (keyfile);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Could not create config file (%s)."),
- __FUNCTION__, error->message);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Could not create config file (%s)."),
+ __FUNCTION__, error->message);
- g_clear_error (&error);
+ g_clear_error (&error);
- err = 1;
- }
- else {
- g_io_channel_write_chars (cfgfile,
- cfgstr,
- length,
- &written,
- &error);
+ err = 1;
+ }
+ else {
+ g_io_channel_write_chars (cfgfile,
+ cfgstr,
+ length,
+ &written,
+ &error);
- g_io_channel_shutdown (cfgfile, TRUE, NULL);
- g_io_channel_unref (cfgfile);
+ g_io_channel_shutdown (cfgfile, TRUE, NULL);
+ g_io_channel_unref (cfgfile);
- if (error != NULL) {
- sat_log_log (SAT_LOG_LEVEL_ERROR,
- _("%s: Error writing config data (%s)."),
- __FUNCTION__, error->message);
+ if (error != NULL) {
+ sat_log_log (SAT_LOG_LEVEL_ERROR,
+ _("%s: Error writing config data (%s)."),
+ __FUNCTION__, error->message);
- g_clear_error (&error);
+ g_clear_error (&error);
- err = 1;
- }
- else if (length != written) {
- sat_log_log (SAT_LOG_LEVEL_WARN,
- _("%s: Wrote only %d out of %d chars."),
- __FUNCTION__, written, length);
+ err = 1;
+ }
+ else if (length != written) {
+ sat_log_log (SAT_LOG_LEVEL_WARN,
+ _("%s: Wrote only %d out of %d chars."),
+ __FUNCTION__, written, length);
- err = 1;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_MSG,
- _("%s: Configuration saved."),
- __FUNCTION__);
+ err = 1;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_MSG,
+ _("%s: Configuration saved."),
+ __FUNCTION__);
- err = 0;
- }
- }
+ err = 0;
+ }
+ }
- g_free (cfgstr);
- }
+ g_free (cfgstr);
+ }
- return err;
+ return err;
}
@@ -379,10 +381,10 @@
void
sat_cfg_close ()
{
- if (config != NULL) {
- g_key_file_free (config);
- config = NULL;
- }
+ if (config != NULL) {
+ g_key_file_free (config);
+ config = NULL;
+ }
}
@@ -390,60 +392,59 @@
gboolean
sat_cfg_get_bool (sat_cfg_bool_e param)
{
- gboolean value = FALSE;
- GError *error = NULL;
+ gboolean value = FALSE;
+ GError *error = NULL;
- if (param < SAT_CFG_BOOL_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
+ if (param < SAT_CFG_BOOL_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
- /* return default value */
- value = sat_cfg_bool[param].defval;
- }
- else {
- /* fetch value */
- value = g_key_file_get_boolean (config,
- sat_cfg_bool[param].group,
- sat_cfg_bool[param].key,
- &error);
+ /* return default value */
+ value = sat_cfg_bool[param].defval;
+ }
+ else {
+ /* fetch value */
+ value = g_key_file_get_boolean (config,
+ sat_cfg_bool[param].group,
+ sat_cfg_bool[param].key,
+ &error);
- if (error != NULL) {
- g_clear_error (&error);
+ if (error != NULL) {
+ g_clear_error (&error);
- value = sat_cfg_bool[param].defval;
- }
- }
+ value = sat_cfg_bool[param].defval;
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
- return value;
+ return value;
}
/** \brief Get default value of boolean parameter */
gboolean
sat_cfg_get_bool_def (sat_cfg_bool_e param)
{
- gboolean value = FALSE;
+ gboolean value = FALSE;
- if (param < SAT_CFG_BOOL_NUM) {
- value = sat_cfg_bool[param].defval;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ if (param < SAT_CFG_BOOL_NUM) {
+ value = sat_cfg_bool[param].defval;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
-
- return value;
+ return value;
}
/** \brief Store a boolean configuration value.
@@ -457,52 +458,52 @@
sat_cfg_set_bool (sat_cfg_bool_e param, gboolean value)
{
- if (param < SAT_CFG_BOOL_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_set_boolean (config,
- sat_cfg_bool[param].group,
- sat_cfg_bool[param].key,
- value);
- }
+ if (param < SAT_CFG_BOOL_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_set_boolean (config,
+ sat_cfg_bool[param].group,
+ sat_cfg_bool[param].key,
+ value);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
void
sat_cfg_reset_bool (sat_cfg_bool_e param)
{
- if (param < SAT_CFG_BOOL_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_remove_key (config,
- sat_cfg_bool[param].group,
- sat_cfg_bool[param].key,
- NULL);
- }
+ if (param < SAT_CFG_BOOL_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_remove_key (config,
+ sat_cfg_bool[param].group,
+ sat_cfg_bool[param].key,
+ NULL);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown BOOL param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown BOOL param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
@@ -513,43 +514,43 @@
gchar *
sat_cfg_get_str (sat_cfg_str_e param)
{
- gchar *value;
- GError *error = NULL;
+ gchar *value;
+ GError *error = NULL;
- if (param < SAT_CFG_STR_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
+ if (param < SAT_CFG_STR_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
- /* return default value */
- value = g_strdup (sat_cfg_str[param].defval);
- }
- else {
- /* fetch value */
- value = g_key_file_get_string (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- &error);
+ /* return default value */
+ value = g_strdup (sat_cfg_str[param].defval);
+ }
+ else {
+ /* fetch value */
+ value = g_key_file_get_string (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ &error);
- if (error != NULL) {
- g_clear_error (&error);
+ if (error != NULL) {
+ g_clear_error (&error);
- value = g_strdup (sat_cfg_str[param].defval);
- }
- }
+ value = g_strdup (sat_cfg_str[param].defval);
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
- value = g_strdup ("ERROR");
- }
+ value = g_strdup ("ERROR");
+ }
- return value;
+ return value;
}
/** \brief Get default value of string parameter
@@ -559,21 +560,20 @@
gchar *
sat_cfg_get_str_def (sat_cfg_str_e param)
{
- gchar *value;
+ gchar *value;
- if (param < SAT_CFG_STR_NUM) {
- value = g_strdup (sat_cfg_str[param].defval);
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
+ if (param < SAT_CFG_STR_NUM) {
+ value = g_strdup (sat_cfg_str[param].defval);
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
- value = g_strdup ("ERROR");
- }
+ value = g_strdup ("ERROR");
+ }
-
- return value;
+ return value;
}
/** \brief Store a str configuration value.
@@ -582,35 +582,35 @@
sat_cfg_set_str (sat_cfg_str_e param, const gchar *value)
{
- if (param < SAT_CFG_STR_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- if (value) {
- g_key_file_set_string (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- value);
- }
- else {
- /* remove key from config */
- g_key_file_remove_key (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- NULL);
- }
- }
+ if (param < SAT_CFG_STR_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ if (value) {
+ g_key_file_set_string (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ value);
+ }
+ else {
+ /* remove key from config */
+ g_key_file_remove_key (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ NULL);
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
@@ -618,136 +618,136 @@
sat_cfg_reset_str (sat_cfg_str_e param)
{
- if (param < SAT_CFG_STR_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_remove_key (config,
- sat_cfg_str[param].group,
- sat_cfg_str[param].key,
- NULL);
- }
+ if (param < SAT_CFG_STR_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_remove_key (config,
+ sat_cfg_str[param].group,
+ sat_cfg_str[param].key,
+ NULL);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown STR param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown STR param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
gint
sat_cfg_get_int (sat_cfg_int_e param)
{
- gint value = 0;
- GError *error = NULL;
+ gint value = 0;
+ GError *error = NULL;
- if (param < SAT_CFG_INT_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
+ if (param < SAT_CFG_INT_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
- /* return default value */
- value = sat_cfg_int[param].defval;
- }
- else {
- /* fetch value */
- value = g_key_file_get_integer (config,
- sat_cfg_int[param].group,
- sat_cfg_int[param].key,
- &error);
+ /* return default value */
+ value = sat_cfg_int[param].defval;
+ }
+ else {
+ /* fetch value */
+ value = g_key_file_get_integer (config,
+ sat_cfg_int[param].group,
+ sat_cfg_int[param].key,
+ &error);
- if (error != NULL) {
- g_clear_error (&error);
+ if (error != NULL) {
+ g_clear_error (&error);
- value = sat_cfg_int[param].defval;
- }
- }
+ value = sat_cfg_int[param].defval;
+ }
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
- return value;
+ return value;
}
gint
sat_cfg_get_int_def (sat_cfg_int_e param)
{
- gint value = 0;
+ gint value = 0;
- if (param < SAT_CFG_INT_NUM) {
- value = sat_cfg_int[param].defval;
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ if (param < SAT_CFG_INT_NUM) {
+ value = sat_cfg_int[param].defval;
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
- return value;
+ return value;
}
void
sat_cfg_set_int (sat_cfg_int_e param, gint value)
{
- if (param < SAT_CFG_INT_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_set_integer (config,
- sat_cfg_int[param].group,
- sat_cfg_int[param].key,
- value);
- }
+ if (param < SAT_CFG_INT_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_set_integer (config,
+ sat_cfg_int[param].group,
+ sat_cfg_int[param].key,
+ value);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
void
sat_cfg_reset_int (sat_cfg_int_e param)
{
- if (param < SAT_CFG_INT_NUM) {
-
- if (config == NULL) {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Module not initialised\n"),
- __FUNCTION__);
- }
- else {
- g_key_file_remove_key (config,
- sat_cfg_int[param].group,
- sat_cfg_int[param].key,
- NULL);
- }
+ if (param < SAT_CFG_INT_NUM) {
+
+ if (config == NULL) {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Module not initialised\n"),
+ __FUNCTION__);
+ }
+ else {
+ g_key_file_remove_key (config,
+ sat_cfg_int[param].group,
+ sat_cfg_int[param].key,
+ NULL);
+ }
- }
- else {
- sat_log_log (SAT_LOG_LEVEL_BUG,
- _("%s: Unknown INT param index (%d)\n"),
- __FUNCTION__, param);
- }
+ }
+ else {
+ sat_log_log (SAT_LOG_LEVEL_BUG,
+ _("%s: Unknown INT param index (%d)\n"),
+ __FUNCTION__, param);
+ }
}
Modified: trunk/src/sat-cfg.h
===================================================================
--- trunk/src/sat-cfg.h 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/src/sat-cfg.h 2009-04-14 21:06:51 UTC (rev 268)
@@ -35,113 +35,115 @@
/** \brief Symbolic references for boolean config values. */
typedef enum {
- SAT_CFG_BOOL_USE_LOCAL_TIME = 0, /*!< Display local time instead of UTC. */
- SAT_CFG_BOOL_USE_NSEW, /*!< Use N, S, E and W instead of sign */
- SAT_CFG_BOOL_USE_IMPERIAL, /*!< Use Imperial units instead of Metric */
- SAT_CFG_BOOL_MAIN_WIN_POS, /*!< Restore position of main window */
- SAT_CFG_BOOL_MOD_WIN_POS, /*!< Restore size and position of module windows */
+ SAT_CFG_BOOL_USE_LOCAL_TIME = 0, /*!< Display local time instead of UTC. */
+ SAT_CFG_BOOL_USE_NSEW, /*!< Use N, S, E and W instead of sign */
+ SAT_CFG_BOOL_USE_IMPERIAL, /*!< Use Imperial units instead of Metric */
+ SAT_CFG_BOOL_MAIN_WIN_POS, /*!< Restore position of main window */
+ SAT_CFG_BOOL_MOD_WIN_POS, /*!< Restore size and position of module windows */
SAT_CFG_BOOL_MOD_STATE, /*!< Restore module state */
- SAT_CFG_BOOL_RULES_HINT, /*!< Enable rules hint in GtkSatList. */
- SAT_CFG_BOOL_MAP_SHOW_QTH_INFO, /*!< Show QTH info on map */
- SAT_CFG_BOOL_MAP_SHOW_NEXT_EV, /*!< Show next event on map */
- SAT_CFG_BOOL_MAP_SHOW_CURS_TRACK, /*!< Track mouse cursor on map. */
- SAT_CFG_BOOL_MAP_SHOW_GRID, /*!< Show grid on map. */
- SAT_CFG_BOOL_MAP_KEEP_RATIO, /*!< Keep original aspect ratio */
- SAT_CFG_BOOL_POL_SHOW_QTH_INFO, /*!< Show QTH info on polar plot */
- SAT_CFG_BOOL_POL_SHOW_NEXT_EV, /*!< Show next event on polar plot */
- SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */
- SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */
- SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */
+ SAT_CFG_BOOL_RULES_HINT, /*!< Enable rules hint in GtkSatList. */
+ SAT_CFG_BOOL_MAP_SHOW_QTH_INFO, /*!< Show QTH info on map */
+ SAT_CFG_BOOL_MAP_SHOW_NEXT_EV, /*!< Show next event on map */
+ SAT_CFG_BOOL_MAP_SHOW_CURS_TRACK, /*!< Track mouse cursor on map. */
+ SAT_CFG_BOOL_MAP_SHOW_GRID, /*!< Show grid on map. */
+ SAT_CFG_BOOL_MAP_KEEP_RATIO, /*!< Keep original aspect ratio */
+ SAT_CFG_BOOL_POL_SHOW_QTH_INFO, /*!< Show QTH info on polar plot */
+ SAT_CFG_BOOL_POL_SHOW_NEXT_EV, /*!< Show next event on polar plot */
+ SAT_CFG_BOOL_POL_SHOW_CURS_TRACK, /*!< Track mouse cursor on polar plot. */
+ SAT_CFG_BOOL_POL_SHOW_EXTRA_AZ_TICKS, /*!< Extra Az ticks at every 30 deg. */
+ SAT_CFG_BOOL_TLE_SERVER_AUTH, /*!< TLE server requires authentication. */
+ SAT_CFG_BOOL_TLE_PROXY_AUTH, /*!< Proxy requires authentication. */
SAT_CFG_BOOL_TLE_ADD_NEW, /*!< Add new satellites to database. */
SAT_CFG_BOOL_KEEP_LOG_FILES, /*!< Whether to keep old log files */
SAT_CFG_BOOL_PRED_USE_REAL_T0, /*!< Whether to use current time as T0 fro predictions */
- SAT_CFG_BOOL_NUM /*!< Number of boolean parameters */
+ SAT_CFG_BOOL_NUM /*!< Number of boolean parameters */
} sat_cfg_bool_e;
/** \brief Symbolic references for integer config values. */
typedef enum {
- SAT_CFG_INT_MODULE_TIMEOUT = 0, /*!< Module refresh rate */
- SAT_CFG_INT_MODULE_LAYOUT, /*!< Module layout */
- SAT_CFG_INT_MODULE_VIEW_1, /*!< Type of view 1 */
- SAT_CFG_INT_MODULE_VIEW_2, /*!< Type of view 2 */
- SAT_CFG_INT_MODULE_VIEW_3, /*!< Type of view 3 */
- SAT_CFG_INT_WARP_FACTOR, /*!< Time compression factor. */
- SAT_CFG_INT_LIST_REFRESH, /*!< List refresh rate (cycle). */
- SAT_CFG_INT_LIST_COLUMNS, /*!< List column visibility. */
- SAT_CFG_INT_MAP_REFRESH, /*!< Map refresh rate (cycle). */
- SAT_CFG_INT_MAP_INFO_COL, /*!< Info text colour on maps. */
- SAT_CFG_INT_MAP_INFO_BGD_COL, /*!< Info text bgd colour on maps. */
- SAT_CFG_INT_MAP_QTH_COL, /*!< QTH mark colour on map. */
- SAT_CFG_INT_MAP_SAT_COL, /*!< Satellite colour on maps */
- SAT_CFG_INT_MAP_SAT_SEL_COL, /*!< Selected satellite colour */
- SAT_CFG_INT_MAP_SAT_COV_COL, /*!< Map coverage area colour */
- SAT_CFG_INT_MAP_GRID_COL, /*!< Grid colour. */
- SAT_CFG_INT_MAP_TICK_COL, /*!< Tick labels colour. */
- SAT_CFG_INT_MAP_TRACK_COL, /*!< Ground Track colour. */
- SAT_CFG_INT_MAP_TRACK_NUM, /*!< Number of orbits to show ground track for */
- SAT_CFG_INT_POLAR_REFRESH, /*!< Polar refresh rate (cycle). */
- SAT_CFG_INT_POLAR_ORIENTATION, /*!< Orientation of the polar charts. */
- SAT_CFG_INT_POLAR_BGD_COL, /*!< Polar view, background colour. */
- SAT_CFG_INT_POLAR_AXIS_COL, /*!< Polar view, axis colour. */
- SAT_CFG_INT_POLAR_TICK_COL, /*!< Tick label colour, e.g. N/W/S/E */
- SAT_CFG_INT_POLAR_SAT_COL, /*!< Satellite colour. */
- SAT_CFG_INT_POLAR_SAT_SEL_COL, /*!< Selected satellite colour. */
- SAT_CFG_INT_POLAR_TRACK_COL, /*!< Track colour. */
- SAT_CFG_INT_POLAR_INFO_COL, /*!< Info colour. */
- SAT_CFG_INT_SINGLE_SAT_REFRESH, /*!< Single-sat refresh rate (cycle). */
- SAT_CFG_INT_SINGLE_SAT_FIELDS, /*!< Single-sat fields. */
- SAT_CFG_INT_PRED_MIN_EL, /*!< Minimum elevation for passes. */
- SAT_CFG_INT_PRED_NUM_PASS, /*!< Number of passes to predict. */
- SAT_CFG_INT_PRED_LOOK_AHEAD, /*!< Look-ahead time limit in days. */
- SAT_CFG_INT_PRED_RESOLUTION, /*!< Time resolution in seconds */
- SAT_CFG_INT_PRED_NUM_ENTRIES, /*!< Number of entries in single pass. */
- SAT_CFG_INT_PRED_SINGLE_COL, /*!< Visible columns in single-pass dialog */
- SAT_CFG_INT_PRED_MULTI_COL, /*!< Visible columns in multi-pass dialog */
- SAT_CFG_INT_PRED_SAVE_FORMAT, /*!< Last used save format for predictions */
- SAT_CFG_INT_PRED_SAVE_CONTENTS, /*!< Last selection for save file contents */
+ SAT_CFG_INT_MODULE_TIMEOUT = 0, /*!< Module refresh rate */
+ SAT_CFG_INT_MODULE_LAYOUT, /*!< Module layout */
+ SAT_CFG_INT_MODULE_VIEW_1, /*!< Type of view 1 */
+ SAT_CFG_INT_MODULE_VIEW_2, /*!< Type of view 2 */
+ SAT_CFG_INT_MODULE_VIEW_3, /*!< Type of view 3 */
+ SAT_CFG_INT_WARP_FACTOR, /*!< Time compression factor. */
+ SAT_CFG_INT_LIST_REFRESH, /*!< List refresh rate (cycle). */
+ SAT_CFG_INT_LIST_COLUMNS, /*!< List column visibility. */
+ SAT_CFG_INT_MAP_REFRESH, /*!< Map refresh rate (cycle). */
+ SAT_CFG_INT_MAP_INFO_COL, /*!< Info text colour on maps. */
+ SAT_CFG_INT_MAP_INFO_BGD_COL, /*!< Info text bgd colour on maps. */
+ SAT_CFG_INT_MAP_QTH_COL, /*!< QTH mark colour on map. */
+ SAT_CFG_INT_MAP_SAT_COL, /*!< Satellite colour on maps */
+ SAT_CFG_INT_MAP_SAT_SEL_COL, /*!< Selected satellite colour */
+ SAT_CFG_INT_MAP_SAT_COV_COL, /*!< Map coverage area colour */
+ SAT_CFG_INT_MAP_GRID_COL, /*!< Grid colour. */
+ SAT_CFG_INT_MAP_TICK_COL, /*!< Tick labels colour. */
+ SAT_CFG_INT_MAP_TRACK_COL, /*!< Ground Track colour. */
+ SAT_CFG_INT_MAP_TRACK_NUM, /*!< Number of orbits to show ground track for */
+ SAT_CFG_INT_POLAR_REFRESH, /*!< Polar refresh rate (cycle). */
+ SAT_CFG_INT_POLAR_ORIENTATION, /*!< Orientation of the polar charts. */
+ SAT_CFG_INT_POLAR_BGD_COL, /*!< Polar view, background colour. */
+ SAT_CFG_INT_POLAR_AXIS_COL, /*!< Polar view, axis colour. */
+ SAT_CFG_INT_POLAR_TICK_COL, /*!< Tick label colour, e.g. N/W/S/E */
+ SAT_CFG_INT_POLAR_SAT_COL, /*!< Satellite colour. */
+ SAT_CFG_INT_POLAR_SAT_SEL_COL, /*!< Selected satellite colour. */
+ SAT_CFG_INT_POLAR_TRACK_COL, /*!< Track colour. */
+ SAT_CFG_INT_POLAR_INFO_COL, /*!< Info colour. */
+ SAT_CFG_INT_SINGLE_SAT_REFRESH, /*!< Single-sat refresh rate (cycle). */
+ SAT_CFG_INT_SINGLE_SAT_FIELDS, /*!< Single-sat fields. */
+ SAT_CFG_INT_PRED_MIN_EL, /*!< Minimum elevation for passes. */
+ SAT_CFG_INT_PRED_NUM_PASS, /*!< Number of passes to predict. */
+ SAT_CFG_INT_PRED_LOOK_AHEAD, /*!< Look-ahead time limit in days. */
+ SAT_CFG_INT_PRED_RESOLUTION, /*!< Time resolution in seconds */
+ SAT_CFG_INT_PRED_NUM_ENTRIES, /*!< Number of entries in single pass. */
+ SAT_CFG_INT_PRED_SINGLE_COL, /*!< Visible columns in single-pass dialog */
+ SAT_CFG_INT_PRED_MULTI_COL, /*!< Visible columns in multi-pass dialog */
+ SAT_CFG_INT_PRED_SAVE_FORMAT, /*!< Last used save format for predictions */
+ SAT_CFG_INT_PRED_SAVE_CONTENTS, /*!< Last selection for save file contents */
SAT_CFG_INT_PRED_TWILIGHT_THLD, /*!< Twilight zone threshold */
- SAT_CFG_INT_SKYATGL_TIME, /*!< Time span for sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_01, /*!< Colour 1 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_02, /*!< Colour 2 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_03, /*!< Colour 3 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_04, /*!< Colour 4 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_05, /*!< Colour 5 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_06, /*!< Colour 6 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_07, /*!< Colour 7 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_08, /*!< Colour 8 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_09, /*!< Colour 9 in sky at a glance predictions */
- SAT_CFG_INT_SKYATGL_COL_10, /*!< Colour 10 in sky at a glance predictions */
- SAT_CFG_INT_WINDOW_POS_X, /*!< Main window X during last session */
- SAT_CFG_INT_WINDOW_POS_Y, /*!< Main window Y during last session */
- SAT_CFG_INT_WINDOW_WIDTH, /*!< Main window width during last session */
- SAT_CFG_INT_WINDOW_HEIGHT, /*!< Main window height during last session */
- SAT_CFG_INT_WEB_BROWSER_TYPE, /*!< Web browser type, see browser_type_t */
- SAT_CFG_INT_TLE_AUTO_UPD_FREQ, /*!< TLE auto-update frequency. */
- SAT_CFG_INT_TLE_AUTO_UPD_ACTION, /*!< TLE auto-update action. */
- SAT_CFG_INT_TLE_LAST_UPDATE, /*!< Date and time of last update, Unix seconds. */
- SAT_CFG_INT_LOG_CLEAN_AGE, /*!< Age of log file to delete (seconds) */
- SAT_CFG_INT_LOG_LEVEL, /*!< Logging level */
- SAT_CFG_INT_NUM /*!< Number of integer parameters. */
+ SAT_CFG_INT_SKYATGL_TIME, /*!< Time span for sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_01, /*!< Colour 1 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_02, /*!< Colour 2 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_03, /*!< Colour 3 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_04, /*!< Colour 4 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_05, /*!< Colour 5 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_06, /*!< Colour 6 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_07, /*!< Colour 7 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_08, /*!< Colour 8 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_09, /*!< Colour 9 in sky at a glance predictions */
+ SAT_CFG_INT_SKYATGL_COL_10, /*!< Colour 10 in sky at a glance predictions */
+ SAT_CFG_INT_WINDOW_POS_X, /*!< Main window X during last session */
+ SAT_CFG_INT_WINDOW_POS_Y, /*!< Main window Y during last session */
+ SAT_CFG_INT_WINDOW_WIDTH, /*!< Main window width during last session */
+ SAT_CFG_INT_WINDOW_HEIGHT, /*!< Main window height during last session */
+ SAT_CFG_INT_WEB_BROWSER_TYPE, /*!< Web browser type, see browser_type_t */
+ SAT_CFG_INT_TLE_AUTO_UPD_FREQ, /*!< TLE auto-update frequency. */
+ SAT_CFG_INT_TLE_AUTO_UPD_ACTION, /*!< TLE auto-update action. */
+ SAT_CFG_INT_TLE_LAST_UPDATE, /*!< Date and time of last update, Unix seconds. */
+ SAT_CFG_INT_LOG_CLEAN_AGE, /*!< Age of log file to delete (seconds) */
+ SAT_CFG_INT_LOG_LEVEL, /*!< Logging level */
+ SAT_CFG_INT_NUM /*!< Number of integer parameters. */
} sat_cfg_int_e;
/** \brief Symbolic references for string config values. */
typedef enum {
- SAT_CFG_STR_TIME_FORMAT = 0,/*!< Time format. */
- SAT_CFG_STR_DEF_QTH, /*!< Default QTH file. */
- SAT_CFG_STR_OPEN_MODULES, /*!< Open modules. */
- SAT_CFG_STR_WEB_BROWSER, /*!< Web browser string. */
- SAT_CFG_STR_MAP_FILE, /*!< Map file (abs or rel). */
- SAT_CFG_STR_MAP_FONT, /*!< Map font. */
- SAT_CFG_STR_POL_FONT, /*!< Polar view font. */
- SAT_CFG_STR_TLE_SERVER, /*!< Server for TLE updates. */
- SAT_CFG_STR_TLE_FILES, /*!< ; separated list of files on server. */
- SAT_CFG_STR_TLE_FILE_DIR, /*!< Local directory from which tle were last updated. */
- SAT_CFG_STR_TLE_FILE_EXT, /*!< File extensions. */
- SAT_CFG_STR_PRED_SAVE_DIR, /*!< Last used save directory for pass predictions */
- SAT_CFG_STR_NUM /*!< Number of string parameters */
+ SAT_CFG_STR_TIME_FORMAT = 0,/*!< Time format. */
+ SAT_CFG_STR_DEF_QTH, /*!< Default QTH file. */
+ SAT_CFG_STR_OPEN_MODULES, /*!< Open modules. */
+ SAT_CFG_STR_WEB_BROWSER, /*!< Web browser string. */
+ SAT_CFG_STR_MAP_FILE, /*!< Map file (abs or rel). */
+ SAT_CFG_STR_MAP_FONT, /*!< Map font. */
+ SAT_CFG_STR_POL_FONT, /*!< Polar view font. */
+ SAT_CFG_STR_TLE_SERVER, /*!< Server for TLE updates. */
+ SAT_CFG_STR_TLE_FILES, /*!< ; separated list of files on server. */
+ SAT_CFG_STR_TLE_PROXY, /*!< Proxy server. */
+ SAT_CFG_STR_TLE_FILE_DIR, /*!< Local directory from which tle were last updated. */
+ SAT_CFG_STR_TLE_FILE_EXT, /*!< File extensions. */
+ SAT_CFG_STR_PRED_SAVE_DIR, /*!< Last used save directory for pass predictions */
+ SAT_CFG_STR_NUM /*!< Number of string parameters */
} sat_cfg_str_e;
Modified: trunk/src/sat-pref-tle.c
===================================================================
--- trunk/src/sat-pref-tle.c 2009-04-13 11:20:28 UTC (rev 267)
+++ trunk/src/sat-pref-tle.c 2009-04-14 21:06:51 UTC (rev 268)
@@ -42,7 +42,7 @@
static GtkWidget *warn,*autom;
/* internet updates */
-static GtkWidget *server,*files;
+static GtkWidget *server,*proxy,*files;
/* add new sats */
static GtkWidget *addnew;
@@ -76,28 +76,27 @@
GtkWidget *sat_pref_tle_create ()
{
- GtkWidget *vbox;
+ GtkWidget *vbox;
-
- /* vertical box */
- vbox = gtk_vbox_new (FALSE, 10);
- gtk_container_set_border_width (GTK_CONTAINER (vbox), 20);
+ /* vertical box */
+ vbox = gtk_vbox_new (FALSE, 10);
+ gtk_container_set_border_width (GTK_CONTAINER (vbox), 20);
- /* add contents */
- create_auto_update (vbox);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
- create_network (vbox);
- gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
+ /* add contents */
+ create_auto_update (vbox);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
+ create_network (vbox);
+ gtk_box_pack_start (GTK_BOX (vbox), gtk_hseparator_new (), FALSE, TRUE, 0);
create_misc (vbox);
#if 0
create_local (vbox);
#endif
- /* create RESET button */
- create_reset_button (GTK_BOX (vbox));
+ /* create RESET button */
+ create_reset_button (GTK_BOX (vbox));
- return vbox;
+ return vbox;
}
@@ -106,8 +105,8 @@
void
sat_pref_tle_cancel ()
{
- dirty = FALSE;
- reset = FALSE;
+ dirty = FALSE;
+ reset = FALSE;
}
@@ -116,45 +115,50 @@
void
sat_pref_tle_ok ()
{
- if (dirty) {
-
- /* save settings */
+ if (dirty) {
+
+ /* save settings */
- /* update frequency */
- sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ,
- gtk_combo_box_get_active (GTK_COMBO_BOX (freq)));
+ /* update frequency */
+ sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ,
+ gtk_combo_box_get_active (GTK_COMBO_BOX (freq)));
- /* action to take */
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (autom)))
- sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_GOAHEAD);
- else
- sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_NOTIFY);
+ /* action to take */
+ if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (autom)))
+ sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_GOAHEAD);
+ else
+ sat_cfg_set_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION, TLE_AUTO_UPDATE_NOTIFY);
- /* server */
- sat_cfg_set_str (SAT_CFG_STR_TLE_SERVER,
- gtk_entry_get_text (GTK_ENTRY (server)));
+ /* server */
+ sat_cfg_set_str (SAT_CFG_STR_TLE_SERVER,
+ gtk_entry_get_text (GTK_ENTRY (server)));
- /* files */
- sat_cfg_set_str (SAT_CFG_STR_TLE_FILES,
- gtk_entry_get_text (GTK_ENTRY (files)));
+ /* proxy */
+ sat_cfg_set_str (SAT_CFG_STR_TLE_PROXY,
+ gtk_entry_get_text (GTK_ENTRY (proxy)));
+
+ /* files */
+ sat_cfg_set_str (SAT_CFG_STR_TLE_FILES,
+ gtk_entry_get_text (GTK_ENTRY (files)));
/* add new sats */
sat_cfg_set_bool (SAT_CFG_BOOL_TLE_ADD_NEW,
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (addnew)));
+ gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (addnew)));
- dirty = FALSE;
- }
- else if (reset) {
+ dirty = FALSE;
+ }
+ else if (reset) {
- /* use sat_cfg_reset */
- sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ);
- sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION);
- sat_cfg_reset_str (SAT_CFG_STR_TLE_SERVER);
- sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES);
+ /* use sat_cfg_reset */
+ sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ);
+ sat_cfg_reset_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION);
+ sat_cfg_reset_str (SAT_CFG_STR_TLE_SERVER);
+ sat_cfg_reset_str (SAT_CFG_STR_TLE_PROXY);
+ sat_cfg_reset_str (SAT_CFG_STR_TLE_FILES);
sat_cfg_reset_bool (SAT_CFG_BOOL_TLE_ADD_NEW);
- reset = FALSE;
- }
+ reset = FALSE;
+ }
}
@@ -162,53 +166,53 @@
static void
create_auto_update (GtkWidget *vbox)
{
- GtkWidget *label;
- GtkWidget *box;
- guint i;
+ GtkWidget *label;
+ GtkWidget *box;
+ guint i;
- /* auto update */
- label = gtk_label_new (NULL);
- gtk_label_set_markup (GTK_LABEL (label), _("<b>Auto-Update:</b>"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+ /* auto update */
+ label = gtk_label_new (NULL);
+ gtk_label_set_markup (GTK_LABEL (label), _("<b>Auto-Update:</b>"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
- /* frequency */
- freq = gtk_combo_box_new_text ();
- for (i = 0; i < TLE_AUTO_UPDATE_NUM; i++) {
- gtk_combo_box_append_text (GTK_COMBO_BOX (freq),
- tle_update_freq_to_str (i));
- }
- gtk_combo_box_set_active (GTK_COMBO_BOX (freq),
- sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ));
- g_signal_connect (freq, "changed", G_CALLBACK (value_changed_cb), NULL);
+ /* frequency */
+ freq = gtk_combo_box_new_text ();
+ for (i = 0; i < TLE_AUTO_UPDATE_NUM; i++) {
+ gtk_combo_box_append_text (GTK_COMBO_BOX (freq),
+ tle_update_freq_to_str (i));
+ }
+ gtk_combo_box_set_active (GTK_COMBO_BOX (freq),
+ sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_FREQ));
+ g_signal_connect (freq, "changed", G_CALLBACK (value_changed_cb), NULL);
- label = gtk_label_new (_("Check the age of TLE data:"));
+ label = gtk_label_new (_("Check the age of TLE data:"));
- box = gtk_hbox_new (FALSE, 5);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (box), freq, FALSE, FALSE, 0);
+ box = gtk_hbox_new (FALSE, 5);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (box), freq, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE, 0);
- /* radio buttons selecting action */
- label = gtk_label_new (_("If TLEs are too old:"));
- gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
- warn = gtk_radio_button_new_with_label (NULL,
- _("Notify me"));
- gtk_box_pack_start (GTK_BOX (vbox), warn, FALSE, TRUE, 0);
- autom = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (warn),
- _("Perform automatic update in the background"));
- gtk_box_pack_start (GTK_BOX (vbox), autom, FALSE, TRUE, 0);
+ /* radio buttons selecting action */
+ label = gtk_label_new (_("If TLEs are too old:"));
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
+ gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE, 0);
+ warn = gtk_radio_button_new_with_label (NULL,
+ _("Notify me"));
+ gtk_box_pack_start (GTK_BOX (vbox), warn, FALSE, TRUE, 0);
+ autom = gtk_radio_button_new_with_label_from_widget (GTK_RADIO_BUTTON (warn),
+ _("Perform automatic update in the background"));
+ gtk_box_pack_start (GTK_BOX (vbox), autom, FALSE, TRUE, 0);
- /* warn is selected automatically by default */
- if (sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION) == TLE_AUTO_UPDATE_GOAHEAD) {
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (autom), TRUE);
- }
-
+ /* warn is selected automatically by default */
+ if (sat_cfg_get_int (SAT_CFG_INT_TLE_AUTO_UPD_ACTION) == TLE_AUTO_UPDATE_GOAHEAD) {
+ gtk_toggle_b...
[truncated message content] |
