[gnome-weather/wip/cdavis/diagnostics-cleanup: 3/6] day-entry: Remove alignment
- From: Christopher Davis <christopherdavis src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-weather/wip/cdavis/diagnostics-cleanup: 3/6] day-entry: Remove alignment
- Date: Sat, 24 Oct 2020 03:10:40 +0000 (UTC)
commit 1731a1c3d0d1050cfc38ac4a16bdc80a998c5f6f
Author: Christopher Davis <brainblasted disroot org>
Date: Fri Oct 23 19:33:07 2020 -0700
day-entry: Remove alignment
GtkAlignment is deprecated, and was redundant here.
Related to https://gitlab.gnome.org/GNOME/gnome-weather/-/issues/122
data/day-entry.ui | 394 +++++++++++++++++++++++++++---------------------------
1 file changed, 194 insertions(+), 200 deletions(-)
---
diff --git a/data/day-entry.ui b/data/day-entry.ui
index afb945a..e1a6229 100644
--- a/data/day-entry.ui
+++ b/data/day-entry.ui
@@ -5,26 +5,121 @@
<object class="GtkPopoverMenu" id="more_menu">
<property name="can_focus">False</property>
<child>
- <object class="GtkAlignment">
+ <object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="top_padding">16</property>
- <property name="bottom_padding">16</property>
- <property name="left_padding">16</property>
- <property name="right_padding">16</property>
+ <property name="row_spacing">8</property>
+ <property name="column_spacing">16</property>
+ <property name="row_homogeneous">True</property>
+ <property name="margin_top">16</property>
+ <property name="margin_bottom">16</property>
+ <property name="margin_start">16</property>
+ <property name="margin_end">16</property>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Night</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Morning</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Afternoon</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="halign">end</property>
+ <property name="label" translatable="yes">Evening</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="nightImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">weather-showers-symbolic</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="morningImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">weather-showers-symbolic</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="afternoonImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">weather-showers-symbolic</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">3</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage" id="eveningImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">weather-showers-symbolic</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">4</property>
+ </packing>
+ </child>
<child>
<object class="GtkGrid">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
<property name="row_spacing">8</property>
- <property name="column_spacing">16</property>
<property name="row_homogeneous">True</property>
+ <property name="column_homogeneous">True</property>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="nightTemperatureLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Night</property>
+ <property name="label">16°</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -32,11 +127,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="morningTemperatureLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Morning</property>
+ <property name="label">16°</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -44,11 +138,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="afternoonTemperatureLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Afternoon</property>
+ <property name="label">16°</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -56,11 +149,10 @@
</packing>
</child>
<child>
- <object class="GtkLabel">
+ <object class="GtkLabel" id="eveningTemperatureLabel">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
- <property name="label" translatable="yes">Evening</property>
+ <property name="label">16°</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -68,10 +160,43 @@
</packing>
</child>
<child>
- <object class="GtkImage" id="nightImage">
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">weather-windy</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">weather-windy</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkImage">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="icon_name">weather-windy</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="nightHumidity">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">weather-showers-symbolic</property>
+ <property name="label">2.1 mm</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -79,10 +204,10 @@
</packing>
</child>
<child>
- <object class="GtkImage" id="morningImage">
+ <object class="GtkLabel" id="morningHumidity">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">weather-showers-symbolic</property>
+ <property name="label">2.1 mm</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -90,10 +215,10 @@
</packing>
</child>
<child>
- <object class="GtkImage" id="afternoonImage">
+ <object class="GtkLabel" id="afternoonHumidity">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">weather-showers-symbolic</property>
+ <property name="label">2.1 mm</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -101,10 +226,10 @@
</packing>
</child>
<child>
- <object class="GtkImage" id="eveningImage">
+ <object class="GtkLabel" id="eveningHumidity">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="icon_name">weather-showers-symbolic</property>
+ <property name="label">2.1 mm</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -112,192 +237,61 @@
</packing>
</child>
<child>
- <object class="GtkGrid">
+ <object class="GtkLabel" id="nightWind">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="vexpand">True</property>
- <property name="row_spacing">8</property>
- <property name="row_homogeneous">True</property>
- <property name="column_homogeneous">True</property>
- <child>
- <object class="GtkLabel" id="nightTemperatureLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">16°</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="morningTemperatureLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">16°</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="afternoonTemperatureLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">16°</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="eveningTemperatureLabel">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">16°</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">weather-windy</property>
- </object>
- <packing>
- <property name="left_attach">0</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">weather-windy</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkImage">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="icon_name">weather-windy</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">0</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="nightHumidity">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">2.1 mm</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="morningHumidity">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">2.1 mm</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="afternoonHumidity">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">2.1 mm</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="eveningHumidity">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">2.1 mm</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="nightWind">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">5 m/s</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="morningWind">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">5 m/s</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">2</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="afternoonWind">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">5 m/s</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">3</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="eveningWind">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label">5 m/s</property>
- </object>
- <packing>
- <property name="left_attach">2</property>
- <property name="top_attach">4</property>
- </packing>
- </child>
+ <property name="label">5 m/s</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="top_attach">0</property>
- <property name="height">5</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="morningWind">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">5 m/s</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">2</property>
</packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="afternoonWind">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">5 m/s</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">3</property>
+ </packing>
</child>
<child>
- <placeholder/>
+ <object class="GtkLabel" id="eveningWind">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label">5 m/s</property>
+ </object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">4</property>
+ </packing>
</child>
</object>
+ <packing>
+ <property name="left_attach">2</property>
+ <property name="top_attach">0</property>
+ <property name="height">5</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
+ <child>
+ <placeholder/>
</child>
</object>
<packing>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]