[gnome-calendar/wip/flb/weather-forecast: 50/50] month-cell: Drop temperature labels
- From: Georges Basile Stavracas Neto <gbsneto src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-calendar/wip/flb/weather-forecast: 50/50] month-cell: Drop temperature labels
- Date: Tue, 31 Oct 2017 08:22:01 +0000 (UTC)
commit 04abf9c24053114c592644afac3dbe912443d18d
Author: Florian Brosch <flo brosch gmail com>
Date: Sun Oct 29 21:09:01 2017 +0100
month-cell: Drop temperature labels
data/ui/month-cell.ui | 18 ++----------------
src/views/gcal-month-cell.c | 7 -------
2 files changed, 2 insertions(+), 23 deletions(-)
---
diff --git a/data/ui/month-cell.ui b/data/ui/month-cell.ui
index 44259d7..7152089 100644
--- a/data/ui/month-cell.ui
+++ b/data/ui/month-cell.ui
@@ -52,20 +52,6 @@
</packing>
</child>
<child>
- <object class="GtkLabel" id="temp_label">
- <property name="visible">True</property>
- <property name="can-focus">True</property>
- <style>
- <class name="temp-label" />
- </style>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
- <child>
<object class="GtkLabel" id="overflow_label">
<property name="visible">True</property>
<property name="can-focus">False</property>
@@ -75,7 +61,7 @@
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">2</property>
</packing>
</child>
<child>
@@ -91,7 +77,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">3</property>
</packing>
</child>
</object>
diff --git a/src/views/gcal-month-cell.c b/src/views/gcal-month-cell.c
index 69fd68d..edf8806 100644
--- a/src/views/gcal-month-cell.c
+++ b/src/views/gcal-month-cell.c
@@ -33,7 +33,6 @@ struct _GcalMonthCell
GtkLabel *day_label; /* unowned */
GtkImage *weather_icon; /* unowned */
- GtkLabel *temp_label; /* unowned */
GtkWidget *overflow_button;
GtkWidget *overflow_label;
GtkWidget *overlay;
@@ -425,7 +424,6 @@ gcal_month_cell_class_init (GcalMonthCellClass *klass)
gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, day_label);
gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, weather_icon);
- gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, temp_label);
gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, overflow_button);
gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, overflow_label);
gtk_widget_class_bind_template_child (widget_class, GcalMonthCell, overlay);
@@ -507,18 +505,13 @@ gcal_month_cell_set_weather (GcalMonthCell *self,
if (info == NULL)
{
gtk_image_clear (self->weather_icon);
- gtk_label_set_text (self->temp_label, "");
}
else
{
const gchar* icon_name; /* unowned */
- const gchar* temp_str; /* unwoned */
icon_name = gcal_weather_info_get_icon_name (info);
- temp_str = gcal_weather_info_get_temperature (info);
-
gtk_image_set_from_icon_name (self->weather_icon, icon_name, GTK_ICON_SIZE_SMALL_TOOLBAR);
- gtk_label_set_text (self->temp_label, temp_str);
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]