[f-spot: 1/5] * Removed Gnome.* references to Metapixel and Picturetile extensions
- From: Ruben Vermeersch <rubenv src gnome org>
- To: svn-commits-list gnome org
- Subject: [f-spot: 1/5] * Removed Gnome.* references to Metapixel and Picturetile extensions
- Date: Thu, 28 May 2009 17:13:00 -0400 (EDT)
commit 4d5baf3acece3068e3645d03a5d37d3065237475
Author: Lorenzo Milesi <maxxer yetopen it>
Date: Thu May 28 10:55:12 2009 +0200
* Removed Gnome.* references to Metapixel and Picturetile extensions
* Removed SCWL in favour of Log.*
* Added missing extension files to POTFILES.in
---
extensions/Tools/MetaPixel/Makefile | 4 +-
extensions/Tools/MetaPixel/MetaPixel.addin.xml | 2 +-
extensions/Tools/MetaPixel/MetaPixel.cs | 38 +++++++++++--------
extensions/Tools/PictureTile/Makefile | 4 +-
extensions/Tools/PictureTile/PictureTile.addin.xml | 2 +-
extensions/Tools/PictureTile/PictureTile.cs | 9 +++--
po/POTFILES.in | 4 ++
7 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/extensions/Tools/MetaPixel/Makefile b/extensions/Tools/MetaPixel/Makefile
index e46eaad..7ecebe8 100644
--- a/extensions/Tools/MetaPixel/Makefile
+++ b/extensions/Tools/MetaPixel/Makefile
@@ -2,7 +2,7 @@ all: MetaPixel.dll
PACKAGES = \
-pkg:f-spot \
- -pkg:gnome-vfs-sharp-2.0 \
+ -pkg:gio-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0
@@ -17,7 +17,7 @@ SOURCES = \
MetaPixel.cs
install: all
- cp *.dll ~/.gnome2/f-spot/addins/
+ cp *.dll ~/.config/f-spot/addins/
mpack: MetaPixel.dll
mautil p MetaPixel.dll
diff --git a/extensions/Tools/MetaPixel/MetaPixel.addin.xml b/extensions/Tools/MetaPixel/MetaPixel.addin.xml
index c340e3a..4f3571a 100644
--- a/extensions/Tools/MetaPixel/MetaPixel.addin.xml
+++ b/extensions/Tools/MetaPixel/MetaPixel.addin.xml
@@ -1,6 +1,6 @@
<Addin namespace="FSpot"
id="MetaPixelExtension"
- version="0.5.0.0"
+ version="0.5.0.1"
description="Create photomosaics using MetaPixel (http://www.complang.tuwien.ac.at/schani/metapixel/)"
author="Lorenzo Milesi"
name="MetaPixel"
diff --git a/extensions/Tools/MetaPixel/MetaPixel.cs b/extensions/Tools/MetaPixel/MetaPixel.cs
index f20195c..81f12e2 100644
--- a/extensions/Tools/MetaPixel/MetaPixel.cs
+++ b/extensions/Tools/MetaPixel/MetaPixel.cs
@@ -24,6 +24,7 @@ using FSpot.Extensions;
using FSpot.Widgets;
using FSpot.Filters;
using FSpot.UI.Dialog;
+using FSpot.Utils;
using Mono.Unix;
namespace MetaPixelExtension {
@@ -39,7 +40,7 @@ namespace MetaPixelExtension {
string minidir_tmp;
public void Run (object o, EventArgs e) {
- Console.WriteLine ("Executing MetaPixel extension");
+ Log.Information ("Executing MetaPixel extension");
if (MainWindow.Toplevel.SelectedPhotos ().Length == 0) {
InfoDialog (Catalog.GetString ("No selection available"),
Catalog.GetString ("This tool requires an active selection. Please select one or more pictures and try again"),
@@ -142,8 +143,10 @@ namespace MetaPixelExtension {
return;
}
//FIXME should switch to retry/skip
- if (!(new Gnome.Vfs.Uri (p.DefaultVersionUri.ToString ())).Exists)
+ if (!GLib.FileFactory.NewForUri (p.DefaultVersionUri).Exists) {
+ Log.Warning (String.Format ("Couldn't access photo {0} while creating miniatures", p.DefaultVersionUri.LocalPath));
continue;
+ }
//FIXME Check if the picture's format is supproted (jpg, gif)
FilterSet filters = new FilterSet ();
@@ -160,12 +163,12 @@ namespace MetaPixelExtension {
CheapEscape(freq.Current.LocalPath), //Source image
CheapEscape(minifile), //Dest image
minidir_tmp); //Table file
- Console.WriteLine ("Executing: metapixel {0}", prepare_command);
+ Log.Debug ("Executing: metapixel " + prepare_command);
System.Diagnostics.Process mp_prep = System.Diagnostics.Process.Start ("metapixel", prepare_command);
mp_prep.WaitForExit ();
- if (!(new Gnome.Vfs.Uri (minifile)).Exists) {
- Console.WriteLine ("No mini? No party! {0}", minifile);
+ if (!System.IO.File.Exists (minifile)) {
+ Log.Debug ("No mini? No party! {0}", minifile);
continue;
}
@@ -187,8 +190,11 @@ namespace MetaPixelExtension {
return;
}
//FIXME should switch to retry/skip
- if (!(new Gnome.Vfs.Uri (p.DefaultVersionUri.ToString ())).Exists)
+ if (!GLib.FileFactory.NewForUri (p.DefaultVersionUri).Exists) {
+ Log.Warning (String.Format ("Couldn't access photo {0} while creating mosaics", p.DefaultVersionUri.LocalPath));
+ error_count ++;
continue;
+ }
//FIXME Check if the picture's format is supproted (jpg, gif)
@@ -203,13 +209,13 @@ namespace MetaPixelExtension {
string mosaic_command = String.Format ("--metapixel -l {0} {1} {2}",
minidir_tmp,
- CheapEscape(freq.Current.LocalPath),
- CheapEscape(mosaic.LocalPath));
- Console.WriteLine ("Executing: metapixel {0}", mosaic_command);
+ CheapEscape (freq.Current.LocalPath),
+ CheapEscape (mosaic.LocalPath));
+ Log.Debug ("Executing: metapixel " + mosaic_command);
System.Diagnostics.Process mp_exe = System.Diagnostics.Process.Start ("metapixel", mosaic_command);
mp_exe.WaitForExit ();
- if (!(new Gnome.Vfs.Uri (mosaic.ToString ())).Exists) {
- Console.WriteLine ("Error in processing image");
+ if (!GLib.FileFactory.NewForUri (mosaic).Exists) {
+ Log.Warning ("Error in processing image " + p.Name);
error_count ++;
continue;
}
@@ -227,9 +233,9 @@ namespace MetaPixelExtension {
if (error_count > 0)
final_message += String.Format (".\n{0} images out of {1} had errors",
error_count, MainWindow.Toplevel.SelectedPhotos ().Length);
- InfoDialog (Catalog.GetString("PhotoMosaics generated!"),
- Catalog.GetString(final_message),
- Gtk.MessageType.Info);
+ InfoDialog (Catalog.GetString ("PhotoMosaics generated!"),
+ Catalog.GetString (final_message),
+ (error_count == 0 ? Gtk.MessageType.Info : Gtk.MessageType.Warning));
DeleteTmp ();
}
@@ -280,11 +286,11 @@ namespace MetaPixelExtension {
DirectoryInfo dir = new DirectoryInfo(minidir_tmp);
FileInfo[] tmpfiles = dir.GetFiles();
foreach (FileInfo f in tmpfiles) {
- if (System.IO.File.Exists(minidir_tmp + f.Name)) {
+ if (System.IO.File.Exists (minidir_tmp + f.Name)) {
System.IO.File.Delete (minidir_tmp + f.Name);
}
}
- if (System.IO.Directory.Exists(minidir_tmp)) {
+ if (System.IO.Directory.Exists (minidir_tmp)) {
System.IO.Directory.Delete(minidir_tmp);
}
}
diff --git a/extensions/Tools/PictureTile/Makefile b/extensions/Tools/PictureTile/Makefile
index dd93705..277fe22 100644
--- a/extensions/Tools/PictureTile/Makefile
+++ b/extensions/Tools/PictureTile/Makefile
@@ -2,7 +2,7 @@ all: PictureTile.dll
PACKAGES = \
-pkg:f-spot \
- -pkg:gnome-vfs-sharp-2.0 \
+ -pkg:gio-sharp-2.0 \
-pkg:gtk-sharp-2.0 \
-pkg:glade-sharp-2.0
@@ -17,7 +17,7 @@ SOURCES = \
PictureTile.cs
install: all
- cp *.dll ~/.gnome2/f-spot/addins/
+ cp *.dll ~/.config/f-spot/addins/
mpack: PictureTile.dll
mautil p PictureTile.dll
diff --git a/extensions/Tools/PictureTile/PictureTile.addin.xml b/extensions/Tools/PictureTile/PictureTile.addin.xml
index 9eacbd5..ae92306 100644
--- a/extensions/Tools/PictureTile/PictureTile.addin.xml
+++ b/extensions/Tools/PictureTile/PictureTile.addin.xml
@@ -1,6 +1,6 @@
<Addin namespace="FSpot"
id="PictureTileExtension"
- version="0.5.0.0"
+ version="0.5.0.1"
description="Create photo wall using PictureTile by Jamie Zawinski (http://www.jwz.org/picturetile/)"
author="Lorenzo Milesi"
name="PictureTile"
diff --git a/extensions/Tools/PictureTile/PictureTile.cs b/extensions/Tools/PictureTile/PictureTile.cs
index 24baa7f..8507be3 100644
--- a/extensions/Tools/PictureTile/PictureTile.cs
+++ b/extensions/Tools/PictureTile/PictureTile.cs
@@ -22,6 +22,7 @@ using FSpot.Extensions;
using FSpot.Widgets;
using FSpot.Filters;
using FSpot.UI.Dialog;
+using FSpot.Utils;
using Mono.Unix;
namespace PictureTileExtension {
@@ -45,7 +46,7 @@ namespace PictureTileExtension {
Tag [] photo_tags;
public void Run (object o, EventArgs e) {
- Console.WriteLine ("Executing PictureTile extension");
+ Log.Information ("Executing PictureTile extension");
if (MainWindow.Toplevel.SelectedPhotos ().Length == 0) {
InfoDialog (Catalog.GetString ("No selection available"),
Catalog.GetString ("This tool requires an active selection. Please select one or more pictures and try again"),
@@ -129,8 +130,10 @@ namespace PictureTileExtension {
}
//FIXME should switch to retry/skip
- if (!(new Gnome.Vfs.Uri (p.DefaultVersionUri.ToString ())).Exists)
+ if (!GLib.FileFactory.NewForUri (p.DefaultVersionUri).Exists) {
+ Log.Warning (String.Format ("Couldn't access photo {0} while creating mosaics", p.DefaultVersionUri.LocalPath));
continue;
+ }
using (FilterRequest freq = new FilterRequest (p.DefaultVersionUri)) {
filters.Convert (freq);
@@ -172,7 +175,7 @@ namespace PictureTileExtension {
pages.Text,
uniform,
destfile_tmp);
- Console.WriteLine ("Executing: picturetile.pl {0}", picturetile_command);
+ Log.Debug ("Executing: picturetile.pl " + picturetile_command);
System.Diagnostics.Process pt_exe = System.Diagnostics.Process.Start ("picturetile.pl", picturetile_command);
pt_exe.WaitForExit ();
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 33f1f5a..8d1090c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -121,6 +121,10 @@ extensions/Tools/MergeDb/MergeDb.addin.xml
extensions/Tools/MergeDb/MergeDb.cs
extensions/Tools/MergeDb/MergeDb.glade
extensions/Tools/MergeDb/PickFolderDialog.cs
+extensions/Tools/MetaPixel/MetaPixel.addin.xml
+extensions/Tools/MetaPixel/MetaPixel.cs
+extensions/Tools/PictureTile/PictureTile.addin.xml
+extensions/Tools/PictureTile/PictureTile.cs
extensions/Tools/HashJob/HashJob.cs
extensions/Exporters/PicasaWebExport/PicasaWebExport.addin.xml
extensions/Exporters/PicasaWebExport/PicasaWebExport.cs
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]