[f-spot] Small cleanups to Sidebar, drop unused members.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: svn-commits-list gnome org
- Subject: [f-spot] Small cleanups to Sidebar, drop unused members.
- Date: Sun, 28 Jun 2009 23:46:36 +0000 (UTC)
commit 34b9211c3caca90dd2ac4ed06c75984cbb0651a8
Author: Ruben Vermeersch <ruben savanne be>
Date: Mon Jun 29 01:45:38 2009 +0200
Small cleanups to Sidebar, drop unused members.
src/Widgets/Sidebar.cs | 25 ++++++++-----------------
1 files changed, 8 insertions(+), 17 deletions(-)
---
diff --git a/src/Widgets/Sidebar.cs b/src/Widgets/Sidebar.cs
index 2b6a98c..2eafd34 100644
--- a/src/Widgets/Sidebar.cs
+++ b/src/Widgets/Sidebar.cs
@@ -31,38 +31,29 @@ namespace FSpot.Widgets {
// Decides which sidebar page should be shown for each context. Implemented
// using the Strategy pattern, to make it swappable easily, in case the
// default MRUSidebarContextSwitchStrategy is not sufficiently usable.
- public abstract class SidebarContextSwitchStrategy {
- private readonly Sidebar Sidebar;
+ public interface ISidebarContextSwitchStrategy {
+ string PageForContext (ViewContext context);
- public SidebarContextSwitchStrategy (Sidebar sidebar) {
- Sidebar = sidebar;
- }
-
- public abstract string PageForContext (ViewContext context);
-
- public abstract void SwitchedToPage (ViewContext context, string name);
+ void SwitchedToPage (ViewContext context, string name);
}
// Implements a Most Recently Used switching strategy. The last page you used
// for a given context is used.
- public class MRUSidebarContextSwitchStrategy : SidebarContextSwitchStrategy {
+ public class MRUSidebarContextSwitchStrategy : ISidebarContextSwitchStrategy {
public const string PREF_PREFIX = Preferences.APP_FSPOT + "ui/sidebar";
- public MRUSidebarContextSwitchStrategy (Sidebar sidebar) : base (sidebar) {
- }
-
private string PrefKeyForContext (ViewContext context) {
return String.Format ("{0}/{1}", PREF_PREFIX, context);
}
- public override string PageForContext (ViewContext context) {
+ public string PageForContext (ViewContext context) {
string name = Preferences.Get<string> (PrefKeyForContext (context));
if (name == null)
name = DefaultForContext (context);
return name;
}
- public override void SwitchedToPage (ViewContext context, string name) {
+ public void SwitchedToPage (ViewContext context, string name) {
Preferences.Set (PrefKeyForContext (context), name);
}
@@ -168,11 +159,11 @@ namespace FSpot.Widgets {
}
}
- private readonly SidebarContextSwitchStrategy ContextSwitchStrategy;
+ private readonly ISidebarContextSwitchStrategy ContextSwitchStrategy;
public Sidebar () : base ()
{
- ContextSwitchStrategy = new MRUSidebarContextSwitchStrategy (this);
+ ContextSwitchStrategy = new MRUSidebarContextSwitchStrategy ();
ContextChanged += HandleContextChanged;
button_box = new HBox ();
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]