[banshee] [Fixup] Remove some unused properties
- From: Gabriel Burt <gburt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [banshee] [Fixup] Remove some unused properties
- Date: Sat, 17 Jul 2010 21:35:56 +0000 (UTC)
commit f7da561a840964b750c3c247e3875dc6cb83a454
Author: Gabriel Burt <gabriel burt gmail com>
Date: Sat Jul 17 14:35:25 2010 -0700
[Fixup] Remove some unused properties
.../Banshee.Fixup/AlbumDuplicateSolver.cs | 7 ++-----
.../Banshee.Fixup/ArtistDuplicateSolver.cs | 7 ++-----
.../Banshee.Fixup/Banshee.Fixup/FixSource.cs | 2 +-
.../Banshee.Fixup/Banshee.Fixup/Solver.cs | 10 ++--------
src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs | 2 +-
5 files changed, 8 insertions(+), 20 deletions(-)
---
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs b/src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs
index 92d25c1..814c8a9 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/AlbumDuplicateSolver.cs
@@ -44,11 +44,7 @@ namespace Banshee.Fixup
{
Id = "dupe-album";
Name = Catalog.GetString ("Duplicate Albums");
- ShortDescription = Catalog.GetString ("");
- LongDescription = Catalog.GetString ("Displayed are albums that should likely be merged. For each row, click the desired title to make it bold, or uncheck it to take no action.");
- Action = Catalog.GetString ("");
- OptionsTitle = Catalog.GetString ("Duplicate Albums");
- Order = 10;
+ Description = Catalog.GetString ("Displayed are albums that should likely be merged. For each row, click the desired title to make it bold, or uncheck it to take no action.");
AddFinder (
"Title", "AlbumID", "CoreAlbums, CoreArtists",
@@ -62,6 +58,7 @@ namespace Banshee.Fixup
public override void Dispose ()
{
+ base.Dispose ();
BinaryFunction.Remove (Id);
}
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs b/src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs
index ca5925e..b852707 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/ArtistDuplicateSolver.cs
@@ -44,11 +44,7 @@ namespace Banshee.Fixup
{
Id = "dupe-artist";
Name = Catalog.GetString ("Duplicate Artists");
- ShortDescription = Catalog.GetString ("");
- LongDescription = Catalog.GetString ("Displayed are artists that should likely be merged. For each row, click the desired name to make it bold, or uncheck it to take no action.");
- Action = Catalog.GetString ("");
- OptionsTitle = Catalog.GetString ("Duplicate Artists");
- Order = 5;
+ Description = Catalog.GetString ("Displayed are artists that should likely be merged. For each row, click the desired name to make it bold, or uncheck it to take no action.");
AddFinder (
"Name", "ArtistID", "CoreArtists",
@@ -65,6 +61,7 @@ namespace Banshee.Fixup
public override void Dispose ()
{
+ base.Dispose ();
BinaryFunction.Remove (Id);
}
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs b/src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs
index e9be1e1..8b0e8f6 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/FixSource.cs
@@ -59,7 +59,7 @@ namespace Banshee.Fixup
}
combo.Changed += (o, a) => {
problem_model.Solver = combo.ActiveValue;
- SetStatus (problem_model.Solver.LongDescription, false, false, "gtk-info");
+ SetStatus (problem_model.Solver.Description, false, false, "gtk-info");
};
combo.Active = 0;
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs b/src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs
index 92f307e..81b5682 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/Solver.cs
@@ -47,7 +47,6 @@ namespace Banshee.Fixup
public Solver ()
{
- Order = 100;
}
public string Id {
@@ -62,12 +61,8 @@ namespace Banshee.Fixup
}
}
- public string Action { get; set; }
public string Name { get; set; }
- public string ShortDescription { get; set; }
- public string LongDescription { get; set; }
- public string OptionsTitle { get; set; }
- public int Order { get; set; }
+ public string Description { get; set; }
public int Generation { get; private set; }
public void FindProblems ()
@@ -139,7 +134,7 @@ namespace Banshee.Fixup
WHERE {6}
GROUP BY {7} HAVING num > 1
ORDER BY {3}",
- Id, Order, "?", // ? is for the Generation variable, which changes
+ Id, 1, "?", // ? is for the Generation variable, which changes
value_column, id_column, from, condition ?? "1=1", group_by))
);
}
@@ -170,7 +165,6 @@ namespace Banshee.Fixup
ShortDescription = Catalog.GetString ("Find albums that should be marked as compilation albums");
LongDescription = Catalog.GetString ("Find albums that should be marked as compilation albums but are not");
Action = Catalog.GetString ("Mark as compilation");
- Order = 20;
find_cmd = new HyenaSqliteCommand (String.Format (@"
INSERT INTO MetadataProblems (ProblemType, TypeOrder, Generation, SolutionValue, Options, Summary, Count)
diff --git a/src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs b/src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs
index 2a9ebec..d079aeb 100644
--- a/src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs
+++ b/src/Extensions/Banshee.Fixup/Banshee.Fixup/View.cs
@@ -78,7 +78,7 @@ namespace Banshee.Fixup
var summary = new ColumnCellSolutionOptions ();
var summary_col = new Column ("", summary, 1.0);
ColumnController.Add (summary_col);
- model.Reloaded += (o, a) => summary_col.Title = model.Solver.OptionsTitle;
+ model.Reloaded += (o, a) => summary_col.Title = model.Solver.Name;
RowOpaquePropertyName = "Selected";
RulesHint = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]