Author: gburt
Date: Sun Feb 17 22:18:31 2008
New Revision: 3261
URL: http://svn.gnome.org/viewvc/banshee?rev=3261&view=rev

Log:
2008-02-17  Gabriel Burt  <[EMAIL PROTECTED]>

        * 
src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs:
        * src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs:
        * src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs:
        * src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs:
        Add Genre columsn to CoreTracks, and support it as a query field, query
        order, and ListView column.


Modified:
   trunk/banshee/ChangeLog
   
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs
   
trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
   trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
   
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs

Modified: 
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs
==============================================================================
--- 
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs
     (original)
+++ 
trunk/banshee/src/Core/Banshee.Services/Banshee.Collection.Database/LibraryTrackInfo.cs
     Sun Feb 17 22:18:31 2008
@@ -219,6 +219,12 @@
             get { return base.Year; }
             set { base.Year = value; }
         }
+
+        [DatabaseColumn]
+        public override string Genre {
+            get { return base.Genre; }
+            set { base.Genre = value; }
+        }
         
         [DatabaseColumn]
         public override int Rating {

Modified: 
trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
==============================================================================
--- 
trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
 (original)
+++ 
trunk/banshee/src/Core/Banshee.Services/Banshee.Database/BansheeDbFormatMigrator.cs
 Sun Feb 17 22:18:31 2008
@@ -267,6 +267,7 @@
                     DiscNumber          INTEGER,
                     Duration            INTEGER,
                     Year                INTEGER,
+                    Genre               TEXT,
 
                     Rating              INTEGER,
                     PlayCount           INTEGER,
@@ -413,6 +414,7 @@
                         0,
                         Duration * 1000,
                         Year,
+                        Genre,
                         Rating,
                         NumberOfPlays,
                         0,

Modified: trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs
==============================================================================
--- trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs       
(original)
+++ trunk/banshee/src/Core/Banshee.Services/Banshee.Query/BansheeQuery.cs       
Sun Feb 17 22:18:31 2008
@@ -50,6 +50,7 @@
             CreateQueryOrder ("Album",      asc,  Catalog.GetString ("Album")),
             CreateQueryOrder ("Artist",     asc,  Catalog.GetString 
("Artist")),
             CreateQueryOrder ("Title",      asc,  Catalog.GetString ("Title")),
+            CreateQueryOrder ("Genre",      asc,  Catalog.GetString ("Genre")),
             null,
             CreateQueryOrder ("Rating",     desc, Catalog.GetString ("Highest 
Rating")),
             CreateQueryOrder ("Rating",     asc,  Catalog.GetString ("Lowest 
Rating")),
@@ -107,6 +108,12 @@
             "year", "released", "yr"
         );
 
+        public static QueryField GenreField = new QueryField (
+            "genre", Catalog.GetString ("Genre"), "CoreTracks.Genre", false,
+            // Translators: These are unique search fields.  Please, no 
spaces. Blank ok.
+            Catalog.GetString ("genre"), "genre"
+        );
+
         public static QueryField RatingField = new QueryField (
             "rating", Catalog.GetString ("Rating"), "CoreTracks.Rating", 
typeof(RatingQueryValue),
             // Translators: These are unique search fields.  Please, no 
spaces. Blank ok.
@@ -164,7 +171,7 @@
         );
 
         public static QueryField DateAddedField = new QueryField (
-            "added", Catalog.GetString ("Imported Date"), 
"CoreTracks.DateAddedStamp", typeof(DateQueryValue),
+            "added", Catalog.GetString ("Date Added"), 
"CoreTracks.DateAddedStamp", typeof(DateQueryValue),
             // Translators: These are unique search fields.  Please, no 
spaces. Blank ok.
             Catalog.GetString ("added"), Catalog.GetString ("imported"), 
Catalog.GetString ("addedon"), Catalog.GetString ("dateadded"), 
Catalog.GetString ("importedon"),
             "added", "imported", "addedon", "dateadded", "importedon"
@@ -183,7 +190,7 @@
         );
 
         public static QueryFieldSet FieldSet = new QueryFieldSet (
-            ArtistField, AlbumField, DiscField, TitleField, YearField, 
RatingField, PlayCountField,
+            ArtistField, AlbumField, DiscField, TitleField, YearField, 
GenreField, RatingField, PlayCountField,
             SkipCountField, FileSizeField, UriField, DurationField, 
MimeTypeField, LastPlayedField,
             DateAddedField, PlaylistField, SmartPlaylistField
         );
@@ -236,6 +243,7 @@
                     break;
 
                 case "Year":
+                case "Genre":
                 case "Disc":
                 case "Duration":
                 case "Rating":

Modified: 
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
==============================================================================
--- 
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
  (original)
+++ 
trunk/banshee/src/Core/Banshee.ThickClient/Banshee.Collection.Gui/TrackListView.cs
  Sun Feb 17 22:18:31 2008
@@ -57,6 +57,7 @@
                 new SortableColumn (Catalog.GetString ("Duration"), new 
ColumnCellDuration ("Duration", true), 0.15, "Duration"),
                 
                 new SortableColumn (Catalog.GetString ("Year"), new 
ColumnCellText ("Year", true), 0.15, "Year"),
+                new SortableColumn (Catalog.GetString ("Genre"), new 
ColumnCellText ("Genre", true), 0.25, "Genre"),
                 new SortableColumn (Catalog.GetString ("Play Count"), new 
ColumnCellText ("PlayCount", true), 0.15, "PlayCount"),
                 new SortableColumn (Catalog.GetString ("Skip Count"), new 
ColumnCellText ("SkipCount", true), 0.15, "SkipCount"),
                 //new SortableColumn ("Rating", new RatingColumnCell (null, 
true), 0.15, "Rating"),
_______________________________________________
SVN-commits-list mailing list (read only)
http://mail.gnome.org/mailman/listinfo/svn-commits-list

Want to limit the commits to a few modules? Go to above URL, log in to edit 
your options and select the modules ('topics') you want.
Module maintainer? It is possible to set the reply-to to your development 
mailing list. Email [EMAIL PROTECTED] if interested.

Reply via email to