f-spot r4101 - in trunk: . src src/Editors src/Editors/Old
- From: rubenv svn gnome org
- To: svn-commits-list gnome org
- Subject: f-spot r4101 - in trunk: . src src/Editors src/Editors/Old
- Date: Wed, 25 Jun 2008 21:47:53 +0000 (UTC)
Author: rubenv
Date: Wed Jun 25 21:47:53 2008
New Revision: 4101
URL: http://svn.gnome.org/viewvc/f-spot?rev=4101&view=rev
Log:
2008-06-25 Ruben Vermeersch <ruben savanne be>
Move old files out of the way, as I'm going to add a lot of new files
here.
* src/Editors/OldEditor.cs: Replaced with src/Editors/Old/OldEditor.cs.
* src/Editors/SoftFocus.cs: Replaced with src/Editors/Old/SoftFocus.cs.
* src/Editors/Tilt.cs: Replaced with src/Editors/Old/Tilt.cs.
* src/Makefile.am: Update build.
Added:
trunk/src/Editors/Old/
trunk/src/Editors/Old/OldEditor.cs
- copied, changed from r4100, /trunk/src/Editors/OldEditor.cs
trunk/src/Editors/Old/SoftFocus.cs
- copied, changed from r4100, /trunk/src/Editors/SoftFocus.cs
trunk/src/Editors/Old/Tilt.cs
- copied, changed from r4100, /trunk/src/Editors/Tilt.cs
Removed:
trunk/src/Editors/OldEditor.cs
trunk/src/Editors/SoftFocus.cs
trunk/src/Editors/Tilt.cs
Modified:
trunk/ChangeLog
trunk/src/Makefile.am
Copied: trunk/src/Editors/Old/OldEditor.cs (from r4100, /trunk/src/Editors/OldEditor.cs)
==============================================================================
Copied: trunk/src/Editors/Old/SoftFocus.cs (from r4100, /trunk/src/Editors/SoftFocus.cs)
==============================================================================
--- /trunk/src/Editors/SoftFocus.cs (original)
+++ trunk/src/Editors/Old/SoftFocus.cs Wed Jun 25 21:47:53 2008
@@ -18,10 +18,10 @@
using FSpot.Utils;
namespace FSpot.Editors {
public class SoftFocus : EffectEditor {
- Widgets.SoftFocus soft;
+ Widgets.SoftFocus soft;
Scale scale;
bool double_buffer;
-
+
protected override string GetTitle ()
{
return Catalog.GetString ("Soft Focus");
@@ -34,7 +34,7 @@
protected override void SetView (PhotoImageView value)
{
base.SetView (value);
-
+
if (value == null)
return;
@@ -62,7 +62,7 @@
actions.PackStart (apply);
box.PackStart (actions);
- return box;
+ return box;
}
private void HandleCancel (object sender, EventArgs args)
@@ -74,7 +74,7 @@
{
BrowsablePointer item = view.Item;
EditTarget target = new EditTarget (item);
- try {
+ try {
using (ImageFile img = ImageFile.Create (item.Current.DefaultVersionUri)) {
Cairo.Format format = view.CompletePixbuf ().HasAlpha ? Cairo.Format.Argb32 : Cairo.Format.Rgb24;
@@ -91,7 +91,7 @@
using (Gdk.Pixbuf output = MemorySurface.CreatePixbuf (dest)) {
using (System.IO.Stream stream = System.IO.File.OpenWrite (tmp)) {
img.Save (output, stream);
-
+
}
}
@@ -105,8 +105,8 @@
Gnome.Vfs.Xfer.XferUri (new Gnome.Vfs.Uri (UriUtils.PathToFileUri (tmp).ToString ()),
new Gnome.Vfs.Uri (target.Uri.ToString ()),
Gnome.Vfs.XferOptions.Default,
- Gnome.Vfs.XferErrorMode.Abort,
- Gnome.Vfs.XferOverwriteMode.Replace,
+ Gnome.Vfs.XferErrorMode.Abort,
+ Gnome.Vfs.XferOverwriteMode.Replace,
delegate {
System.Console.Write (".");
return 1;
Copied: trunk/src/Editors/Old/Tilt.cs (from r4100, /trunk/src/Editors/Tilt.cs)
==============================================================================
Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Wed Jun 25 21:47:53 2008
@@ -88,9 +88,9 @@
$(srcdir)/DependentListStore.cs \
$(srcdir)/DirectoryAdaptor.cs \
$(srcdir)/DirectoryCollection.cs \
- $(srcdir)/Editors/OldEditor.cs \
- $(srcdir)/Editors/SoftFocus.cs \
- $(srcdir)/Editors/Tilt.cs \
+ $(srcdir)/Editors/Old/OldEditor.cs \
+ $(srcdir)/Editors/Old/SoftFocus.cs \
+ $(srcdir)/Editors/Old/Tilt.cs \
$(srcdir)/ExportStore.cs \
$(srcdir)/Extensions/ExportMenuItemNode.cs \
$(srcdir)/Extensions/IExporter.cs \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]