From 2db7536d5d7457b4e96e22d1ca340cb8979b303f Mon Sep 17 00:00:00 2001 From: None Date: Mon, 29 Jun 2015 01:38:21 +0200 Subject: [PATCH] Add about-tab. --- data/Makefile.am | 2 +- data/weather-settings.ui | 178 ++++++++++++++++++++++++++ gnome-shell-extension-openweather.cbp | 1 + src/prefs.js | 4 +- 4 files changed, 183 insertions(+), 2 deletions(-) diff --git a/data/Makefile.am b/data/Makefile.am index a8029fe..2d1cfff 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -7,7 +7,7 @@ uuid = openweather-extension@jenslody.de extensiondir = $(topextensiondir)/$(uuid) -dist_extension_DATA = stylesheet.css weather-settings.ui +dist_extension_DATA = OpenWeather.png stylesheet.css weather-settings.ui nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION) diff --git a/data/weather-settings.ui b/data/weather-settings.ui index 5e48ef7..e9b6a82 100644 --- a/data/weather-settings.ui +++ b/data/weather-settings.ui @@ -948,6 +948,184 @@ False + + + False + 24 + 24 + True + True + vertical + 5 + + + True + False + OpenWeather.png + + + False + True + 10 + 0 + + + + + True + False + <b>OPenweather</b> + True + + + False + True + 1 + + + + + True + False + center + + + True + False + end + version: + + + False + True + 0 + + + + + True + False + start + unknown (self-build ?) + + + False + True + 1 + + + + + False + True + 2 + + + + + True + False + <span>Weather extension to display weather information from <a href="https://openweathermap.org/">Openweathermap</a> or <a href="https://forecast.io">forecast.io</a> for almost all locations in the world.</span> + True + center + True + word-char + 1 + + + False + True + 3 + + + + + True + False + center + 5 + + + True + False + Maintained by + + + False + True + 0 + + + + + True + True + Jens Lody (<a href="mailto:openweather@jenslody.de">openweather@jenslody.de</a>) + True + + + False + True + 1 + + + + + False + True + 4 + + + + + Webpage + True + True + True + + center + none + https://github.com/jenslody/gnome-shell-extension-openweather + + + False + True + 5 + + + + + True + True + end + <span size="small">This program comes with ABSOLUTELY NO WARRANTY. +See the <a href="https://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU General Public License, version 2 or later</a> for details.</span> + True + center + True + + + True + True + 6 + + + + + 4 + + + + + True + False + About + + + 4 + False + + diff --git a/gnome-shell-extension-openweather.cbp b/gnome-shell-extension-openweather.cbp index 7ae22cb..83addbb 100644 --- a/gnome-shell-extension-openweather.cbp +++ b/gnome-shell-extension-openweather.cbp @@ -29,6 +29,7 @@ + diff --git a/src/prefs.js b/src/prefs.js index 9e5fdcf..3192df0 100644 --- a/src/prefs.js +++ b/src/prefs.js @@ -250,6 +250,8 @@ const WeatherPrefsWidget = new GObject.Class({ this.configWidgets.push([theObjects[i], name]); } } + if (Me.metadata.version !== undefined) + this.Window.get_object('version').set_label(Me.metadata.version.toString()); }, clearEntry: function() { @@ -831,7 +833,7 @@ const WeatherPrefsWidget = new GObject.Class({ getProviderShort: function() { let provider = arguments[0]; - if ( provider === undefined) + if (provider === undefined) provider = this.extractProvider(this.city[this.actual_city]); switch (provider) {