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

[<cs...@us...>]

Revision: 520
          http://gpredict.svn.sourceforge.net/gpredict/?rev=520&view=rev
Author:   csete
Date:     2009-11-19 08:33:05 +0000 (Thu, 19 Nov 2009)

Log Message:
-----------
Sync

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/src/gtk-sat-module.c
    trunk/src/gtk-sat-module.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2009-11-18 22:30:19 UTC (rev 519)
+++ trunk/ChangeLog	2009-11-19 08:33:05 UTC (rev 520)
@@ -1,6 +1,7 @@
 2009-11-18 Alexandru Csete <oz9aec at gmail.com>
 
     * src/config-keys.h:
+    * src/sat-cfg.[ch]:
     Added config key for new GRID layout.
 
     * src/sat-info.c:
@@ -9,7 +10,7 @@
 
     * src/gtk-single-sat.c:
     Changed satellite selector to list satellites in the main pop-up menu instead of a
-    submbenu (fewer mouse clicks).
+    submbenu (fewer mouse clicks).      
 
 
 2009-11-06 Alexandru Csete <oz9aec at gmail.com>

Modified: trunk/src/gtk-sat-module.c
===================================================================
--- trunk/src/gtk-sat-module.c	2009-11-18 22:30:19 UTC (rev 519)
+++ trunk/src/gtk-sat-module.c	2009-11-19 08:33:05 UTC (rev 520)
@@ -176,6 +176,8 @@
     module->state = GTK_SAT_MOD_STATE_DOCKED;
     module->busy = g_mutex_new();
 
+    module->grid = NULL;
+    module->views = NULL;
     module->layout = GTK_SAT_MOD_LAYOUT_1;
     module->view_1 = GTK_SAT_MOD_VIEW_MAP;
     module->view_2 = GTK_SAT_MOD_VIEW_POLAR;
@@ -233,6 +235,13 @@
         module->satellites = NULL;
     }
 
+    if (module->grid) {
+        g_free (module->grid);
+        module->grid = NULL;
+    }
+
+    /* FIXME: free module->views? */
+
     (* GTK_OBJECT_CLASS (parent_class)->destroy) (object);
 }
 
@@ -528,6 +537,7 @@
     gchar   *qthfile;
     gchar   *confdir;
     gchar  **buffv;
+    guint   length;
     GError  *error = NULL;
 
     module->cfgdata = g_key_file_new ();
@@ -615,7 +625,20 @@
                                        MOD_CFG_TIMEOUT_KEY,
                                        SAT_CFG_INT_MODULE_TIMEOUT);
 
-    /* layout */
+    /* get grid layout configuration (introduced in 1.2) */
+    buffer = mod_cfg_get_str (module->cfgdata,
+                              MOD_CFG_GLOBAL_SECTION,
+                              MOD_CFG_GRID,
+                              SAT_CFG_STR_MODULE_GRID);
+
+    /* convert to an integer list */
+    buffv = g_strsplit (buffer, ";", 0);
+    length = g_strv_length (buffv);
+    if ((length == 0) || (length % 5 != 0)) {
+
+    }
+
+
     module->layout = mod_cfg_get_int (module->cfgdata,
                                       MOD_CFG_GLOBAL_SECTION,
                                       MOD_CFG_LAYOUT,

Modified: trunk/src/gtk-sat-module.h
===================================================================
--- trunk/src/gtk-sat-module.h	2009-11-18 22:30:19 UTC (rev 519)
+++ trunk/src/gtk-sat-module.h	2009-11-19 08:33:05 UTC (rev 520)
@@ -113,6 +113,10 @@
     gint           vpanedpos;   /*!< Stored position of vpaned */
     gint           hpanedpos;   /*!< Stored pos of hpaned */
 
+    /* layout and children */
+    gint         *grid;
+    GSList       *views;
+
     /* children */
     GtkWidget     *child_1;
     GtkWidget     *child_2;


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