[recipes] Don't show unset prep/cook time
- From: Matthias Clasen <matthiasc src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [recipes] Don't show unset prep/cook time
- Date: Mon, 20 Feb 2017 02:16:42 +0000 (UTC)
commit 18b4b09a808e4b2847ba54ef4adf4ef5ac09751a
Author: Matthias Clasen <mclasen redhat com>
Date: Sun Feb 19 21:13:58 2017 -0500
Don't show unset prep/cook time
Showing empty fields for these does not really add anything,
so hide them if they are not set.
src/gr-details-page.c | 26 ++++++++++++++++++++------
src/gr-details-page.ui | 4 ++--
2 files changed, 22 insertions(+), 8 deletions(-)
---
diff --git a/src/gr-details-page.c b/src/gr-details-page.c
index de35cc8..1fcad25 100644
--- a/src/gr-details-page.c
+++ b/src/gr-details-page.c
@@ -55,7 +55,9 @@ struct _GrDetailsPage
GrRecipeExporter *exporter;
GtkWidget *recipe_image;
+ GtkWidget *prep_time_desc;
GtkWidget *prep_time_label;
+ GtkWidget *cook_time_desc;
GtkWidget *cook_time_label;
GtkWidget *serves_spin;
GtkWidget *warning_box;
@@ -383,7 +385,9 @@ gr_details_page_class_init (GrDetailsPageClass *klass)
gtk_widget_class_set_template_from_resource (widget_class, "/org/gnome/Recipes/gr-details-page.ui");
gtk_widget_class_bind_template_child (widget_class, GrDetailsPage, recipe_image);
+ gtk_widget_class_bind_template_child (widget_class, GrDetailsPage, prep_time_desc);
gtk_widget_class_bind_template_child (widget_class, GrDetailsPage, prep_time_label);
+ gtk_widget_class_bind_template_child (widget_class, GrDetailsPage, cook_time_desc);
gtk_widget_class_bind_template_child (widget_class, GrDetailsPage, cook_time_label);
gtk_widget_class_bind_template_child (widget_class, GrDetailsPage, serves_spin);
gtk_widget_class_bind_template_child (widget_class, GrDetailsPage, warning_box);
@@ -633,15 +637,25 @@ gr_details_page_set_recipe (GrDetailsPage *page,
populate_ingredients (page, want_serves, serves);
- if (prep_time[0] == '\0')
- gtk_label_set_label (GTK_LABEL (page->prep_time_label), "");
- else
+ if (prep_time[0] == '\0') {
+ gtk_widget_hide (page->prep_time_label);
+ gtk_widget_hide (page->prep_time_desc);
+ }
+ else {
+ gtk_widget_show (page->prep_time_label);
+ gtk_widget_show (page->prep_time_desc);
gtk_label_set_label (GTK_LABEL (page->prep_time_label), _(prep_time));
+ }
- if (cook_time[0] == '\0')
- gtk_label_set_label (GTK_LABEL (page->cook_time_label), "");
- else
+ if (cook_time[0] == '\0') {
+ gtk_widget_hide (page->cook_time_label);
+ gtk_widget_hide (page->cook_time_desc);
+ }
+ else {
+ gtk_widget_show (page->cook_time_label);
+ gtk_widget_show (page->cook_time_desc);
gtk_label_set_label (GTK_LABEL (page->cook_time_label), _(cook_time));
+ }
processed = process_instructions (instructions);
gtk_label_set_label (GTK_LABEL (page->instructions_label), processed);
gtk_label_set_track_visited_links (GTK_LABEL (page->instructions_label), FALSE);
diff --git a/src/gr-details-page.ui b/src/gr-details-page.ui
index 8132f3f..811a802 100644
--- a/src/gr-details-page.ui
+++ b/src/gr-details-page.ui
@@ -194,7 +194,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="prep_time_desc">
<property name="visible">1</property>
<property name="label" translatable="yes">Preparation Time</property>
<property name="xalign">1</property>
@@ -224,7 +224,7 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="cook_time_desc">
<property name="visible">1</property>
<property name="label" translatable="yes">Cooking Time</property>
<property name="xalign">1</property>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]