[f-spot: 21/40] drop ProgressType
- From: Stephane Delcroix <sdelcroix src gnome org>
- To: svn-commits-list gnome org
- Subject: [f-spot: 21/40] drop ProgressType
- Date: Wed, 24 Jun 2009 09:49:28 +0000 (UTC)
commit 170c751753e158a24e69211b1da17af222fdd9b3
Author: Stephane Delcroix <stephane delcroix org>
Date: Mon Jun 22 10:43:24 2009 +0200
drop ProgressType
as we're always loading with ProgressType.Full, drop it
src/PhotoImageView.cs | 46 ++++++++++++----------------------------------
1 files changed, 12 insertions(+), 34 deletions(-)
---
diff --git a/src/PhotoImageView.cs b/src/PhotoImageView.cs
index 65dac7d..3e0118d 100644
--- a/src/PhotoImageView.cs
+++ b/src/PhotoImageView.cs
@@ -17,12 +17,6 @@ using FSpot.Utils;
using Gdk;
namespace FSpot.Widgets {
- public enum ProgressType {
- None,
- Async,
- Full
- }
-
public class PhotoImageView : ImageView {
#region public API
public PhotoImageView (IBrowsableCollection query) : this (new BrowsablePointer (query, -1))
@@ -288,8 +282,6 @@ namespace FSpot.Widgets {
protected BrowsablePointer item;
protected FSpot.Loupe loupe;
protected FSpot.Loupe sharpener;
- ProgressType load_async = ProgressType.Full;
- bool progressive_display;
GdkGlx.Context Glx;
void HandleOrientationChanged (object sender, EventArgs e)
@@ -297,8 +289,9 @@ namespace FSpot.Widgets {
Reload ();
}
+ bool progressive_display;
bool ShowProgress {
- get { return load_async == ProgressType.Full && progressive_display; }
+ get { return progressive_display; }
}
void LoadErrorImage (System.Exception e)
@@ -335,36 +328,21 @@ namespace FSpot.Widgets {
this.Item.Current.DefaultVersionUri == args.PreviousItem.DefaultVersionUri)
return;
+ // Same image, don't load it progressively
if (args != null &&
args.PreviousItem != null &&
Item.IsValid &&
- Item.Current.DefaultVersionUri == args.PreviousItem.DefaultVersionUri &&
- load_async == ProgressType.Full)
+ Item.Current.DefaultVersionUri == args.PreviousItem.DefaultVersionUri)
progressive_display = false;
- if (load_async != ProgressType.None) {
- Gdk.Pixbuf old = this.Pixbuf;
- try {
- if (Item.IsValid) {
- System.Uri uri = Item.Current.DefaultVersionUri;
- Load (uri);
- } else
- LoadErrorImage (null);
-
- } catch (System.Exception e) {
- System.Console.WriteLine (e.ToString ());
- LoadErrorImage (e);
- }
- if (old != null)
- old.Dispose ();
- } else {
- Gdk.Pixbuf old = this.Pixbuf;
- this.Pixbuf = FSpot.PhotoLoader.Load (item.Collection,
- item.Index);
- if (old != null)
- old.Dispose ();
-
- this.ZoomFit ();
+ try {
+ if (Item.IsValid)
+ Load (Item.Current.DefaultVersionUri);
+ else
+ LoadErrorImage (null);
+ } catch (System.Exception e) {
+ Log.DebugException (e);
+ LoadErrorImage (e);
}
Selection = Gdk.Rectangle.Zero;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]