GNOME.org
 

banshee r3440 - in trunk/banshee: . src src/Core/Banshee.Core/Banshee.Base src/Core/Banshee.Core/Resources src/Core/Banshee.Services/Banshee.ServiceStack src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs

Author: abock
Date: Thu Mar 13 04:44:49 2008
New Revision: 3440
URL: http://svn.gnome.org/viewvc/banshee?rev=3440&view=rev

Log:
2008-03-13  Aaron Bockover  <abock gnome org>

    * configure.ac:
    * src/AssemblyInfo.cs.in:
    * src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs:
    Expose a display version in assembly metadata and API

    * src/Core/Banshee.Core/Banshee.Base/ProductInformation.cs: Fix small bug

    * src/Core/Banshee.Core/Resources/contributors.xml: Updated

    * src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs:
    Some minor fixes and cosmetic polish; the link works again



Modified:
   trunk/banshee/ChangeLog
   trunk/banshee/configure.ac
   trunk/banshee/src/AssemblyInfo.cs.in
   trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ProductInformation.cs
   trunk/banshee/src/Core/Banshee.Core/Resources/contributors.xml
   trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
   trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs

Modified: trunk/banshee/configure.ac
==============================================================================
--- trunk/banshee/configure.ac	(original)
+++ trunk/banshee/configure.ac	Thu Mar 13 04:44:49 2008
@@ -3,6 +3,7 @@
 # 0.98.* = Alpha *
 # 0.99.* = Beta *
 AC_INIT([banshee-1], [0.98.1]) 
+ASM_DISPLAY_VERSION="1.0 Alpha 1"
 
 AC_CANONICAL_SYSTEM
 AC_PREREQ(2.13)
@@ -14,6 +15,7 @@
 
 ASM_VERSION="$VERSION.*"
 AC_SUBST(ASM_VERSION)
+AC_SUBST(ASM_DISPLAY_VERSION)
 
 dnl Pieces needed by autogen; can't be parsed from macros
 AM_CONFIG_HEADER(config.h)

Modified: trunk/banshee/src/AssemblyInfo.cs.in
==============================================================================
--- trunk/banshee/src/AssemblyInfo.cs.in	(original)
+++ trunk/banshee/src/AssemblyInfo.cs.in	Thu Mar 13 04:44:49 2008
@@ -1,9 +1,25 @@
+using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 
-[assembly: AssemblyVersion("@ASM_VERSION@")]
+[assembly: AssemblyVersion ("@ASM_VERSION@")]
+[assembly: AssemblyDisplayVersion ("@ASM_DISPLAY_VERSION@")]
 [assembly: AssemblyTitle ("Banshee")]
-[assembly: AssemblyDescription ("Banshee Music Player")]
-[assembly: AssemblyCopyright ("Copyright (C) Novell, Aaron Bockover")]
-[assembly: AssemblyCompany ("Novell, Inc")]
+[assembly: AssemblyDescription ("Banshee Media Player")]
+[assembly: AssemblyCopyright ("Copyright (C) 2005-2008 Novell, 2005 Aaron Bockover")]
+[assembly: AssemblyCompany ("Novell, Inc.")]
+
+[AttributeUsage (AttributeTargets.Assembly, Inherited = false)]
+internal sealed class AssemblyDisplayVersionAttribute : Attribute
+{
+    private string version;
+    public string Version {
+        get { return version; }
+    }
+
+    public AssemblyDisplayVersionAttribute (string version)
+    {
+        this.version = version;
+    }
+}
 

Modified: trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ProductInformation.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ProductInformation.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Banshee.Base/ProductInformation.cs	Thu Mar 13 04:44:49 2008
@@ -42,11 +42,11 @@
         
         static ProductInformation ()
         {
-            try {
+        //    try {
                 LoadContributors ();
                 LoadTranslators ();
-            } catch {
-            }
+       //     } catch {
+     //       }
         }
         
         private static void LoadContributors ()
@@ -58,7 +58,7 @@
             doc.LoadXml (Resource.GetFileContents ("contributors.xml"));
         
             foreach (XmlNode node in doc.DocumentElement.ChildNodes) {
-                if (node.FirstChild.Value == null) {
+                if (node.FirstChild == null || node.FirstChild.Value == null) {
                     continue;
                 }
 

Modified: trunk/banshee/src/Core/Banshee.Core/Resources/contributors.xml
==============================================================================
--- trunk/banshee/src/Core/Banshee.Core/Resources/contributors.xml	(original)
+++ trunk/banshee/src/Core/Banshee.Core/Resources/contributors.xml	Thu Mar 13 04:44:49 2008
@@ -1,28 +1,53 @@
 <people>
-  <author role="Lead Developer">Aaron Bockover</author>
-  <author role="iPod, DAAP">James Willcox</author>
-  <author role="Maniac Patcher">Ruben Vermeersch</author>
-  <author role="Recommendations">Fredrik Hedberg</author>
-  <author role="UMS DAP, Smart Playlists">Gabriel Burt</author>
-  <author role="MTP DAP">Patrick van Staveren</author>
-  <author role="Audioscrobbler">Chris Toshok</author>
-  <author role="Podcasting">Mike Urbanski</author>
-  <author role="Managed D-Bus">Alp Toker</author>
+  <author role="Maintainer">Aaron Bockover</author>
+  <author role="Maintainer">Gabriel Burt</author>
+  <author role="Developer">Scott Peterson</author>
+  <contributor>Alan McGovern</contributor>
+  <contributor>Alexander Hixon</contributor>
+  <contributor>Alexandros Frantzis</contributor>
+  <contributor>Alp Toker</contributor>
+  <contributor>Aydemir UlaÅ Åahin</contributor>
+  <contributor>Ben Maurer</contributor>
+  <contributor>Bertrand Lorentz</contributor>
+  <contributor>Bill Dawson</contributor>
+  <contributor>Bob Copeland</contributor> 
+  <contributor>Bojan Rajkovic</contributor>
+  <contributor>Brian Nickel</contributor>
+  <contributor>Chris Lahey</contributor>
+  <contributor>Christian Krause</contributor>
+  <contributor>Christopher James Halse Rogers</contributor>
+  <contributor>Chris Toshok</contributor>
+  <contributor>Chris Turchin</contributor>
+  <contributor>Daniel Munkton</contributor>
+  <contributor>Dan Wilson</contributor>
   <contributor>Dan Winship</contributor>
+  <contributor>Eric Butler</contributor>
+  <contributor>Fredrik Hedberg</contributor>
   <contributor>Hans Petter Jansson</contributor>
-  <contributor>Chris Lahey</contributor>
-  <contributor>Ben Maurer</contributor>
+  <contributor>Igor Guerrero Fonseca</contributor>
+  <contributor>Ilya Konstantinov</contributor>
+  <contributor>Ivan N. Zlatev</contributor>
+  <contributor>James Willcox</contributor>
+  <contributor>Jan Arne Petersen</contributor>
+  <contributor>Jason Conti</contributor>
+  <contributor>Jeff Tickle</contributor>
+  <contributor>Jorge Castro</contributor>
+  <contributor>Juri Pakaste</contributor>
   <contributor>Larry Ewing</contributor>
+  <contributor>Lauri Kotilainen</contributor>
+  <contributor>Michael Monreal</contributor>
   <contributor>Miguel de Icaza</contributor>
+  <contributor>Mike Urbanski</contributor>
+  <contributor>Nathan Palmer</contributor>
   <contributor>Oscar Forero</contributor>
+  <contributor>Patrick van Staveren</contributor> 
+  <contributor>Pepijn van de Geer</contributor>
+  <contributor>Ruben Vermeersch</contributor>
   <contributor>Sebastian DrÃge</contributor>
-  <contributor>Aydemir UlaÅ Åahin</contributor>
-  <contributor>Jeff Tickle</contributor>
-  <contributor>Ivan N. Zlatev</contributor>
-  <contributor>Christopher James Halse Rogers</contributor>
-  <contributor>Scott Peterson</contributor>
-  <contributor>Bob Copeland</contributor>
-  <contributor>Alexander Hixon</contributor>
+  <contributor>Tim Yamin</contributor>
+  <contributor>Trey Ethridge</contributor>
+  <contributor>Will Farrington</contributor>
+  <!-- Artists have their own markup because of the GtkAboutBox design -->
   <artist>Garrett LeSage</artist>
   <artist>Jakub Steiner</artist>
   <artist>Ryan Collier</artist>

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs	(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.ServiceStack/Application.cs	Thu Mar 13 04:44:49 2008
@@ -185,5 +185,25 @@
                 return version;
             }
         }
+        
+        private static string display_version;
+        public static string DisplayVersion {
+            get { 
+                if (display_version != null) {
+                    return display_version;
+                }
+                
+                foreach (Attribute attribute in Assembly.GetEntryAssembly ().GetCustomAttributes (false)) {
+                    Type type = attribute.GetType ();
+                    PropertyInfo property = type.GetProperty ("Version");
+                    if (type.Name == "AssemblyDisplayVersionAttribute" && property != null && 
+                        property.PropertyType == typeof (string)) {
+                        display_version = (string)property.GetValue (attribute, null); 
+                    }
+                }
+                
+                return display_version;
+            }
+        }
     }
 }

Modified: trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	(original)
+++ trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Gui.Dialogs/AboutDialog.cs	Thu Mar 13 04:44:49 2008
@@ -45,19 +45,21 @@
             // build authors page
             List<string> authors = new List<string> ();            
             authors.Add (Catalog.GetString ("Primary Development"));
+            authors.Add (String.Empty);
             
             foreach (ProductAuthor author in ProductInformation.Authors) {
                 authors.Add (String.Format("    {0} ({1})", author.Name, author.Role));
             }
             
-            authors.Add ("");
+            authors.Add (String.Empty);
             authors.Add (Catalog.GetString("Contributors"));
+            authors.Add (String.Empty);
             
             foreach (string author in ProductInformation.Contributors) {
                 authors.Add (String.Format("    {0}", author));
             }
             
-            authors.Add ("");
+            authors.Add (String.Empty);
             
             // build translators page
             StringBuilder translation_credits = new StringBuilder ();
@@ -70,14 +72,18 @@
                 translation_credits.Append ("\n");
             }
             
-            //Logo = Branding.AboutBoxLogo;
-            //Name = Branding.ApplicationName;
+            SetUrlHook (delegate (Gtk.AboutDialog dialog, string link) {
+                Banshee.Web.Browser.Open (link);
+            });
+            
             Name = "Banshee";
             Logo = Gdk.Pixbuf.LoadFromResource ("banshee-logo.png");
-            Version = Banshee.ServiceStack.Application.Version;
-            Comments = Catalog.GetString ("Music Management and Playback for GNOME.");
+            Version = String.Format ("{0} ({1})", 
+                Banshee.ServiceStack.Application.DisplayVersion, 
+                Banshee.ServiceStack.Application.Version);
+            Comments = Catalog.GetString ("Extraordinary Multimedia Management and Playback");
             Copyright = Catalog.GetString (
-                "Copyright \u00a9 2005-2007 Novell, Inc.\n" + 
+                "Copyright \u00a9 2005-2008 Novell, Inc.\n" + 
                 "Copyright \u00a9 2005 Aaron Bockover"
             );
             
@@ -90,10 +96,6 @@
             
             License = ProductInformation.License;
             WrapLicense = true;
-            
-            //SetUrlHook(delegate(Gtk.AboutDialog dialog, string link) {
-            //    Banshee.Web.Browser.Open(link);
-            //});
         }
     }
 }
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]