[gnome-weather/gnome-3-36: 1/2] Revert "Add window information to the weather widget"



commit 479c36bc3e936b581fd2c665a83a7a382b081ad4
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Mon Apr 6 10:02:50 2020 -0500

    Revert "Add window information to the weather widget"
    
    This reverts commit 963afcd8b825690b02e326f35622fe0193adeb14.
    
    This never got any testing as there hasn't been a release since it was
    committed. It will be a 3.38 feature.
    
    See also: #39

 data/application.css   |  6 +-----
 data/weather-widget.ui | 36 +-----------------------------------
 src/app/city.js        |  3 +--
 3 files changed, 3 insertions(+), 42 deletions(-)
---
diff --git a/data/application.css b/data/application.css
index 32979d3..6bf139b 100644
--- a/data/application.css
+++ b/data/application.css
@@ -80,10 +80,6 @@
 
 #conditions-label {
     font-size: 2.5em;
-}
-
-#wind-label {
-    font-size: 1.5em;
     padding-bottom: 12px; /* keep in sync with conditions-image */
 }
 
@@ -110,4 +106,4 @@
 
 #locations-list-box {
     border: 1px solid @borders;
-}
+}
\ No newline at end of file
diff --git a/data/weather-widget.ui b/data/weather-widget.ui
index 6e6940a..88b6598 100644
--- a/data/weather-widget.ui
+++ b/data/weather-widget.ui
@@ -51,7 +51,7 @@
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
                         <property name="width">1</property>
-                        <property name="height">3</property>
+                        <property name="height">2</property>
                       </packing>
                     </child>
                     <child>
@@ -85,40 +85,6 @@
                         <property name="height">1</property>
                       </packing>
                     </child>
-                    <child>
-                      <object class="GtkBox" id="windBox">
-                        <property name="name">wind-box</property>
-                        <property name="visible">True</property>
-                        <property name="orientation">horizontal</property>
-                        <property name="halign">start</property>
-                        <property name="valign">start</property>
-                        <property name="spacing">12</property>
-                        <child>
-                          <object class="GtkImage" id="windIcon">
-                            <property name="name">wind-icon</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="icon-name">weather-windy-symbolic</property>
-                          </object>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="windLabel">
-                            <property name="name">wind-label</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">False</property>
-                            <property name="vexpand">True</property>
-                            <property name="halign">start</property>
-                          </object>
-                        </child>
-                      </object>
-                      <packing>
-                        <property name="left_attach">1</property>
-                        <property name="top_attach">2</property>
-                        <property name="width">1</property>
-                        <property name="height">1</property>
-                      </packing>
-                    </child>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
diff --git a/src/app/city.js b/src/app/city.js
index 86726ee..e0f51b6 100644
--- a/src/app/city.js
+++ b/src/app/city.js
@@ -33,7 +33,7 @@ const SCROLLING_ANIMATION_TIME = 400000; //us
 var WeatherWidget = GObject.registerClass({
     Template: 'resource:///org/gnome/Weather/weather-widget.ui',
     InternalChildren: ['contentFrame', 'outerGrid', 'conditionsImage',
-                       'temperatureLabel', 'conditionsLabel', 'windLabel',
+                       'temperatureLabel', 'conditionsLabel',
                        'timeLabel', 'timeGrid', 'forecastStack',
                        'leftButton', 'rightButton',
                        'forecast-today-grid', 'forecast-tomorrow-grid',
@@ -175,7 +175,6 @@ var WeatherWidget = GObject.registerClass({
 
         this._conditionsLabel.label = Util.getWeatherConditions(info);
         this._temperatureLabel.label = info.get_temp_summary();
-        this._windLabel.label = info.get_wind();
 
         this._conditionsImage.icon_name = info.get_symbolic_icon_name();
         let context = this._contentFrame.get_style_context();


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