gergely/astrognome
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Unify AgWindow chart setting

Browse Source 
It was set differently at different places. Now it is done cleanly by
ag_window_set_chart().
This commit is contained in:
Gergely Polonkai 2014-09-29 17:32:42 +02:00
parent 0e4406c886
commit 4023bc84c5
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/ag-window.c
View File

@ -85,6 +85,7 @@ struct _AgWindowPrivate {
GList *style_sheets; GList *style_sheets;
AgDisplayTheme *theme; AgDisplayTheme *theme;
GtkListStore *display_theme_model; GtkListStore *display_theme_model;
gulong chart_changed_handler;
}; };
struct cc_search { struct cc_search {
@ -832,22 +833,19 @@ ag_window_recalculate_chart(AgWindow *window, gboolean set_everything)
// TODO: Set timezone according to the city selected! // TODO: Set timezone according to the city selected!
if (priv->chart == NULL) { if (priv->chart == NULL) {
AgChart *chart;
timestamp = gswe_timestamp_new_from_gregorian_full( timestamp = gswe_timestamp_new_from_gregorian_full(
edit_data->year, edit_data->month, edit_data->day, edit_data->year, edit_data->month, edit_data->day,
edit_data->hour, edit_data->minute, edit_data->second, 0, edit_data->hour, edit_data->minute, edit_data->second, 0,
edit_data->timezone edit_data->timezone
); );
priv->chart = ag_chart_new_full( chart = ag_chart_new_full(
timestamp, timestamp,
edit_data->longitude, edit_data->latitude, edit_data->altitude, edit_data->longitude, edit_data->latitude, edit_data->altitude,
house_system house_system
); );
g_signal_connect( ag_window_set_chart(window, chart);
priv->chart,
"changed",
G_CALLBACK(ag_window_chart_changed),
window
);
ag_window_redraw_chart(window); ag_window_redraw_chart(window);
} else { } else {
gswe_moment_set_house_system(GSWE_MOMENT(priv->chart), house_system); gswe_moment_set_house_system(GSWE_MOMENT(priv->chart), house_system);
@ -1928,6 +1926,7 @@ ag_window_list_item_activated_cb(AgIconView *icon_view,
const GtkTreePath *path, const GtkTreePath *path,
AgWindow *window) AgWindow *window)
{ {
AgChart *chart;
GET_PRIV(window); GET_PRIV(window);
AgDb *db = ag_db_get(); AgDb *db = ag_db_get();
GError *err = NULL; GError *err = NULL;
@ -1972,7 +1971,7 @@ ag_window_list_item_activated_cb(AgIconView *icon_view,
g_clear_object(&(priv->chart)); g_clear_object(&(priv->chart));
} }
if ((priv->chart = ag_chart_new_from_db_save( if ((chart = ag_chart_new_from_db_save(
priv->saved_data, priv->saved_data,
FALSE, FALSE,
&err &err
@ -1989,6 +1988,8 @@ ag_window_list_item_activated_cb(AgIconView *icon_view,
return; return;
} }
ag_window_set_chart(window, chart);
ag_window_update_from_chart(window); ag_window_update_from_chart(window);
ag_window_change_tab(window, "chart"); ag_window_change_tab(window, "chart");
@ -2192,7 +2193,7 @@ ag_window_init(AgWindow *window)
NULL NULL
); );
priv->chart = NULL; ag_window_set_chart(window, NULL);
g_action_map_add_action_entries( g_action_map_add_action_entries(
G_ACTION_MAP(window), G_ACTION_MAP(window),
@ -2780,10 +2781,9 @@ ag_window_set_chart(AgWindow *window, AgChart *chart)
GET_PRIV(window); GET_PRIV(window);
if (priv->chart != NULL) { if (priv->chart != NULL) {
g_signal_handlers_disconnect_by_func( g_signal_handler_disconnect(
priv->chart, priv->chart,
ag_window_chart_changed, priv->chart_changed_handler
window
); );
g_clear_object(&(priv->chart)); g_clear_object(&(priv->chart));
} }
@ -2791,7 +2791,9 @@ ag_window_set_chart(AgWindow *window, AgChart *chart)
ag_db_chart_save_unref(priv->saved_data); ag_db_chart_save_unref(priv->saved_data);
priv->chart = chart; priv->chart = chart;
g_signal_connect(
if (chart) {
priv->chart_changed_handler = g_signal_connect(
priv->chart, priv->chart,
"changed", "changed",
G_CALLBACK(ag_window_chart_changed), G_CALLBACK(ag_window_chart_changed),
@ -2799,6 +2801,11 @@ ag_window_set_chart(AgWindow *window, AgChart *chart)
); );
g_object_ref(chart); g_object_ref(chart);
priv->saved_data = ag_chart_get_db_save(chart, -1); priv->saved_data = ag_chart_get_db_save(chart, -1);
} else {
priv->saved_data = NULL;
}
g_object_notify_by_pspec(G_OBJECT(window), properties[PROP_CHART]);
} }
AgChart * AgChart *