Merge branch 'release/version-30'

.gitignore

@@ -6,3 +6,4 @@
 /[email protected]
 *.pyc
 *.pyo
+*.gresource

Makefile

@@ -1,12 +1,16 @@
 UUID = [email protected]
+VERSION = 29
 
 ifeq ($(strip $(DESTDIR)),)
 	INSTALLBASE = $(HOME)/.local/share/gnome-shell/extensions
 else
 	INSTALLBASE = $(DESTDIR)/usr/share/gnome-shell/extensions
 endif
 
-all: compile-schemas
+all: compile-resources compile-schemas
+
+compile-resources:
+	glib-compile-resources --sourcedir=./$(UUID)/resources ./$(UUID)/resources/org.gnome.Shell.Extensions.DeskChanger.gresource.xml
 
 compile-schemas:
 	glib-compile-schemas ./$(UUID)/schemas/
@@ -17,7 +21,7 @@ install: update-translation
 	echo done
 
 pot:
-	xgettext --package-name=DeskChanger --package-version=28 -k --keyword=_ -o ./po/desk-changer.pot -D ./$(UUID)/ extension.js prefs.js daemon/interface.js daemon/profile.js daemon/server.js daemon/timer.js ui/control.js ui/panelMenu.js ui/popupMenu.js
+	xgettext --package-name=DeskChanger --package-version=$(VERSION) -k --keyword=_ -o ./po/desk-changer.pot -D ./$(UUID)/ _deskchanger.js convenience.js extension.js prefs.js service.js common/utils.js daemon/interface.js daemon/profile.js daemon/server.js daemon/timer.js ui/control.js ui/panelMenu.js ui/popupMenu.js
 
 update-translation: all
 	cd po; \

README.md

@@ -1,75 +1,81 @@
-# desk-changer
+# DeskChanger
 
-Gnome-Shell wallpaper slideshow extension with multiple profile support. The extension allows you to switch profiles
-on the fly without reloading the daemon.
+DeskChanger is a gnome-shell wallpaper slideshow extension with multiple
+profile support. The extension allows you to switch profiles on the fly
+without reloading the daemon.
 
 ## Screenshots
 
-<img src="./screenshot-1.png?raw=true" width="256" title="Screenshot of menu"> <img src="./screenshot-2.png?raw=true" width="256" title="Screenshot of notification">
+<img src="./screenshot-1.png?raw=true" width="256" title="Screenshot of menu">
+<img src="./screenshot-2.png?raw=true" width="256" title="Screenshot of notification">
 
 ## Requirements
 
-* gnome-shell 3.8 or higher
+The requirements are for the most recent version of the plugin. Previous
+versions support older versions of gnome-shell.
 
-## Install
-
-Just simply copy the desk-changer&commat;eric.gach.gmail.com folder to your `~/.local/share/gnome-shell/extensions/`
-folder or the system `/usr/share/gnome-shell/extensions/` folder.
-
->$ cp -r [email protected]/ ~/.local/share/gnome-shell/extensions/
-
-or
-
->\# cp -r [email protected]/ /usr/share/gnome-shell/extensions/
+* gnome-shell 3.30 or higher
+* gjs 1.54 or higher
 
-Then restart gnome-shell and enable the extension. Once it is enabled, you can use the extension to start the daemon
-with the built in toggle switch.
+## Install
 
-## Install develop branch (gnome 3.38)
+First clone the repo and run the following install instructions.
 
 ```
 git clone -b develop [email protected]:BigE/desk-changer.git
 cd desk-changer
 make all
-make install
 ```
 
+Once the make process is complete, you can then run `make install` to install
+the extension to your local directory. If you want to install it to the
+system, just copy the desk-changer&commat;eric.gach.gmail.com folder to your
+`/usr/share/gnome-shell/extensions/` folder.
+
+>\# cp -r [email protected]/ /usr/share/gnome-shell/extensions/
+
+Then restart gnome-shell and enable the extension. Once it is enabled, you can
+use the extension to start the daemon with the built in toggle switch.
+
 ## General Information
 ### Daemon
 
-The daemon is now part of the extension itself and has no command line interface. The only interface available to the
-daemon now is the DBus interface
+The daemon is now part of the extension itself and has no command line
+interface. The only interface available to the daemon now is the DBus
+interface.
 
 #### DBUS Interface
 **Name**: org.gnome.Shell.Extensions.DeskChanger.Daemon
 
 **Path**: /org/gnome/Shell/Extensions/DeskChanger/Daemon
 
 ##### Methods
-* LoadProfile(String profile) - Loads the specified profile
+* Load(String profile) - Loads the specified profile
 * Next() - Moves to the next wallpaper, returns the uri
 * Prev() - Moves to the previous wallpaper, returns the uri
+* Quit() - Terminates the daemon process
 * Start() - Starts the daemon
 * Stop() - Stops the daemon
 
 ##### Properties
-* history - Read only array of history
-* queue - Read only array of the queue
-* lockscreen - writable boolean value if the lockscreen is active
+* History - Read only array of history
+* Preview - Read only URI of the next wallpaper
+* Queue - Read only array of the queue
+* Running - Read only boolean value if the daemon is stopped or started
 
 ##### Signals
-* changed - Emitted when the wallpaper is changed, uri to wallpaper file
-* error - _Not implemented_
-* preview - Emitted when a new preview is available, uri to preview file
+* Changed - Emitted when the wallpaper is changed, uri to wallpaper file
+* Preview - Emitted when a new preview is available, uri to preview file
+* Running - Emitted when the daemon is stopped and started
 
 
 ### dconf-editor
 
-To view the settings in dconf-editor, just use the `GSETTINGS_SCHEMA_DIR=` environment variable to open dconf-editor
-with the extensions schema available to the editor.
+To view the settings in dconf-editor, just use the `GSETTINGS_SCHEMA_DIR=`
+environment variable to open dconf-editor with the extensions schema available
+to the editor.
 
 >$ GSETTINGS_SCHEMA_DIR=~/.local/share/gnome-shell/extensions/desk-[email protected]/schemas/ dconf-editor`
 
-Then navigate to `org.gnome.shell.extensions.desk-changer` and you will see all of the available settings for the
-extension and daemon.
-
+Then navigate to `org.gnome.shell.extensions.desk-changer` and you will see
+all of the available settings for the extension and daemon.