brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dateMenu: Update empty weather label

Browse Source 
Remove subtitle for the empty weather state
to match world clocks button.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/2179
This commit is contained in:
Mariana Picolo 2020-04-05 04:39:02 -03:00
parent 167bc080d9
commit da0c7fc2b6
No known key found for this signature in database
GPG Key ID: C8CC995A304EBE45
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
js/ui/dateMenu.js
View File

@ -281,13 +281,13 @@ class WeatherSection extends St.Button {
this.child = box; this.child = box;
let titleBox = new St.BoxLayout({ style_class: 'weather-header-box' }); let titleBox = new St.BoxLayout({ style_class: 'weather-header-box' });
titleBox.add_child(new St.Label({ this._titleLabel = new St.Label({
style_class: 'weather-header', style_class: 'weather-header',
x_align: Clutter.ActorAlign.START, x_align: Clutter.ActorAlign.START,
x_expand: true, x_expand: true,
y_align: Clutter.ActorAlign.END, y_align: Clutter.ActorAlign.END,
text: _('Weather'), });
})); titleBox.add_child(this._titleLabel);
box.add_child(titleBox); box.add_child(titleBox);
this._titleLocation = new St.Label({ this._titleLocation = new St.Label({
@ -414,10 +414,8 @@ class WeatherSection extends St.Button {
_updateForecasts() { _updateForecasts() {
this._forecastGrid.destroy_all_children(); this._forecastGrid.destroy_all_children();
if (!this._weatherClient.hasLocation) { if (!this._weatherClient.hasLocation)
this._setStatusLabel(_("Select a location…"));
return; return;
}
const { info } = this._weatherClient; const { info } = this._weatherClient;
this._titleLocation.text = this._findBestLocationName(info.location); this._titleLocation.text = this._findBestLocationName(info.location);
@ -444,6 +442,12 @@ class WeatherSection extends St.Button {
if (!this.visible) if (!this.visible)
return; return;
if (this._weatherClient.hasLocation)
this._titleLabel.text = _('Weather');
else
this._titleLabel.text = _('Select weather location…');
this._forecastGrid.visible = this._weatherClient.hasLocation;
this._titleLocation.visible = this._weatherClient.hasLocation; this._titleLocation.visible = this._weatherClient.hasLocation;
this._updateForecasts(); this._updateForecasts();