[recipes/mini-timer: 1/6] cooking view: Set a name on each timer



commit 64419f5cdc71d3e12c8de2aeee263c3f5f91b044
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Feb 22 21:18:15 2017 -0500

    cooking view: Set a name on each timer
    
    This will be used in the future to display timers

 src/gr-cooking-view.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/src/gr-cooking-view.c b/src/gr-cooking-view.c
index 64f07e5..75e8e93 100644
--- a/src/gr-cooking-view.c
+++ b/src/gr-cooking-view.c
@@ -64,8 +64,9 @@ step_data_free (gpointer data)
 static void step_timer_complete (GrTimer *timer, StepData *step);
 
 static StepData *
-step_data_new (const char *heading,
-               const char *string,
+step_data_new (int         num,
+               int         n_steps,
+               const char *label,
                guint64     duration,
                int         image,
                gpointer    view)
@@ -74,11 +75,14 @@ step_data_new (const char *heading,
 
         d = g_new (StepData, 1);
         d->view = view;
-        d->heading = g_strdup (heading);
-        d->label = g_strdup (string);
+        d->heading = g_strdup_printf (_("Step %d/%d"), num, n_steps);
+        d->label = g_strdup (label);
         if (duration > 0) {
+                g_autofree char *name = NULL;
+
+                name = g_strdup_printf (_("Step %d"), num);
                 d->timer = g_object_new (GR_TYPE_TIMER,
-                                         "name", "Step",
+                                         "name", name,
                                          "duration", duration,
                                          "active", FALSE,
                                          NULL);
@@ -435,13 +439,11 @@ setup_steps (GrCookingView *view)
         g_ptr_array_set_size (view->steps, 0);
         for (i = 0; i < steps->len; i++) {
                 GrRecipeStep *step;
-                g_autofree char *title = NULL;
 
                 step = g_ptr_array_index (steps, i);
-                title = g_strdup_printf (_("Step %d/%d"), i + 1, steps->len);
 
                 g_ptr_array_add (view->steps,
-                                 step_data_new (title, step->text, step->timer, step->image, view));
+                                 step_data_new (i + 1, steps->len, step->text, step->timer, step->image, 
view));
         }
 }
 


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]