From 6b8bceda5f2270ebe38b5d6bf923f61710f794de Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Tue, 2 Sep 2014 10:09:32 +0200 Subject: [PATCH 1/2] Add point table to the UI definition --- src/resources/ui/ag-window.ui | 125 +++++++++++++++++++++++++++++++++- 1 file changed, 122 insertions(+), 3 deletions(-) diff --git a/src/resources/ui/ag-window.ui b/src/resources/ui/ag-window.ui index 3b4d5b7..dfedb9a 100644 --- a/src/resources/ui/ag-window.ui +++ b/src/resources/ui/ag-window.ui @@ -820,11 +820,130 @@ - + True - none - + + True + False + 0 + in + + + True + False + True + 5 + True + 5 + + + True + False + Fire + + + 0 + 1 + + + + + True + False + Earth + + + 0 + 2 + + + + + True + False + Air + + + 0 + 3 + + + + + True + False + Water + + + 0 + 4 + + + + + True + False + Points + + + 0 + 5 + + + + + True + False + Cardinal + + + 1 + 0 + + + + + True + False + Fixed + + + 2 + 0 + + + + + True + False + Mutable + + + 3 + 0 + + + + + True + False + Points + + + 4 + 0 + + + + + + + True + False + Elements and Qualities + + From d80df8ab6e4690b61766eedb76cdea1298028e25 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Tue, 2 Sep 2014 16:24:37 +0200 Subject: [PATCH 2/2] Fill up points table --- src/ag-window.c | 81 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 81 insertions(+) diff --git a/src/ag-window.c b/src/ag-window.c index 67f227a..d4df720 100644 --- a/src/ag-window.c +++ b/src/ag-window.c @@ -48,6 +48,7 @@ struct _AgWindowPrivate { GtkWidget *aspect_table; GtkWidget *chart_web_view; + GtkWidget *points_eq; GtkAdjustment *year_adjust; AgSettings *settings; @@ -402,6 +403,79 @@ ag_window_redraw_aspect_table(AgWindow *window) gtk_widget_show_all(priv->aspect_table); } +static void +ag_window_set_element_point(AgWindow *window, + GsweElement element, + guint left, + guint top) +{ + guint points; + GtkWidget *label; + gchar *points_string; + AgWindowPrivate *priv = ag_window_get_instance_private(window); + + points = gswe_moment_get_element_points( + GSWE_MOMENT(priv->chart), + element + ); + + if ((label = gtk_grid_get_child_at( + GTK_GRID(priv->points_eq), + left, top + )) == NULL) { + label = gtk_label_new(""); + gtk_grid_attach(GTK_GRID(priv->points_eq), label, left, top, 1, 1); + gtk_widget_show(label); + } + + points_string = g_strdup_printf("%d", points); + gtk_label_set_text(GTK_LABEL(label), points_string); + g_free(points_string); +} + +static void +ag_window_set_quality_point(AgWindow *window, + GsweQuality quality, + guint left, + guint top) +{ + guint points; + GtkWidget *label; + gchar *points_string; + AgWindowPrivate *priv = ag_window_get_instance_private(window); + + points = gswe_moment_get_quality_points( + GSWE_MOMENT(priv->chart), + quality + ); + + if ((label = gtk_grid_get_child_at( + GTK_GRID(priv->points_eq), + left, top + )) == NULL) { + label = gtk_label_new(""); + gtk_grid_attach(GTK_GRID(priv->points_eq), label, left, top, 1, 1); + gtk_widget_show(label); + } + + points_string = g_strdup_printf("%d", points); + gtk_label_set_text(GTK_LABEL(label), points_string); + g_free(points_string); +} + +static void +ag_window_redraw_points_table(AgWindow *window) +{ + ag_window_set_element_point(window, GSWE_ELEMENT_FIRE, 4, 1); + ag_window_set_element_point(window, GSWE_ELEMENT_EARTH, 4, 2); + ag_window_set_element_point(window, GSWE_ELEMENT_AIR, 4, 3); + ag_window_set_element_point(window, GSWE_ELEMENT_WATER, 4, 4); + + ag_window_set_quality_point(window, GSWE_QUALITY_CARDINAL, 1, 5); + ag_window_set_quality_point(window, GSWE_QUALITY_FIX, 2, 5); + ag_window_set_quality_point(window, GSWE_QUALITY_MUTABLE, 3, 5); +} + /** * ag_window_redraw_chart: * @window: the #AgWindow to operate on @@ -441,6 +515,7 @@ ag_window_redraw_chart(AgWindow *window) } ag_window_redraw_aspect_table(window); + ag_window_redraw_points_table(window); } static gboolean @@ -1387,6 +1462,7 @@ ag_window_display_changed(GSettings *settings, gchar *key, AgWindow *window) } ag_window_redraw_aspect_table(window); + ag_window_redraw_points_table(window); } static void @@ -1991,6 +2067,11 @@ ag_window_class_init(AgWindowClass *klass) AgWindow, selection_toolbar ); + gtk_widget_class_bind_template_child_private( + widget_class, + AgWindow, + points_eq + ); gtk_widget_class_bind_template_callback( widget_class,