Merge lp:~simon-d-bull/cappella/cappella10_about_dialog into lp:cappella

[Simon Bull]

- Modified the about dialog, so that the version name and codename are dynamic.

[Andrew Hayzen (ahayzen)]

review: Approve

=== modified file 'cappella/data/default/config.js'
--- cappella/data/default/config.js	2013-04-20 21:21:08 +0000
+++ cappella/data/default/config.js	2013-04-29 19:15:35 +0000
@@ -23,10 +23,10 @@
 	"/statics/lock": "*CAPPELLA_ROOT*/lock",
 	"/statics/program_name": "Cappella",
 	"/statics/version_number": "*CAPPELLA_VERSION*",
-	"/statics/version_name": "Development Model",
+	"/statics/version_name": "*CAPPELLA_CODENAME*",
 	"/statics/logo": "*CAPPELLA_DATA_PATH*/cappella.png",
 	"/statics/album_art_colour": "*CAPPELLA_DATA_PATH*/album_art_colour.jpg",
 	"/statics/album_art_grey": "*CAPPELLA_DATA_PATH*/album_art_grey.jpg",
 	"/statics/glade": "*CAPPELLA_DATA_PATH*/glade",
 	"/statics/root": "*CAPPELLA_ROOT*"
-}
\ No newline at end of file
+}

=== modified file 'cappella/data/glade/about_dialog.ui'
--- cappella/data/glade/about_dialog.ui	2013-04-04 18:13:06 +0000
+++ cappella/data/glade/about_dialog.ui	2013-04-29 19:15:35 +0000
@@ -7,7 +7,7 @@
     <property name="title" translatable="yes">About Cappella Media Player</property>
     <property name="type_hint">dialog</property>
     <property name="program_name">Cappella Media Player</property>
-    <property name="version">0.1 Development Model</property>
+    <property name="version">{CAPPELLA_VERSION} - {CAPPELLA_CODENAME}</property>
     <property name="copyright" translatable="yes">Copyright © 2011-2013 Andrew Hayzen &amp; Simon Bull</property>
     <property name="comments" translatable="yes">A simple media player based on PyGObject for Ubuntu</property>
     <property name="website">http://cappella.hayzentech.co.uk</property>

=== modified file 'cappella/gui/widget/about_dialog.py'
--- cappella/gui/widget/about_dialog.py	2013-04-02 22:48:35 +0000
+++ cappella/gui/widget/about_dialog.py	2013-04-29 19:15:35 +0000
@@ -23,7 +23,7 @@
 
 # Import Gtk, GObject etc
 from gi.repository import Gtk, Gdk, GdkPixbuf
-
+from os import getenv
 from ...config.cappella import settings
 
 
@@ -40,7 +40,15 @@
                                         "about_dialog.ui"]))
 
         about = builder.get_object("about_dialog")
-
+        
+        # Set version
+        version = about.get_version()
+        
+        for i in ["CAPPELLA_VERSION", "CAPPELLA_CODENAME"]:
+            version = version.replace("{%s}" % i, getenv(i))
+        
+        about.set_version(version)
+            
         # Set logo
         logo = GdkPixbuf.Pixbuf.new_from_file(settings["/statics/logo"])
         about.set_logo(logo)

=== modified file 'runner/cappella'
--- runner/cappella	2013-04-02 22:48:35 +0000
+++ runner/cappella	2013-04-29 19:15:35 +0000
@@ -4,6 +4,7 @@
 os.environ["CAPPELLA_PATH"] = "/usr/lib/python3/dist-packages/cappella"
 os.environ["CAPPELLA_DATA_PATH"] = "/usr/share/cappella"
 os.environ["CAPPELLA_VERSION"] = "1.0"
+os.environ["CAPPELLA_CODENAME"] = "Antecedent Accordion"
 
 import cappella
 

=== modified file 'standalone.sh'
--- standalone.sh	2013-04-03 17:20:57 +0000
+++ standalone.sh	2013-04-29 19:15:35 +0000
@@ -3,6 +3,7 @@
 export CAPPELLA_PATH="$PWD/cappella"
 export CAPPELLA_DATA_PATH="$PWD/cappella/data"
 export CAPPELLA_VERSION="1.0"
+export CAPPELLA_CODENAME="Antecedent Accordion"
 export PYTHONPATH="$PWD"
 
 for p in "$@";