[Gpredict-svn] SF.net SVN: gpredict:[279] trunk/src/mod-mgr.c
Real time satellite tracking and orbit prediction
Status: Beta
Brought to you by:
csete
From: <cs...@us...> - 2009-05-01 16:23:04
|
Revision: 279 http://gpredict.svn.sourceforge.net/gpredict/?rev=279&view=rev Author: csete Date: 2009-05-01 16:23:03 +0000 (Fri, 01 May 2009) Log Message: ----------- Fixed indent. Modified Paths: -------------- trunk/src/mod-mgr.c Modified: trunk/src/mod-mgr.c =================================================================== --- trunk/src/mod-mgr.c 2009-04-15 21:29:45 UTC (rev 278) +++ trunk/src/mod-mgr.c 2009-05-01 16:23:03 UTC (rev 279) @@ -75,9 +75,9 @@ static void update_window_title (void); static void switch_page_cb (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - gpointer user_data); + GtkNotebookPage *page, + guint page_num, + gpointer user_data); static void create_module_window (GtkWidget *module); @@ -94,83 +94,83 @@ GtkWidget * mod_mgr_create (void) { - gchar *openmods = NULL; - gchar **mods; - gint count,i; - GtkWidget *module; - gchar *modfile; + gchar *openmods = NULL; + gchar **mods; + gint count,i; + GtkWidget *module; + gchar *modfile; - /* create notebook */ - nbook = gtk_notebook_new (); - gtk_notebook_set_scrollable (GTK_NOTEBOOK (nbook), TRUE); - gtk_notebook_popup_enable (GTK_NOTEBOOK (nbook)); - g_object_set (G_OBJECT (nbook), "homogeneous", TRUE, NULL); - g_signal_connect (G_OBJECT (nbook), "switch-page", - G_CALLBACK (switch_page_cb), NULL); + /* create notebook */ + nbook = gtk_notebook_new (); + gtk_notebook_set_scrollable (GTK_NOTEBOOK (nbook), TRUE); + gtk_notebook_popup_enable (GTK_NOTEBOOK (nbook)); + g_object_set (G_OBJECT (nbook), "homogeneous", TRUE, NULL); + g_signal_connect (G_OBJECT (nbook), "switch-page", + G_CALLBACK (switch_page_cb), NULL); - /* get list of modules which should be open */ - openmods = sat_cfg_get_str (SAT_CFG_STR_OPEN_MODULES); + /* get list of modules which should be open */ + openmods = sat_cfg_get_str (SAT_CFG_STR_OPEN_MODULES); - if (openmods) { - mods = g_strsplit (openmods, ";", 0); - count = g_strv_length (mods); + if (openmods) { + mods = g_strsplit (openmods, ";", 0); + count = g_strv_length (mods); - for (i = 0; i < count; i++) { + for (i = 0; i < count; i++) { - /* get data file name */ - modfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, - ".gpredict2", G_DIR_SEPARATOR_S, - "modules", G_DIR_SEPARATOR_S, - mods[i], - ".mod", NULL); - - /* create module */ - module = gtk_sat_module_new (modfile); + /* get data file name */ + modfile = g_strconcat (g_get_home_dir (), G_DIR_SEPARATOR_S, + ".gpredict2", G_DIR_SEPARATOR_S, + "modules", G_DIR_SEPARATOR_S, + mods[i], + ".mod", NULL); + + /* create module */ + module = gtk_sat_module_new (modfile); - if (IS_GTK_SAT_MODULE (module)) { + if (IS_GTK_SAT_MODULE (module)) { - /* if module state was window or user does not want to restore the - state of the modules, pack the module into the notebook */ - if ((GTK_SAT_MODULE (module)->state == GTK_SAT_MOD_STATE_DOCKED) || - !sat_cfg_get_bool (SAT_CFG_BOOL_MOD_STATE)) { + /* if module state was window or user does not want to restore the + state of the modules, pack the module into the notebook */ + if ((GTK_SAT_MODULE (module)->state == GTK_SAT_MOD_STATE_DOCKED) || + !sat_cfg_get_bool (SAT_CFG_BOOL_MOD_STATE)) { - mod_mgr_add_module (module, TRUE); + mod_mgr_add_module (module, TRUE); - } - else { - mod_mgr_add_module (module, FALSE); - create_module_window (module); - } - } - else { - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: Failed to restore %s"), - __FUNCTION__, mods[i]); - } + } + else { + mod_mgr_add_module (module, FALSE); + create_module_window (module); + } + } + else { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Failed to restore %s"), + __FUNCTION__, mods[i]); + } - g_free (modfile); + g_free (modfile); - } + } - g_strfreev (mods); - g_free (openmods); + g_strfreev (mods); + g_free (openmods); - /* disable tabs if only one page in notebook */ - if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); - } - else { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); - } + /* disable tabs if only one page in notebook */ + if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); + } + else { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); + } - } - else { - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: No modules have to be restored."), - __FUNCTION__); - } + } + else { + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: No modules have to be restored."), + __FUNCTION__); + } - return nbook; + return nbook; } @@ -187,54 +187,64 @@ gint mod_mgr_add_module (GtkWidget *module, gboolean dock) { - gint retcode = 0; - gint page; + gint retcode = 0; + gint page; +sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Entered 1."), + __FUNCTION__); + if (module) { - if (module) { + /* add module to internal list */ + modules = g_slist_append (modules, module); - /* add module to internal list */ - modules = g_slist_append (modules, module); + if (dock) { +sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Entered 2."), + __FUNCTION__); + /* add module to notebook if state = DOCKED */ + page = gtk_notebook_prepend_page (GTK_NOTEBOOK (nbook), + module, + gtk_label_new (GTK_SAT_MODULE (module)->name)); - if (dock) { - /* add module to notebook if state = DOCKED */ - page = gtk_notebook_append_page (GTK_NOTEBOOK (nbook), - module, - gtk_label_new (GTK_SAT_MODULE (module)->name)); - gtk_notebook_set_current_page (GTK_NOTEBOOK (nbook), page); + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Entered 3."), + __FUNCTION__); - /* send message to logger */ - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: Added %s to module manger (page %d)."), - __FUNCTION__, GTK_SAT_MODULE (module)->name, page); - } - else { - /* send message to logger */ - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: Added %s to module manger (NOT DOCKED)."), - __FUNCTION__, GTK_SAT_MODULE (module)->name); - } - retcode = 0; - } - else { - sat_log_log (SAT_LOG_LEVEL_ERROR, - _("%s: Module %s seems to be NULL"), - __FUNCTION__, GTK_SAT_MODULE (module)->name); - retcode = 1; - } + gtk_notebook_set_current_page (GTK_NOTEBOOK (nbook), page); - /* disable tabs if only one page in notebook */ - if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); - } - else { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); - } + /* send message to logger */ + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Added %s to module manger (page %d)."), + __FUNCTION__, GTK_SAT_MODULE (module)->name, page); + } + else { + /* send message to logger */ + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Added %s to module manger (NOT DOCKED)."), + __FUNCTION__, GTK_SAT_MODULE (module)->name); + } + retcode = 0; + } + else { + sat_log_log (SAT_LOG_LEVEL_ERROR, + _("%s: Module %s seems to be NULL"), + __FUNCTION__, GTK_SAT_MODULE (module)->name); + retcode = 1; + } - update_window_title (); + /* disable tabs if only one page in notebook */ + if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); + } + else { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); + } - return retcode; + update_window_title (); + return retcode; + } @@ -247,54 +257,54 @@ gint mod_mgr_remove_module (GtkWidget *module) { - gint page; - gint retcode = 0; + gint page; + gint retcode = 0; - /* remove from notebook */ - if (GTK_SAT_MODULE (module)->state == GTK_SAT_MOD_STATE_DOCKED) { - /* get page number for this module */ - page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); + /* remove from notebook */ + if (GTK_SAT_MODULE (module)->state == GTK_SAT_MOD_STATE_DOCKED) { + /* get page number for this module */ + page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); - if (page == -1) { - /* this is some kind of bug (inconsistency between internal states) */ - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: Could not find child in notebook. This may hurt..."), - __FUNCTION__); + if (page == -1) { + /* this is some kind of bug (inconsistency between internal states) */ + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s: Could not find child in notebook. This may hurt..."), + __FUNCTION__); - retcode = 1; - } - else { - gtk_notebook_remove_page (GTK_NOTEBOOK (nbook), page); + retcode = 1; + } + else { + gtk_notebook_remove_page (GTK_NOTEBOOK (nbook), page); - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: Removed child from notebook page %d."), - __FUNCTION__, page); + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Removed child from notebook page %d."), + __FUNCTION__, page); - retcode = 0; - } - } + retcode = 0; + } + } - /* remove from list */ - modules = g_slist_remove (modules, module); + /* remove from list */ + modules = g_slist_remove (modules, module); - /* undocked modules will have to destroy themselves - because of their parent window - */ + /* undocked modules will have to destroy themselves + because of their parent window + */ - /* disable tabs if only one page in notebook */ - if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); - } - else { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); - } + /* disable tabs if only one page in notebook */ + if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); + } + else { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); + } - /* update window title */ - update_window_title (); + /* update window title */ + update_window_title (); - return retcode; + return retcode; } @@ -310,60 +320,60 @@ void mod_mgr_save_state () { - guint num; - guint i; - GtkWidget *module; - gchar *mods = NULL; - gchar *buff; + guint num; + guint i; + GtkWidget *module; + gchar *mods = NULL; + gchar *buff; - - if (!nbook) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: Attempt to save state but mod-mgr is NULL?"), - __FUNCTION__); - return; - } + + if (!nbook) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s: Attempt to save state but mod-mgr is NULL?"), + __FUNCTION__); + return; + } - num = g_slist_length (modules); + num = g_slist_length (modules); - if (num == 0) { - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: No modules need to save state."), - __FUNCTION__); + if (num == 0) { + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: No modules need to save state."), + __FUNCTION__); - sat_cfg_set_str (SAT_CFG_STR_OPEN_MODULES, NULL); + sat_cfg_set_str (SAT_CFG_STR_OPEN_MODULES, NULL); - return; - } + return; + } - for (i = 0; i < num; i++) { - module = GTK_WIDGET (g_slist_nth_data (modules, i)); + for (i = 0; i < num; i++) { + module = GTK_WIDGET (g_slist_nth_data (modules, i)); /* save state of the module */ mod_cfg_save (GTK_SAT_MODULE (module)->name, GTK_SAT_MODULE (module)->cfgdata); - - if (i == 0) { - buff = g_strdup (GTK_SAT_MODULE (module)->name); - } - else { - buff = g_strconcat (mods, ";", GTK_SAT_MODULE (module)->name, NULL); - g_free (mods); - } + + if (i == 0) { + buff = g_strdup (GTK_SAT_MODULE (module)->name); + } + else { + buff = g_strconcat (mods, ";", GTK_SAT_MODULE (module)->name, NULL); + g_free (mods); + } - mods = g_strdup (buff); - g_free (buff); + mods = g_strdup (buff); + g_free (buff); - sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Stored %s"), - __FUNCTION__, GTK_SAT_MODULE (module)->name); + sat_log_log (SAT_LOG_LEVEL_DEBUG, _("%s: Stored %s"), + __FUNCTION__, GTK_SAT_MODULE (module)->name); - } + } - sat_log_log (SAT_LOG_LEVEL_MSG, _("%s: Saved states for %d modules."), - __FUNCTION__, num); + sat_log_log (SAT_LOG_LEVEL_MSG, _("%s: Saved states for %d modules."), + __FUNCTION__, num); - sat_cfg_set_str (SAT_CFG_STR_OPEN_MODULES, mods); + sat_cfg_set_str (SAT_CFG_STR_OPEN_MODULES, mods); - g_free (mods); + g_free (mods); } @@ -374,27 +384,27 @@ gboolean mod_mgr_mod_is_visible (GtkWidget *module) { - gint page; - gboolean retcode = TRUE; + gint page; + gboolean retcode = TRUE; - /* get page number for this module */ - page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); + /* get page number for this module */ + page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); - if (page != -1) { - - if (gtk_notebook_get_current_page (GTK_NOTEBOOK (nbook)) == page) { - retcode = TRUE; - } - else { - retcode = FALSE; - } + if (page != -1) { + + if (gtk_notebook_get_current_page (GTK_NOTEBOOK (nbook)) == page) { + retcode = TRUE; + } + else { + retcode = FALSE; + } - } - else { - retcode = FALSE; - } + } + else { + retcode = FALSE; + } - return retcode; + return retcode; } @@ -416,52 +426,52 @@ gint mod_mgr_dock_module (GtkWidget *module) { - gint retcode = 0; - gint page; + gint retcode = 0; + gint page; - - if (!g_slist_find (modules, module)) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: Module %s not found in list. Trying to recover."), - __FUNCTION__, GTK_SAT_MODULE (module)->name); - modules = g_slist_append (modules, module); - } + + if (!g_slist_find (modules, module)) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s: Module %s not found in list. Trying to recover."), + __FUNCTION__, GTK_SAT_MODULE (module)->name); + modules = g_slist_append (modules, module); + } - page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); - if (page != -1) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: Module %s already in notebook!"), - __FUNCTION__, GTK_SAT_MODULE (module)->name); - retcode = 1; - } - else { - /* add module to notebook */ - page = gtk_notebook_append_page (GTK_NOTEBOOK (nbook), - module, - gtk_label_new (GTK_SAT_MODULE (module)->name)); + page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); + if (page != -1) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s: Module %s already in notebook!"), + __FUNCTION__, GTK_SAT_MODULE (module)->name); + retcode = 1; + } + else { + /* add module to notebook */ + page = gtk_notebook_append_page (GTK_NOTEBOOK (nbook), + module, + gtk_label_new (GTK_SAT_MODULE (module)->name)); - /* fix size allocation, i.e. paned position */ - gtk_sat_module_fix_size (module); + /* fix size allocation, i.e. paned position */ + gtk_sat_module_fix_size (module); - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: Docked %s into notebook (page %d)"), - __FUNCTION__, GTK_SAT_MODULE (module)->name, page); - - retcode = 0; - } + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Docked %s into notebook (page %d)"), + __FUNCTION__, GTK_SAT_MODULE (module)->name, page); + + retcode = 0; + } - /* disable tabs if only one page in notebook */ - if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); - } - else { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); - } + /* disable tabs if only one page in notebook */ + if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); + } + else { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); + } - /* update window title */ - update_window_title (); + /* update window title */ + update_window_title (); - return retcode; + return retcode; } @@ -485,47 +495,47 @@ gint mod_mgr_undock_module (GtkWidget *module) { - gint retcode = 0; - gint page; + gint retcode = 0; + gint page; - if (!g_slist_find (modules, module)) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: Module %s not found in list. Trying to recover."), - __FUNCTION__, GTK_SAT_MODULE (module)->name); - modules = g_slist_append (modules, module); - } + if (!g_slist_find (modules, module)) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s: Module %s not found in list. Trying to recover."), + __FUNCTION__, GTK_SAT_MODULE (module)->name); + modules = g_slist_append (modules, module); + } - page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); - if (page == -1) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: Module %s does not seem to be docked!"), - __FUNCTION__, GTK_SAT_MODULE (module)->name); - retcode = 1; - } - else { + page = gtk_notebook_page_num (GTK_NOTEBOOK (nbook), module); + if (page == -1) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s: Module %s does not seem to be docked!"), + __FUNCTION__, GTK_SAT_MODULE (module)->name); + retcode = 1; + } + else { - gtk_notebook_remove_page (GTK_NOTEBOOK (nbook), page); + gtk_notebook_remove_page (GTK_NOTEBOOK (nbook), page); - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: Removed %s from notebook page %d."), - __FUNCTION__, GTK_SAT_MODULE (module)->name, page); + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: Removed %s from notebook page %d."), + __FUNCTION__, GTK_SAT_MODULE (module)->name, page); - retcode = 0; - } + retcode = 0; + } - /* disable tabs if only one page in notebook */ - if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); - } - else { - gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); - } + /* disable tabs if only one page in notebook */ + if ((gtk_notebook_get_n_pages (GTK_NOTEBOOK(nbook))) == 1) { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), FALSE); + } + else { + gtk_notebook_set_show_tabs (GTK_NOTEBOOK (nbook), TRUE); + } - /* update window title */ - update_window_title (); + /* update window title */ + update_window_title (); - return retcode; + return retcode; } @@ -533,41 +543,41 @@ static void update_window_title () { - gint pgn,num; - GtkWidget *pg; - gchar *title; + gint pgn,num; + GtkWidget *pg; + gchar *title; - /* get number of pages */ - num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nbook)); + /* get number of pages */ + num = gtk_notebook_get_n_pages (GTK_NOTEBOOK (nbook)); - if (num == 0) { - gtk_window_set_title (GTK_WINDOW (app), _("GPREDICT: (none)")); - } - else { - pgn = gtk_notebook_get_current_page (GTK_NOTEBOOK (nbook)); - pg = gtk_notebook_get_nth_page (GTK_NOTEBOOK (nbook), pgn); - title = g_strdup_printf (_("GPREDICT: %s"), - gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (nbook), pg)); - gtk_window_set_title (GTK_WINDOW (app), title); - g_free (title); - } + if (num == 0) { + gtk_window_set_title (GTK_WINDOW (app), _("GPREDICT: (none)")); + } + else { + pgn = gtk_notebook_get_current_page (GTK_NOTEBOOK (nbook)); + pg = gtk_notebook_get_nth_page (GTK_NOTEBOOK (nbook), pgn); + title = g_strdup_printf (_("GPREDICT: %s"), + gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (nbook), pg)); + gtk_window_set_title (GTK_WINDOW (app), title); + g_free (title); + } } static void switch_page_cb (GtkNotebook *notebook, - GtkNotebookPage *page, - guint page_num, - gpointer user_data) + GtkNotebookPage *page, + guint page_num, + gpointer user_data) { - GtkWidget *pg; - gchar *title; + GtkWidget *pg; + gchar *title; - pg = gtk_notebook_get_nth_page (GTK_NOTEBOOK (nbook), page_num); - title = g_strdup_printf (_("GPREDICT: %s"), - gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (nbook), pg)); - gtk_window_set_title (GTK_WINDOW (app), title); - g_free (title); + pg = gtk_notebook_get_nth_page (GTK_NOTEBOOK (nbook), page_num); + title = g_strdup_printf (_("GPREDICT: %s"), + gtk_notebook_get_tab_label_text (GTK_NOTEBOOK (nbook), pg)); + gtk_window_set_title (GTK_WINDOW (app), title); + g_free (title); } @@ -575,36 +585,36 @@ void mod_mgr_reload_sats () { - guint num; - guint i; - GtkSatModule *mod; + guint num; + guint i; + GtkSatModule *mod; - - if (!nbook) { - sat_log_log (SAT_LOG_LEVEL_BUG, - _("%s: Attempt to reload sats but mod-mgr is NULL?"), - __FUNCTION__); - return; - } + + if (!nbook) { + sat_log_log (SAT_LOG_LEVEL_BUG, + _("%s: Attempt to reload sats but mod-mgr is NULL?"), + __FUNCTION__); + return; + } - num = g_slist_length (modules); + num = g_slist_length (modules); - if (num == 0) { - sat_log_log (SAT_LOG_LEVEL_MSG, - _("%s: No modules need to reload sats."), - __FUNCTION__); + if (num == 0) { + sat_log_log (SAT_LOG_LEVEL_MSG, + _("%s: No modules need to reload sats."), + __FUNCTION__); - return; - } + return; + } - /* for each module in the GSList execute sat_module_reload_sats() */ - for (i = 0; i < num; i++) { + /* for each module in the GSList execute sat_module_reload_sats() */ + for (i = 0; i < num; i++) { - mod = GTK_SAT_MODULE (g_slist_nth_data (modules, i)); - - gtk_sat_module_reload_sats (mod); + mod = GTK_SAT_MODULE (g_slist_nth_data (modules, i)); + + gtk_sat_module_reload_sats (mod); - } + } } @@ -618,99 +628,99 @@ static void create_module_window (GtkWidget *module) { - gint w,h; - gchar *icon; /* icon file name */ - gchar *title; /* window title */ + gint w,h; + gchar *icon; /* icon file name */ + gchar *title; /* window title */ - /* get stored size; use size from main window if size not explicitly stoed */ - if (g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_WIDTH, - NULL)) { - w = g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_WIDTH, - NULL); - } - else { - w = module->allocation.width; - } - if (g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_HEIGHT, - NULL)) { - h = g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_HEIGHT, - NULL); - } - else { - h = module->allocation.height; - } + /* get stored size; use size from main window if size not explicitly stoed */ + if (g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_WIDTH, + NULL)) { + w = g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_WIDTH, + NULL); + } + else { + w = module->allocation.width; + } + if (g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_HEIGHT, + NULL)) { + h = g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_HEIGHT, + NULL); + } + else { + h = module->allocation.height; + } - /* increase reference count of module */ - //g_object_ref (module); + /* increase reference count of module */ + //g_object_ref (module); - /* we don't need the positions */ - //GTK_SAT_MODULE (module)->vpanedpos = -1; - //GTK_SAT_MODULE (module)->hpanedpos = -1; + /* we don't need the positions */ + //GTK_SAT_MODULE (module)->vpanedpos = -1; + //GTK_SAT_MODULE (module)->hpanedpos = -1; - /* undock from mod-mgr */ - //mod_mgr_undock_module (module); + /* undock from mod-mgr */ + //mod_mgr_undock_module (module); - /* create window */ - GTK_SAT_MODULE (module)->win = gtk_window_new (GTK_WINDOW_TOPLEVEL); - title = g_strconcat ("GPREDICT: ", - GTK_SAT_MODULE (module)->name, - " (", GTK_SAT_MODULE (module)->qth->name, ")", - NULL); - gtk_window_set_title (GTK_WINDOW (GTK_SAT_MODULE (module)->win), title); - g_free (title); - gtk_window_set_default_size (GTK_WINDOW (GTK_SAT_MODULE (module)->win), w, h); - g_signal_connect (G_OBJECT (GTK_SAT_MODULE (module)->win), "configure_event", - G_CALLBACK (module_window_config_cb), module); + /* create window */ + GTK_SAT_MODULE (module)->win = gtk_window_new (GTK_WINDOW_TOPLEVEL); + title = g_strconcat ("GPREDICT: ", + GTK_SAT_MODULE (module)->name, + " (", GTK_SAT_MODULE (module)->qth->name, ")", + NULL); + gtk_window_set_title (GTK_WINDOW (GTK_SAT_MODULE (module)->win), title); + g_free (title); + gtk_window_set_default_size (GTK_WINDOW (GTK_SAT_MODULE (module)->win), w, h); + g_signal_connect (G_OBJECT (GTK_SAT_MODULE (module)->win), "configure_event", + G_CALLBACK (module_window_config_cb), module); - /* window icon */ - icon = icon_file_name ("gpredict-icon.png"); - if (g_file_test (icon, G_FILE_TEST_EXISTS)) { - gtk_window_set_icon_from_file (GTK_WINDOW (GTK_SAT_MODULE (module)->win), icon, NULL); - } - g_free (icon); + /* window icon */ + icon = icon_file_name ("gpredict-icon.png"); + if (g_file_test (icon, G_FILE_TEST_EXISTS)) { + gtk_window_set_icon_from_file (GTK_WINDOW (GTK_SAT_MODULE (module)->win), icon, NULL); + } + g_free (icon); - /* move window to stored position if requested by configuration */ - if (sat_cfg_get_bool (SAT_CFG_BOOL_MOD_WIN_POS) && - g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_POS_X, - NULL) && - g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_POS_Y, - NULL)) { + /* move window to stored position if requested by configuration */ + if (sat_cfg_get_bool (SAT_CFG_BOOL_MOD_WIN_POS) && + g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_POS_X, + NULL) && + g_key_file_has_key (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_POS_Y, + NULL)) { - gtk_window_move (GTK_WINDOW (GTK_SAT_MODULE (module)->win), - g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_POS_X, NULL), - g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, - MOD_CFG_GLOBAL_SECTION, - MOD_CFG_WIN_POS_Y, - NULL)); + gtk_window_move (GTK_WINDOW (GTK_SAT_MODULE (module)->win), + g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_POS_X, NULL), + g_key_file_get_integer (GTK_SAT_MODULE (module)->cfgdata, + MOD_CFG_GLOBAL_SECTION, + MOD_CFG_WIN_POS_Y, + NULL)); - } + } - /* add module to window */ - gtk_container_add (GTK_CONTAINER (GTK_SAT_MODULE (module)->win), module); + /* add module to window */ + gtk_container_add (GTK_CONTAINER (GTK_SAT_MODULE (module)->win), module); - /* show window */ - gtk_widget_show_all (GTK_SAT_MODULE (module)->win); + /* show window */ + gtk_widget_show_all (GTK_SAT_MODULE (module)->win); - /* reparent time manager window if visible */ - if (GTK_SAT_MODULE (module)->tmgActive) { - gtk_window_set_transient_for (GTK_WINDOW (GTK_SAT_MODULE (module)->tmgWin), - GTK_WINDOW (GTK_SAT_MODULE (module)->win)); - } + /* reparent time manager window if visible */ + if (GTK_SAT_MODULE (module)->tmgActive) { + gtk_window_set_transient_for (GTK_WINDOW (GTK_SAT_MODULE (module)->tmgWin), + GTK_WINDOW (GTK_SAT_MODULE (module)->win)); + } } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |