simon04 · alexxtasi · Aug 9, 2012 · Aug 9, 2012 · Aug 12, 2012 · Aug 21, 2012
diff --git a/.gitignore b/.gitignore
@@ -5,9 +5,12 @@ configure
 config.log
 config.status
 aclocal.m4
+ChangeLog
+INSTALL
 autom4te.cache/
 po/POTFILES
 po/stamp-it
+data/weather-settings.desktop
 staging/
 
 *~

diff --git a/AUTHORS b/AUTHORS
@@ -0,0 +1,8 @@
+Elad Alfassa <[email protected]>,
+Mark Benjamin <[email protected]>,
+Simon Claessens <[email protected]>,
+Ecyrbe <[email protected]>,
+Timur Kristóf <[email protected]>,
+Simon Legner <[email protected]>,
+Mattia Meneguzzo <[email protected]>,
+Christian Metzler <[email protected]>
diff --git a/Makefile.am b/Makefile.am
@@ -1,4 +1,49 @@
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
-SUBDIRS = src po
+SUBDIRS = src data po
 
+uuid = "[email protected]"
+
+localprefix = $(HOME)/.local/share/gnome-shell/extensions
+
+zip-file: all
+	rm -fR $(builddir)/_build
+	rm -fR $(builddir)/zip-file
+	$(MKDIR_P) $(builddir)/_build; \
+	$(MKDIR_P) $(builddir)/zip-file; \
+	$(MAKE) install DESTDIR="$(abs_builddir)/_build"; \
+	cp -r "$(builddir)/_build$(datadir)/gnome-shell/extensions/$(uuid)" "$(builddir)/_build"; \
+	if [ -f "$(builddir)/_build$(datadir)/glib-2.0/schemas/org.gnome.shell.extensions.weather.gschema.xml" ]; then \
+		$(MKDIR_P) "$(builddir)/_build/$(uuid)/schemas"; \
+		mv "$(builddir)/_build$(datadir)/glib-2.0/schemas/org.gnome.shell.extensions.weather.gschema.xml" "$(builddir)/_build/$(uuid)/schemas"; \
+		glib-compile-schemas "$(builddir)/_build/$(uuid)/schemas"; \
+	fi; \
+	cp -r "$(builddir)/_build$(datadir)/locale" "$(builddir)/_build/$(uuid)"; \
+	(cd "$(builddir)/_build/$(uuid)/"; \
+	 zip -qr "$(abs_builddir)/zip-file/weather.shell-extension.zip" .; \
+	); \
+	rm -fR $(builddir)/_build
+
+local-install: zip-file
+	zip_file="$(abs_builddir)/zip-file/weather.shell-extension.zip"; \
+	if [ -d "$(localprefix)/$(uuid)" ]; then \
+	rm -fR "$(localprefix)/$(uuid)"; \
+	fi; \
+	$(MKDIR_P) $(localprefix)/$(uuid); \
+	(cd $(localprefix)/$(uuid); \
+	unzip -q $${zip_file}; \
+	);
+
+dist-hook: dist-changelog
+
+.PHONY: dist-changelog
+
+dist-changelog:
+	$(AM_V_at)if git --git-dir=$(top_srcdir)/.git --work-tree=$(top_srcdir) \
+		log --no-merges --pretty='tformat:%cd  %an  <%ae>%n%n%s%n%n%b'  --date=short 2b58327bf183c94c788a13d746373efc22a3f3c1.. | \
+	 $(SED)	-e '/^[12]...-[01].-[0123].  [^<>]*  <[^<>]*>$$/,/^$$/ b' \
+		-e '/[^	 ]/,/^[	 ]*$$/ !d' \
+		-e 's/^[	 ]*/	/' \
+		-e 's/^[	 ]*$$//' >.ChangeLog.tmp; \
+	then mv -f .ChangeLog.tmp "$(top_distdir)/ChangeLog"; \
+	else rm -f .ChangeLog.tmp; exit 1; fi
diff --git a/NEWS b/NEWS
diff --git a/README.md b/README.md
@@ -1,130 +1,117 @@
-## gnome-shell-extension-weather
+# Weather Extension
 
-gnome-shell-extension-weather is a simple extension for displaying weather notifications in GNOME Shell.
+![Screenshot](https://f.cloud.github.com/assets/1255506/833069/0f754966-f28b-11e2-9fb3-3ea413919c69.png)
 
-Currently, the weather report including forecast for today and tomorrow is fetched from [Yahoo! Weather](http://weather.yahoo.com/).
+[![Gitter chat](https://badges.gitter.im/Neroth/gnome-shell-extension-weather.png)](https://gitter.im/Neroth/gnome-shell-extension-weather)
 
-----
-
-### Screenshots
-
-![Screenshot](https://github.com/simon04/gnome-shell-extension-weather/raw/master/data/screenshot.png)
-
-----
-
-### Installation
+*gnome-shell-extension-weather* is a simple extension for displaying weather conditions and forecasts in GNOME Shell, featuring support for multiple locations, no need for WOEID, a symmetrical layout and a settings panel through *gnome-shell-extension-prefs*.
 
-* [Arch Linux](https://aur.archlinux.org/packages.php?ID=49409)
-* [Frugalware](http://www.frugalware.org/packages/119339)
-* [Ubuntu](https://launchpad.net/~webupd8team/+archive/gnome3/+packages)
-* Generic: For a generic installation, run the following commands:
-  `./autogen.sh --prefix=/usr && make && sudo make install`
-  * Make sure you have the `libglib2.0-dev` package (or equivalent for your distribution)
-    installed, or else you'll get an error about `GLIB_GSETTINGS`.
-* *Please report further links!*
+The weather report include forecasts for ~ 10 days.
 
-That's it!
+Support GNOME Shell >= 3.8
 
-### Versions
+Contact the author : [Neroth (Christian METZLER)](https://plus.google.com/u/0/106579473281691119257).
 
-Due to incompatible changes between GNOME 3.0 and 3.2, separate versions of this extension are provided:
-
-* For GNOME Shell 3.2, use the `master` branch.
-* For GNOME Shell 3.0, use the `gnome3.0` branch.
+We need translator ! [Translate the extension](https://github.com/Neroth/gnome-shell-extension-weather/wiki/Translate).
 
 ----
 
-### Configuration
-
-gnome-shell-extension-weather uses gsettings to save your configuration. You can use `dconf-editor` or `gsettings` from the command line to modify some parameters.
+# Installation
 
-#### Location
+## Through extensions.gnome.org (Local installation)
 
-At the moment, only WOEIDs consisting of 4 uppercase letters followed by 4 digits are supported. Determine your WOEID using [edg3.co.uk](http://edg3.co.uk/snippets/weather-location-codes/) or [xoap.weather.com](http://xoap.weather.com/search/search?where=Innsbruck).
+Go on the [Weather extension page](https://extensions.gnome.org/extension/613/weather/) on extensions.gnome.org, click on the switch ("OFF" => "ON"), click on the install button.
+That's it !
 
-You can specify your location using the following command. Perhaps you need quotation marks as in the second command.
+## Through a package manager
 
-    gsettings set org.gnome.shell.extensions.weather woeid your_woeid
-    gsettings set org.gnome.shell.extensions.weather woeid "'your_woeid'"
+After the installation, restart GNOME Shell (`Alt`+`F2`, `r`, `Enter`) and enable the extension through *gnome-tweak-tool*.
 
-#### Temperature Units (optional, celsius by default)
+### [Ubuntu, Mint, and derivatives](https://launchpad.net/~gnome-shell-extensions/+archive/ppa/+packages)
 
-You can modify the temperature unit using one of the following commands:
+Add the PPA *ppa:gnome-shell-extensions* to your source list, update the package list and install *gnome-shell-extension-weather*:
 
-    gsettings set org.gnome.shell.extensions.weather unit celsius
-    gsettings set org.gnome.shell.extensions.weather unit fahrenheit
+	sudo add-apt-repository ppa:gnome-shell-extensions
+	sudo apt-get update
+	sudo apt-get install gnome-shell-extension-weather
 
-#### Displayed Location (optional)
+### [Fedora](http://rpmfusion.org/)
 
-Sometimes your WOEID location isn't quite right (it's the next major city around). To customise the displayed city you can type:
+Packages for Fedora are available in the [RPM Fusion](http://rpmfusion.org/) repositories. If these are not enabled on your system, please install them through the following command:
 
-    gsettings set org.gnome.shell.extensions.weather city your_city
+	sudo dnf install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm
+Then, install *gnome-shell-extension-weather*:
 
-#### Translate Weather Conditions (optional, true by default)
+	sudo dnf install gnome-shell-extension-weather
 
-You may want to configure whether to translate the weather condition. If enabled, the condition is translated based on the weather code. If disabled, the condition string from Yahoo is taken. Note: Enabling the translation sometimes results in loss of accuracy, e.g., the condition string "PM Thunderstorms" cannot be expressed in terms of weather codes.
+### [Arch Linux](https://aur.archlinux.org/packages/gnome-shell-extension-weather-git/)
 
-    gsettings set org.gnome.shell.extensions.weather translate-condition true
-    gsettings set org.gnome.shell.extensions.weather translate-condition false
+Download the package from AUR, make and install it:
 
-#### Use Symbolic Icons (optional, false by default)
+	wget https://aur.archlinux.org/packages/gn/gnome-shell-extension-weather-git/gnome-shell-extension-weather-git.tar.gz
+	tar xvzf gnome-shell-extension-weather-git.tar.gz
+	cd gnome-shell-extension-weather-git && makepkg -si
+
+## Generic (Local installation)
 
-If desired, you can enable the usage of symbolic icons to display the weather condition (instead of full-colored icons).
+Make sure you have the following dependencies installed:
+* *gettext*,
+* *pkg-config*,
+* *git*,
+* *glib2*,
+* *glib2-devel* or *libglib2.0-dev*,
+* *zip*,
+* *gnome-common*,
+* *autoconf*,
+* *automake*,
+* *intltool*,
+* *gir1.2-gweather-3.0*.
 
-    gsettings set org.gnome.shell.extensions.weather use-symbolic-icons false
-    gsettings set org.gnome.shell.extensions.weather use-symbolic-icons true
+Run the following commands:
 
-#### Show Text in Panel (optional, true by default)
+	cd ~ && git clone git://github.com/Neroth/gnome-shell-extension-weather.git
+	cd ~/gnome-shell-extension-weather
+	./autogen.sh && make local-install
+
+Restart GNOME Shell (`Alt`+`F2`, `r`, `Enter`) and enable the extension through *gnome-tweak-tool*.
 
-You can configure whether to show the weather condition text (aka. comment) together with the temperature in the panel (requires restart). If only weather condition text is undesired, consider show-comment-in-panel option.
-
-    gsettings set org.gnome.shell.extensions.weather show-text-in-panel true
-    gsettings set org.gnome.shell.extensions.weather show-text-in-panel false
-
-#### Show Comment in Panel (optional, false by default)
-
-Configures whether to show the comment (aka. weather condition text, e.g. "Windy", "Clear") in the panel. Note that the temperature is still shown (if undesired, consider show-text-in-panel option).
-
-    gsettings set org.gnome.shell.extensions.weather show-comment-in-panel false
-    gsettings set org.gnome.shell.extensions.weather show-comment-in-panel true
-
-#### Position in Panel (optional, center by default)
+----
 
-The position of this GNOME Shell extension in the panel can be configured to either 'left', 'center' or 'right' (requires restart of GNOME Shell).
+# Configuration
 
-    gsettings set org.gnome.shell.extensions.weather position-in-panel center
-    gsettings set org.gnome.shell.extensions.weather position-in-panel left
-    gsettings set org.gnome.shell.extensions.weather position-in-panel right
+Launch *gnome-shell-extension-prefs* (reachable also through the *Weather Settings* button on the extension popup) and select *Weather* from the drop-down menu to edit the configuration.
 
-#### Refresh Interval (optional, 240 by default)
+![Screenshot](https://github.com/neroth/gnome-shell-extension-weather/raw/master/data/weather-settings.gif)
 
-The interval to refresh the weather information may be set arbitrarily and is specified in seconds.
+You can also use *dconf-editor* or *gsettings* to configure the extension through the command line.
 
-    gsettings set org.gnome.shell.extensions.weather refresh-interval 240
+----
 
-#### Restart GNOME Shell
+# Debug
 
-Don't forget to restart GNOME Shell:
+To debug the extension, active the switch `Debug extension` in the settings:
 
-1. Restart GNOME Shell (`[Alt]+[F2]`, `r`)
-2. Fork this project as you like
+You have now two new file ("weather-extension.log" and "weather-extension-prefs.log") in your user cache dir (~/.cache/).
 
 ----
 
-### Licence
+# Licence
 
-Copyright (C) 2011
-Ecyrbe <[email protected]>,
-Timur Kristóf <[email protected]>,
-Elad Alfassa <[email protected]>,
-Simon Legner <[email protected]>,
-Simon Claessens <[email protected]>
+Copyright (C) 2011 - 2014
 
-This file is part of gnome-shell-extension-weather.
+* Christian Metzler <[email protected]>,
+* Elad Alfassa <[email protected]>,
+* Mark Benjamin <[email protected]>,
+* Simon Claessens <[email protected]>,
+* Ecyrbe <[email protected]>,
+* Timur Kristóf <[email protected]>,
+* Simon Legner <[email protected]>,
+* Mattia Meneguzzo <[email protected]>.
 
-gnome-shell-extension-weather is free software: you can redistribute it and/or modify it under the terms of the **GNU General Public License as published by the Free Software Foundation, either version 3** of the License, or (at your option) any later version.
+This file is part of *gnome-shell-extension-weather*.
 
-gnome-shell-extension-weather is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+*gnome-shell-extension-weather* is free software: you can redistribute it and/or modify it under the terms of the **GNU General Public License as published by the Free Software Foundation, either version 3** of the License, or (at your option) any later version.
 
-You should have received a copy of the GNU General Public License along with gnome-shell-extension-weather.  If not, see <http://www.gnu.org/licenses/>.
+*gnome-shell-extension-weather* is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 
+You should have received a copy of the GNU General Public License along with *gnome-shell-extension-weather*.  If not, see <http://www.gnu.org/licenses/>.
diff --git a/autogen.sh b/autogen.sh
@@ -6,6 +6,8 @@ test -z "$srcdir" && srcdir=.
 
 PKG_NAME="gnome-shell-extension-weather"
 
+touch ChangeLog
+
 test -f $srcdir/configure.ac || {
     echo -n "**Error**: Directory "\`$srcdir\'" does not look like the"
     echo " top-level gnome-shell-extensions directory"

diff --git a/configure.ac b/configure.ac
@@ -1,14 +1,16 @@
 AC_PREREQ(2.63)
 dnl be carefull, the version needs to be in sync with your gnome shell version
-AC_INIT([gnome-shell-extension-weather],[1.0],[https://github.com/ecyrbe/gnome-shell-extension-weather/issues])
+AC_INIT([gnome-shell-extension-weather],[2.0],[https://github.com/Neroth/gnome-shell-extension-weather/issues])
 
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
 
-AM_INIT_AUTOMAKE([1.10 dist-bzip2 no-dist-gzip foreign tar-ustar])
+AM_INIT_AUTOMAKE([1.10 dist-xz no-dist-gzip foreign tar-ustar])
 
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
+AC_PROG_SED
+
 GETTEXT_PACKAGE=gnome-shell-extension-weather
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",
@@ -19,10 +21,53 @@ PKG_PROG_PKG_CONFIG([0.22])
 
 GLIB_GSETTINGS
 
-dnl Please keep this sorted alphabetically
+AC_ARG_WITH(desktop-dir, [  --with-desktop-dir=PATH where to install desktop files (default=PREFIX/share)])
+
+if test "x$with_desktop_dir" != x; then
+  DESKTOP_DATADIR=$with_desktop_dir
+else
+  DESKTOP_DATADIR="$datadir"
+fi
+
+AM_CONDITIONAL(DESKTOP_DATADIR, test "x$with_desktop_dir" != xno)
+AC_SUBST(DESKTOP_DATADIR)
+
+AC_ARG_WITH([local-install],
+	     [AS_HELP_STRING([--with-local-install],
+			     [install schemas and translations in a subdir of the extension (default is no)])],
+	     [use_local_install=$withval],
+	     [use_local_install=no])
+
+AC_SUBST(use_local_install)
+AM_CONDITIONAL(LOCAL_INSTALL, test "x${use_local_install}" == "xyes")
+
+extensiontopdir=${datadir}/gnome-shell/extensions/[email protected]
+
+dnl This is beyond ugly. Suggestions accepted.
+if test "x${use_local_install}" == "xyes"; then
+   AC_SUBST(gsettingsschemadir, [${extensiontopdir}/schemas])
+   AC_SUBST(LOCALEDIR, [${extensiontopdir}/locale])
+else
+   AC_SUBST(LOCALEDIR, [${datadir}/locale])
+fi
+
+dnl Please keep this sorted alphabetically.
 AC_CONFIG_FILES([
   Makefile
+  data/Makefile
   po/Makefile.in
   src/Makefile
 ])
 AC_OUTPUT
+
+dnl 'Fugly hack' doesn't get close to describe this. I don't know how else
+dnl to change the directory for translations.
+if test "x${use_local_install}" == "xyes"; then
+   ${SED} -i -e "s%itlocaledir = .*%itlocaledir = ${extensiontopdir}/locale%g" po/Makefile
+fi
+
+if test "x$use_local_install" == "xyes"; then
+   echo
+   echo "The schemas and translations will be installed in subdirectories of the extension."
+   echo
+fi
diff --git a/data/Makefile.am b/data/Makefile.am
@@ -0,0 +1,30 @@
+extensionurl = https://github.com/Neroth/gnome-shell-extension-weather
+
+# Change these to modify how installation is performed
+topextensiondir = $(datadir)/gnome-shell/extensions
+
+uuid = [email protected]
+
+extensiondir = $(topextensiondir)/$(uuid)
+
+dist_extension_DATA = stylesheet.css weather-settings.ui
+
+nodist_extension_DATA = metadata.json $(EXTRA_EXTENSION)
+
+EXTRA_DIST = metadata.json.in
+
+metadata.json: metadata.json.in $(top_builddir)/config.status
+	$(AM_V_GEN) sed -e "s|[@]LOCALEDIR@|$(datadir)/locale|" \
+	    -e "s|[@]uuid@|$(uuid)|" \
+	    -e "s|[@]url@|$(extensionurl)|" $< > $@
+
+CLEANFILES = metadata.json
+
+gschemas_in = org.gnome.shell.extensions.weather.gschema.xml.in
+
+@INTLTOOL_XML_NOMERGE_RULE@
+
+gsettings_SCHEMAS = $(gschemas_in:.xml.in=.xml) @GSETTINGS_RULES@
+
+EXTRA_DIST += $(gschemas_in)
+CLEANFILES += $(gschemas_in:.xml.in=.valid) $(gsettings_SCHEMAS)
diff --git a/data/Screenshot.jpg b/data/Screenshot.jpg
diff --git a/data/metadata.json.in b/data/metadata.json.in
@@ -0,0 +1,8 @@
+{
+"uuid": "@uuid@",
+"name": "Weather",
+"description": "A simple extension for displaying weather information from several cities in GNOME Shell",
+"shell-version": [ "3.8", "3.10", "3.12", "3.14", "3.16", "3.18", "3.20" ],
+"localedir": "@LOCALEDIR@",
+"url": "@url@"
+}