f-spot r3840 - in trunk: . extensions extensions/CDExport extensions/DevelopInUFraw extensions/FacebookExport extensions/FlickrExport extensions/FolderExport extensions/GalleryExport extensions/MetaPixel extensions/PicasaWebExport extensions/PictureTile extensions/RawPlusJpeg extensions/SmugMugExport extensions/SyncCatalog extensions/ZipExport src
- From: sdelcroix svn gnome org
- To: svn-commits-list gnome org
- Subject: f-spot r3840 - in trunk: . extensions extensions/CDExport extensions/DevelopInUFraw extensions/FacebookExport extensions/FlickrExport extensions/FolderExport extensions/GalleryExport extensions/MetaPixel extensions/PicasaWebExport extensions/PictureTile extensions/RawPlusJpeg extensions/SmugMugExport extensions/SyncCatalog extensions/ZipExport src
- Date: Wed, 23 Apr 2008 11:58:53 +0100 (BST)
Author: sdelcroix
Date: Wed Apr 23 10:58:52 2008
New Revision: 3840
URL: http://svn.gnome.org/viewvc/f-spot?rev=3840&view=rev
Log:
Preparing 0.4.3 release
Modified:
trunk/ChangeLog
trunk/configure.in
trunk/extensions/CDExport/CDExport.addin.xml
trunk/extensions/ChangeLog
trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml
trunk/extensions/FacebookExport/FacebookExport.addin.xml
trunk/extensions/FlickrExport/FlickrExport.addin.xml
trunk/extensions/FlickrExport/FlickrExport.cs
trunk/extensions/FlickrExport/FlickrRemote.cs
trunk/extensions/FolderExport/FolderExport.addin.xml
trunk/extensions/FolderExport/FolderExport.cs
trunk/extensions/GalleryExport/GalleryExport.addin.xml
trunk/extensions/MetaPixel/MetaPixel.addin.xml
trunk/extensions/PicasaWebExport/PicasaWebExport.addin.xml
trunk/extensions/PictureTile/PictureTile.addin.xml
trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml
trunk/extensions/SmugMugExport/SmugMugExport.addin.xml
trunk/extensions/SyncCatalog/SyncCatalog.addin.xml
trunk/extensions/ZipExport/ZipExport.addin.xml
trunk/src/FSpot.addin.xml
trunk/src/Preferences.cs
trunk/src/main.cs
Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in (original)
+++ trunk/configure.in Wed Apr 23 10:58:52 2008
@@ -1,4 +1,4 @@
-AC_INIT(F-Spot, 0.4.2)
+AC_INIT(F-Spot, 0.4.3)
AC_CONFIG_SRCDIR(src/main.cs)
AM_CONFIG_HEADER(config.h)
Modified: trunk/extensions/CDExport/CDExport.addin.xml
==============================================================================
--- trunk/extensions/CDExport/CDExport.addin.xml (original)
+++ trunk/extensions/CDExport/CDExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="1.1"
+ version="0.4.3.0"
name="CD Export"
description="This extension allows you to burn your photos to CD."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
Modified: trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml
==============================================================================
--- trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml (original)
+++ trunk/extensions/DevelopInUFraw/DevelopInUFRaw.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,12 +1,13 @@
<Addin namespace="FSpot"
id="DevelopInUFraw"
- version="1.0"
+ version="0.4.3.0"
+ name="DevelopInUFRaw"
description="Develop the image in UFRaw, saves the result as a new version\n\nNote: Require ufraw 0.13 or CVS version newer than 2007-09-06 !!!"
author="Stephane Delcroix"
url="http://f-spot.org/Extensions";
category="Tools">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/PhotoPopup">
<Command id = "DevelopInUFRaw" _label = "Develop in UFRaw" command_type = "DevelopInUFRawExtension.DevelopInUFRaw" insertbefore="OpenWith"/>
Modified: trunk/extensions/FacebookExport/FacebookExport.addin.xml
==============================================================================
--- trunk/extensions/FacebookExport/FacebookExport.addin.xml (original)
+++ trunk/extensions/FacebookExport/FacebookExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,13 +1,13 @@
<Addin namespace="FSpot"
id="FacebookExport"
- version="0.96"
+ version="0.4.3.0"
name="FacebookExport"
description="Export pictures to facebook"
author="George Talusan"
url="http://f-spot.org/Extensions";
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Runtime>
<Import file="Mono.Facebook.dll" />
Modified: trunk/extensions/FlickrExport/FlickrExport.addin.xml
==============================================================================
--- trunk/extensions/FlickrExport/FlickrExport.addin.xml (original)
+++ trunk/extensions/FlickrExport/FlickrExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="1.5"
+ version="0.4.3.0"
name="Flickr Export"
description="This extension allows you to export your photos to Flickr and 23hq."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
Modified: trunk/extensions/FlickrExport/FlickrExport.cs
==============================================================================
--- trunk/extensions/FlickrExport/FlickrExport.cs (original)
+++ trunk/extensions/FlickrExport/FlickrExport.cs Wed Apr 23 10:58:52 2008
@@ -514,9 +514,9 @@
if (meta_check.Active != (bool) val)
meta_check.Active = (bool) val;
break;
- case Preferences.EXPORT_TOKEN_FLICKR:
- case Preferences.EXPORT_TOKEN_23HQ:
- case Preferences.EXPORT_TOKEN_ZOOOMR:
+ case FlickrRemote.TOKEN_FLICKR:
+ case FlickrRemote.TOKEN_23HQ:
+ case FlickrRemote.TOKEN_ZOOOMR:
token = (string) val;
break;
case PUBLIC_KEY:
Modified: trunk/extensions/FlickrExport/FlickrRemote.cs
==============================================================================
--- trunk/extensions/FlickrExport/FlickrRemote.cs (original)
+++ trunk/extensions/FlickrExport/FlickrRemote.cs Wed Apr 23 10:58:52 2008
@@ -29,6 +29,10 @@
public bool ExportTagHierarchy;
public bool ExportIgnoreTopLevel;
public FSpot.ProgressItem Progress;
+
+ public const string TOKEN_FLICKR = Preferences.APP_FSPOT_EXPORT_TOKENS + "flickr";
+ public const string TOKEN_23HQ = Preferences.APP_FSPOT_EXPORT_TOKENS + "23hq";
+ public const string TOKEN_ZOOOMR = Preferences.APP_FSPOT_EXPORT_TOKENS + "zooomr";
public FlickrRemote (string token, Service service)
{
@@ -204,9 +208,9 @@
public string PreferencePath;
public static Service [] Supported = {
- new Service (SupportedService.Flickr, "Flickr.com", "c6b39ee183385d9ce4ea188f85945016", "0a951ac44a423a04", Preferences.EXPORT_TOKEN_FLICKR),
- new Service (SupportedService.TwentyThreeHQ, "23hq.com", "c6b39ee183385d9ce4ea188f85945016", "0a951ac44a423a04", Preferences.EXPORT_TOKEN_23HQ),
- new Service (SupportedService.Zooomr, "Zooomr.com", "unknown", "unknown", Preferences.EXPORT_TOKEN_ZOOOMR)
+ new Service (SupportedService.Flickr, "Flickr.com", "c6b39ee183385d9ce4ea188f85945016", "0a951ac44a423a04", TOKEN_FLICKR),
+ new Service (SupportedService.TwentyThreeHQ, "23hq.com", "c6b39ee183385d9ce4ea188f85945016", "0a951ac44a423a04", TOKEN_23HQ),
+ new Service (SupportedService.Zooomr, "Zooomr.com", "unknown", "unknown", TOKEN_ZOOOMR)
};
public Service (SupportedService id, string name, string api_key, string secret, string pref)
Modified: trunk/extensions/FolderExport/FolderExport.addin.xml
==============================================================================
--- trunk/extensions/FolderExport/FolderExport.addin.xml (original)
+++ trunk/extensions/FolderExport/FolderExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="1.1"
+ version="0.4.3.0"
name="Folder Export"
description="This extension allows you to export your photos to HTML galleries, Original galleries or just to a folder."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.0.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
Modified: trunk/extensions/FolderExport/FolderExport.cs
==============================================================================
--- trunk/extensions/FolderExport/FolderExport.cs (original)
+++ trunk/extensions/FolderExport/FolderExport.cs Wed Apr 23 10:58:52 2008
@@ -56,6 +56,16 @@
[Glade.Widget] Gtk.HBox chooser_hbox;
+ public const string EXPORT_SERVICE = "folder/";
+ public const string SCALE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "scale";
+ public const string SIZE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "size";
+ public const string OPEN_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "browser";
+ public const string ROTATE_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "rotate";
+ public const string METHOD_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "method";
+ public const string URI_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "uri";
+ public const string SHARPEN_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "sharpen";
+ public const string INCLUDE_TARBALLS_KEY = Preferences.APP_FSPOT_EXPORT + EXPORT_SERVICE + "include_tarballs";
+
private Glade.XML xml;
private string dialog_name = "folder_export_dialog";
Gnome.Vfs.Uri dest;
@@ -124,8 +134,8 @@
uri_chooser.LocalOnly = false;
- if (Preferences.Get (Preferences.EXPORT_FOLDER_URI) != null && Preferences.Get (Preferences.EXPORT_FOLDER_URI) as string != String.Empty)
- uri_chooser.SetUri (Preferences.Get (Preferences.EXPORT_FOLDER_URI) as string);
+ if (Preferences.Get (URI_KEY) != null && Preferences.Get (URI_KEY) as string != String.Empty)
+ uri_chooser.SetUri (Preferences.Get (URI_KEY) as string);
else
uri_chooser.SetFilename (uri_path);
@@ -136,11 +146,11 @@
//LoadHistory ();
Dialog.Response += HandleResponse;
- LoadPreference (Preferences.EXPORT_FOLDER_SCALE);
- LoadPreference (Preferences.EXPORT_FOLDER_SIZE);
- LoadPreference (Preferences.EXPORT_FOLDER_OPEN);
- LoadPreference (Preferences.EXPORT_FOLDER_ROTATE);
- LoadPreference (Preferences.EXPORT_FOLDER_METHOD);
+ LoadPreference (SCALE_KEY);
+ LoadPreference (SIZE_KEY);
+ LoadPreference (OPEN_KEY);
+ LoadPreference (ROTATE_KEY);
+ LoadPreference (METHOD_KEY);
}
public void HandleSizeActive (object sender, System.EventArgs args)
@@ -219,7 +229,7 @@
}
//create the zip tarballs for original
- if (gallery is OriginalGallery && (bool)Preferences.Get(Preferences.EXPORT_FOLDER_INCLUDE_TARBALLS))
+ if (gallery is OriginalGallery && (bool)Preferences.Get(INCLUDE_TARBALLS_KEY))
(gallery as OriginalGallery).CreateZip ();
// we've created the structure, now if the destination was local we are done
@@ -251,12 +261,12 @@
}
// Save these settings for next time
- Preferences.Set (Preferences.EXPORT_FOLDER_SCALE, scale);
- Preferences.Set (Preferences.EXPORT_FOLDER_SIZE, size);
- Preferences.Set (Preferences.EXPORT_FOLDER_OPEN, open);
- Preferences.Set (Preferences.EXPORT_FOLDER_ROTATE, rotate);
- Preferences.Set (Preferences.EXPORT_FOLDER_METHOD, static_radio.Active ? "static" : original_radio.Active ? "original" : "folder" );
- Preferences.Set (Preferences.EXPORT_FOLDER_URI, uri_chooser.Uri);
+ Preferences.Set (SCALE_KEY, scale);
+ Preferences.Set (SIZE_KEY, size);
+ Preferences.Set (OPEN_KEY, open);
+ Preferences.Set (ROTATE_KEY, rotate);
+ Preferences.Set (METHOD_KEY, static_radio.Active ? "static" : original_radio.Active ? "original" : "folder" );
+ Preferences.Set (URI_KEY, uri_chooser.Uri);
} catch (System.Exception e) {
// Console.WriteLine (e);
progress_dialog.Message = e.ToString ();
@@ -360,25 +370,25 @@
//System.Console.WriteLine ("Setting {0} to {1}", key, val);
switch (key) {
- case Preferences.EXPORT_FOLDER_SCALE:
+ case SCALE_KEY:
if (scale_check.Active != (bool) val)
scale_check.Active = (bool) val;
break;
- case Preferences.EXPORT_FOLDER_SIZE:
+ case SIZE_KEY:
size_spin.Value = (double) (int) val;
break;
- case Preferences.EXPORT_FOLDER_OPEN:
+ case OPEN_KEY:
if (open_check.Active != (bool) val)
open_check.Active = (bool) val;
break;
- case Preferences.EXPORT_FOLDER_ROTATE:
+ case ROTATE_KEY:
if (rotate_check.Active != (bool) val)
rotate_check.Active = (bool) val;
break;
- case Preferences.EXPORT_FOLDER_METHOD:
+ case METHOD_KEY:
static_radio.Active = (string) val == "static";
original_radio.Active = (string) val == "original";
plain_radio.Active = (string) val == "folder";
@@ -493,7 +503,7 @@
FilterSet req_set = new FilterSet ();
req_set.Add (new ResizeFilter ((uint)Math.Max (req.Width, req.Height)));
- if ((bool)Preferences.Get (Preferences.EXPORT_FOLDER_SHARPEN)) {
+ if ((bool)Preferences.Get (FolderExport.SHARPEN_KEY)) {
if (req.Name == "lq")
req_set.Add (new SharpFilter (0.1, 2, 4));
if (req.Name == "thumbs")
Modified: trunk/extensions/GalleryExport/GalleryExport.addin.xml
==============================================================================
--- trunk/extensions/GalleryExport/GalleryExport.addin.xml (original)
+++ trunk/extensions/GalleryExport/GalleryExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="1.3"
+ version="0.4.3.0"
name="Gallery Export"
description="This extension allows you to export your photos to PHP Gallery (http://gallery.menalto.com)."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
Modified: trunk/extensions/MetaPixel/MetaPixel.addin.xml
==============================================================================
--- trunk/extensions/MetaPixel/MetaPixel.addin.xml (original)
+++ trunk/extensions/MetaPixel/MetaPixel.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,12 +1,13 @@
<Addin namespace="FSpot"
id="MetaPixelExtension"
- version="0.5"
+ version="0.4.3.0"
description="Create photomosaics using MetaPixel (http://www.complang.tuwien.ac.at/schani/metapixel/)"
author="Lorenzo Milesi"
+ name="MetaPixel"
url="http://f-spot.org/Extensions";
category="Tools">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id = "MetaPixel" _label = "Create p_hotomosaic" command_type = "MetaPixelExtension.MetaPixel" />
Modified: trunk/extensions/PicasaWebExport/PicasaWebExport.addin.xml
==============================================================================
--- trunk/extensions/PicasaWebExport/PicasaWebExport.addin.xml (original)
+++ trunk/extensions/PicasaWebExport/PicasaWebExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="1.3"
+ version="0.4.3.0"
name="PicasaWeb Export"
description="This extension allows you to export your photos to PicasaWeb."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
Modified: trunk/extensions/PictureTile/PictureTile.addin.xml
==============================================================================
--- trunk/extensions/PictureTile/PictureTile.addin.xml (original)
+++ trunk/extensions/PictureTile/PictureTile.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,12 +1,13 @@
<Addin namespace="FSpot"
id="PictureTileExtension"
- version="0.2"
+ version="0.4.3.0"
description="Create photo wall using PictureTile by Jamie Zawinski (http://www.jwz.org/picturetile/)"
author="Lorenzo Milesi"
+ name="PictureTile"
url="http://f-spot.org/Extensions";
category="Tools">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id = "PictureTile" _label = "Create photo_wall" command_type = "PictureTileExtension.PictureTile" />
Modified: trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml
==============================================================================
--- trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml (original)
+++ trunk/extensions/RawPlusJpeg/RawPlusJpeg.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,12 +1,13 @@
<Addin namespace="FSpot"
id="RawPlusJpeg"
- version="1.6"
+ version="0.4.3.0"
description="Merge RAW+Jpeg as multiple versions of the same photo"
author="Stephane Delcroix"
url="http://f-spot.org/Extensions";
+ name="Raw+Jpeg"
category="Tools">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id = "MergeRawJpeg" _label = "Merge Raw" command_type = "RawPlusJpegExtension.RawPlusJpeg" />
Modified: trunk/extensions/SmugMugExport/SmugMugExport.addin.xml
==============================================================================
--- trunk/extensions/SmugMugExport/SmugMugExport.addin.xml (original)
+++ trunk/extensions/SmugMugExport/SmugMugExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,5 +1,5 @@
<Addin namespace="FSpot"
- version="1.2"
+ version="0.4.3.0"
name="SmugMug Export"
description="This extension allows you to export your photos to SmugMug."
author="F-Spot team"
@@ -8,7 +8,7 @@
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
Modified: trunk/extensions/SyncCatalog/SyncCatalog.addin.xml
==============================================================================
--- trunk/extensions/SyncCatalog/SyncCatalog.addin.xml (original)
+++ trunk/extensions/SyncCatalog/SyncCatalog.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,12 +1,13 @@
<Addin namespace="FSpot"
id="SyncMetaData"
- version="0.13"
+ version="0.4.3.0"
description="Sync MetaData information of all catalog with Photos"
author="Miguel Aguero"
url="http://f-spot.org/Extensions";
+ name="SyncMetaData"
category="Tools">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
<Command id = "SyncMetaData" _label = "Sync Catalog with Photos" command_type = "SyncCatalogExtension.SyncCatalog" />
Modified: trunk/extensions/ZipExport/ZipExport.addin.xml
==============================================================================
--- trunk/extensions/ZipExport/ZipExport.addin.xml (original)
+++ trunk/extensions/ZipExport/ZipExport.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,13 +1,13 @@
<Addin namespace="FSpot"
id="ZipExport"
- version="0.4"
+ version="0.4.3.0"
name="Zip export"
description="Simple export to Zip file"
author="Lorenzo Milesi"
url="http://f-spot.org/Extensions";
category="Export">
<Dependencies>
- <Addin id="Core" version="0.4.2.0"/>
+ <Addin id="Core" version="0.4.3.0"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Exports">
<ExportMenuItem id="ZipExport" _label = "Compressed fil_e..." class = "ZipExport.Zip" />
Modified: trunk/src/FSpot.addin.xml
==============================================================================
--- trunk/src/FSpot.addin.xml (original)
+++ trunk/src/FSpot.addin.xml Wed Apr 23 10:58:52 2008
@@ -1,7 +1,7 @@
<Addin namespace = "FSpot"
id = "Core"
- version = "0.4.2.0"
- compatVersion = "0.4.0.0"
+ version = "0.4.3.0"
+ compatVersion = "0.4.3.0"
isroot="true">
<Runtime>
Modified: trunk/src/Preferences.cs
==============================================================================
--- trunk/src/Preferences.cs (original)
+++ trunk/src/Preferences.cs Wed Apr 23 10:58:52 2008
@@ -9,6 +9,7 @@
{
public const string APP_FSPOT = "/apps/f-spot/";
public const string APP_FSPOT_EXPORT = APP_FSPOT + "export/";
+ public const string APP_FSPOT_EXPORT_TOKENS = APP_FSPOT_EXPORT + "tokens/";
public const string MAIN_WINDOW_MAXIMIZED = "/apps/f-spot/ui/maximized";
@@ -48,24 +49,6 @@
public const string SIDEBAR_POSITION = "/apps/f-spot/ui/sidebar_size";
public const string ZOOM = "/apps/f-spot/ui/zoom";
- public const string EXPORT_TOKEN_FLICKR = "/apps/f-spot/export/tokens/flickr";
- public const string EXPORT_TOKEN_23HQ = "/apps/f-spot/export/tokens/23hq";
- public const string EXPORT_TOKEN_ZOOOMR = "/apps/f-spot/export/tokens/zooomr";
-
- public const string EXPORT_SMUGMUG_SCALE = "/apps/f-spot/export/smugmug/scale";
- public const string EXPORT_SMUGMUG_SIZE = "/apps/f-spot/export/smugmug/size";
- public const string EXPORT_SMUGMUG_ROTATE = "/apps/f-spot/export/smugmug/rotate";
- public const string EXPORT_SMUGMUG_BROWSER = "/apps/f-spot/export/smugmug/browser";
-
- public const string EXPORT_FOLDER_SCALE = "/apps/f-spot/export/folder/scale";
- public const string EXPORT_FOLDER_SIZE = "/apps/f-spot/export/folder/size";
- public const string EXPORT_FOLDER_OPEN = "/apps/f-spot/export/folder/browser";
- public const string EXPORT_FOLDER_ROTATE = "/apps/f-spot/export/folder/rotate";
- public const string EXPORT_FOLDER_METHOD = "/apps/f-spot/export/folder/method";
- public const string EXPORT_FOLDER_URI = "/apps/f-spot/export/folder/uri";
- public const string EXPORT_FOLDER_SHARPEN = "/apps/f-spot/export/folder/sharpen";
- public const string EXPORT_FOLDER_INCLUDE_TARBALLS = "/apps/f-spot/export/folder/include_tarballs";
-
public const string EXPORT_EMAIL_SIZE = "/apps/f-spot/export/email/size";
public const string EXPORT_EMAIL_ROTATE = "/apps/f-spot/export/email/auto_rotate";
public const string EXPORT_EMAIL_DELETE_TIMEOUT_SEC = "/apps/f-spot/export/email/delete_timeout_seconds";
@@ -155,19 +138,9 @@
case SHOW_DATES:
case SHOW_RATINGS:
case VIEWER_SHOW_FILENAMES:
- case EXPORT_SMUGMUG_SCALE:
- case EXPORT_SMUGMUG_ROTATE:
- case EXPORT_SMUGMUG_BROWSER:
- case EXPORT_FOLDER_SCALE:
- case EXPORT_FOLDER_SHARPEN:
- case EXPORT_FOLDER_INCLUDE_TARBALLS:
case DBUS_READ_ONLY:
return true;
- case EXPORT_SMUGMUG_SIZE:
- case EXPORT_FOLDER_SIZE:
- return 800;
-
case TAG_ICON_SIZE:
return (int) Tag.IconSize.Large;
@@ -185,14 +158,10 @@
case EXPORT_EMAIL_SIZE:
return 3; // medium size 640px
case EXPORT_EMAIL_ROTATE:
- case EXPORT_FOLDER_OPEN:
- case EXPORT_FOLDER_ROTATE:
case VIEWER_INTERPOLATION:
return true;
case EXPORT_EMAIL_DELETE_TIMEOUT_SEC:
return 30; // delete temporary email pictures after 30 seconds
- case EXPORT_FOLDER_METHOD:
- return "static";
case VIEWER_TRANSPARENCY:
return "NONE";
case VIEWER_TRANS_COLOR:
Modified: trunk/src/main.cs
==============================================================================
--- trunk/src/main.cs (original)
+++ trunk/src/main.cs Wed Apr 23 10:58:52 2008
@@ -186,6 +186,11 @@
AddinManager.Initialize (FSpot.Global.BaseDirectory);
AddinManager.Registry.Update (null);
SetupService setupService = new SetupService (AddinManager.Registry);
+ foreach (AddinRepository repo in setupService.Repositories.GetRepositories ())
+ if (repo.Url.StartsWith ("http://addins.f-spot.org/";) && !repo.Url.StartsWith ("http://addins.f-spot.org/"; + Defines.VERSION)) {
+ Console.WriteLine ("Unregistering {0}", repo.Url);
+ setupService.Repositories.RemoveRepository (repo.Url);
+ }
setupService.Repositories.RegisterRepository (null, "http://addins.f-spot.org/"; + Defines.VERSION, false);
bool create = true;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
