[f-spot] Largely just cleaned up the using blocks
- From: Stephen Shaw <sshaw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Largely just cleaned up the using blocks
- Date: Tue, 10 Apr 2012 21:42:28 +0000 (UTC)
commit 90ed8cc581a748219a589cb173c0c38dc5284365
Author: Stephen Shaw <sshaw decriptor com>
Date: Thu Mar 22 18:19:33 2012 -0600
Largely just cleaned up the using blocks
Removed a bunch of using statements that
were not needed.
Added some FIXME takes for areas I need to
go back and look at.
Added a couple refs that were missing in
MainApp
src/Clients/MainApp/DependentListStore.cs | 2 -
.../MainApp/FSpot.ColorAdjustment/Adjustment.cs | 11 +-
.../MainApp/FSpot.ColorAdjustment/AutoStretch.cs | 15 +-
.../MainApp/FSpot.ColorAdjustment/Desaturate.cs | 10 +-
.../FSpot.ColorAdjustment/FullColorAdjustment.cs | 10 +-
.../MainApp/FSpot.ColorAdjustment/SepiaTone.cs | 10 +-
.../MainApp/FSpot.Editors/AutoStretchEditor.cs | 3 +-
src/Clients/MainApp/FSpot.Editors/ColorEditor.cs | 19 +-
src/Clients/MainApp/FSpot.Editors/CropEditor.cs | 27 +-
.../MainApp/FSpot.Editors/DesaturateEditor.cs | 3 +-
src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs | 4 +-
src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs | 3 +-
.../MainApp/FSpot.Editors/SoftFocusEditor.cs | 21 +-
src/Clients/MainApp/FSpot.Editors/TiltEditor.cs | 24 +-
.../FSpot.Extensions/CommandMenuItemNode.cs | 7 +-
.../FSpot.Extensions/ComplexMenuItemNode.cs | 12 +-
.../MainApp/FSpot.Extensions/ExportMenuItemNode.cs | 11 +-
src/Clients/MainApp/FSpot.Extensions/IExporter.cs | 9 +-
src/Clients/MainApp/FSpot.Extensions/MenuNode.cs | 1 +
.../MainApp/FSpot.Extensions/PopupCommands.cs | 2 -
.../MainApp/FSpot.Extensions/ServiceNode.cs | 1 +
.../MainApp/FSpot.Extensions/SidebarPage.cs | 14 +-
.../MainApp/FSpot.Extensions/SidebarPageNode.cs | 1 -
.../MainApp/FSpot.Extensions/TransitionNode.cs | 9 +-
src/Clients/MainApp/FSpot.Filters/FilterRequest.cs | 2 -
src/Clients/MainApp/FSpot.Filters/JpegFilter.cs | 4 -
src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs | 6 -
src/Clients/MainApp/FSpot.Filters/SharpFilter.cs | 13 +-
.../MainApp/FSpot.Filters/UniqueNameFilter.cs | 2 +-
src/Clients/MainApp/FSpot.Imaging/Ciff.cs | 4 +-
src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs | 3 -
src/Clients/MainApp/FSpot.Imaging/IImageFile.cs | 5 -
src/Clients/MainApp/FSpot.Imaging/IOChannel.cs | 2 +-
src/Clients/MainApp/FSpot.Imaging/ImageFile.cs | 25 +-
.../MainApp/FSpot.Imaging/InternalProcess.cs | 2 +-
src/Clients/MainApp/FSpot.Imaging/RafFile.cs | 2 +-
src/Clients/MainApp/FSpot.Imaging/Tiff.cs | 5 +-
.../MainApp/FSpot.Import/FileImportSource.cs | 21 +-
src/Clients/MainApp/FSpot.Import/IImportSource.cs | 4 -
.../MainApp/FSpot.Import/ImportController.cs | 19 +-
.../MainApp/FSpot.Import/MetadataImporter.cs | 14 +-
src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs | 2 +
src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs | 16 +-
.../MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs | 1 -
.../MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs | 1 -
.../MainApp/FSpot.Loaders/GdkImageLoader.cs | 77 ++-
src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs | 4 +-
src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs | 14 +-
src/Clients/MainApp/FSpot.Query/HiddenTag.cs | 2 -
src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs | 12 +-
.../MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs | 21 +-
.../MainApp/FSpot.UI.Dialog/BuilderDialog.cs | 1 -
.../MainApp/FSpot.UI.Dialog/DateRangeDialog.cs | 15 +-
.../MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs | 18 +-
.../MainApp/FSpot.UI.Dialog/EditTagDialog.cs | 70 +-
.../MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs | 26 +-
.../MainApp/FSpot.UI.Dialog/ImportDialog.cs | 24 +-
.../MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs | 15 +-
.../MainApp/FSpot.UI.Dialog/LastRollDialog.cs | 74 +-
.../MainApp/FSpot.UI.Dialog/PreferenceDialog.cs | 20 +-
.../MainApp/FSpot.UI.Dialog/ProgressDialog.cs | 12 +-
.../MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs | 15 +-
.../MainApp/FSpot.UI.Dialog/RepairDbDialog.cs | 15 +-
.../MainApp/FSpot.UI.Dialog/RepairDialog.cs | 14 +-
.../FSpot.UI.Dialog/SelectionRatioDialog.cs | 21 +-
.../MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs | 9 +-
.../FSpot.UI.Dialog/ThreadProgressDialog.cs | 16 +-
.../FSpot.Widgets/BrowseablePointerGridView.cs | 13 +-
.../FSpot.Widgets/CellRendererTextProgress.cs | 7 -
.../FSpot.Widgets/CollectionCellGridView.cs | 16 +-
src/Clients/MainApp/FSpot.Widgets/EditorPage.cs | 34 +-
src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs | 25 +-
src/Clients/MainApp/FSpot.Widgets/FindBar.cs | 25 +-
.../MainApp/FSpot.Widgets/FolderTreeModel.cs | 24 +-
.../MainApp/FSpot.Widgets/FolderTreePage.cs | 11 +-
.../MainApp/FSpot.Widgets/FolderTreeView.cs | 22 +-
src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs | 20 +-
src/Clients/MainApp/FSpot.Widgets/Loupe.cs | 25 +-
.../MainApp/FSpot.Widgets/MetadataDisplay.cs | 50 +-
.../MainApp/FSpot.Widgets/PhotoImageView.cs | 22 +-
src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs | 19 +-
src/Clients/MainApp/FSpot.Widgets/QueryView.cs | 13 +-
.../MainApp/FSpot.Widgets/RatingMenuItem.cs | 1 -
.../FSpot.Widgets/SelectionCollectionGridView.cs | 16 +-
src/Clients/MainApp/FSpot.Widgets/Sharpener.cs | 50 +-
src/Clients/MainApp/FSpot.Widgets/Sidebar.cs | 20 +-
src/Clients/MainApp/FSpot.Widgets/SlideShow.cs | 30 +-
src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs | 18 +-
src/Clients/MainApp/FSpot.Widgets/TagEntry.cs | 10 +-
src/Clients/MainApp/FSpot.Widgets/TagMenu.cs | 14 +-
src/Clients/MainApp/FSpot.Widgets/TagView.cs | 18 +-
.../FSpot.Widgets/ThumbnailCaptionRenderer.cs | 13 +-
.../FSpot.Widgets/ThumbnailDateCaptionRenderer.cs | 20 +-
.../FSpot.Widgets/ThumbnailDecorationRenderer.cs | 12 +-
.../ThumbnailFilenameCaptionRenderer.cs | 2 -
.../ThumbnailRatingDecorationRenderer.cs | 13 +-
.../FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs | 13 +-
.../FSpot.Widgets/ThumbnailTextCaptionRenderer.cs | 17 +-
src/Clients/MainApp/FSpot.Widgets/TrayView.cs | 4 -
src/Clients/MainApp/FSpot/Accelerometer.cs | 1 -
src/Clients/MainApp/FSpot/BitConverter.cs | 3 -
src/Clients/MainApp/FSpot/ColorManagement.cs | 2 +-
src/Clients/MainApp/FSpot/ControlOverlay.cs | 6 +-
src/Clients/MainApp/FSpot/DragDropTargets.cs | 1 -
src/Clients/MainApp/FSpot/ExportStore.cs | 6 -
src/Clients/MainApp/FSpot/FolderQueryWidget.cs | 3 -
src/Clients/MainApp/FSpot/FullScreenView.cs | 5 +-
src/Clients/MainApp/FSpot/GroupAdaptor.cs | 1 -
src/Clients/MainApp/FSpot/GroupSelector.cs | 4 +-
src/Clients/MainApp/FSpot/InfoOverlay.cs | 1 +
src/Clients/MainApp/FSpot/ItemAction.cs | 6 +-
src/Clients/MainApp/FSpot/JobStore.cs | 22 +-
src/Clients/MainApp/FSpot/Literal.cs | 20 +-
src/Clients/MainApp/FSpot/MainWindow.cs | 5 -
src/Clients/MainApp/FSpot/MetaStore.cs | 7 +-
src/Clients/MainApp/FSpot/Photo.cs | 2 -
src/Clients/MainApp/FSpot/PhotoLoader.cs | 2 -
src/Clients/MainApp/FSpot/PhotoQuery.cs | 3 +-
src/Clients/MainApp/FSpot/PhotoStore.cs | 36 +-
src/Clients/MainApp/FSpot/PhotoVersion.cs | 7 +-
src/Clients/MainApp/FSpot/PhotoView.cs | 26 +-
src/Clients/MainApp/FSpot/PixbufCache.cs | 16 +-
src/Clients/MainApp/FSpot/Preferences.cs | 18 +-
src/Clients/MainApp/FSpot/PrintOperation.cs | 23 +-
src/Clients/MainApp/FSpot/ProgressItem.cs | 2 -
src/Clients/MainApp/FSpot/QueryWidget.cs | 27 +-
src/Clients/MainApp/FSpot/RollStore.cs | 84 ++--
src/Clients/MainApp/FSpot/RotateCommand.cs | 5 +-
.../MainApp/FSpot/SelectionDataExtensions.cs | 21 +-
src/Clients/MainApp/FSpot/SendEmail.cs | 27 +-
src/Clients/MainApp/FSpot/SingleView.cs | 34 +-
src/Clients/MainApp/FSpot/TagQueryWidget.cs | 24 +-
src/Clients/MainApp/FSpot/TagSelectionWidget.cs | 36 +-
src/Clients/MainApp/FSpot/TagStore.cs | 30 +-
src/Clients/MainApp/FSpot/Term.cs | 21 +-
src/Clients/MainApp/FSpot/ThumbnailCache.cs | 17 +-
src/Clients/MainApp/FSpot/ThumbnailGenerator.cs | 16 +-
src/Clients/MainApp/FSpot/TimeAdaptor.cs | 16 +-
src/Clients/MainApp/FSpot/UriCollection.cs | 20 +-
src/Clients/MainApp/FSpot/XScreenSaverSlide.cs | 14 +-
src/Clients/MainApp/FSpot/main.cs | 36 +-
src/Clients/MainApp/ImageLoaderThread.cs | 23 +-
src/Clients/MainApp/MainApp.csproj | 4 +-
src/Clients/MainApp/PhotoTagMenu.cs | 18 +-
src/Clients/MainApp/PhotoVersionCommands.cs | 20 +-
src/Clients/MainApp/PhotoVersionMenu.cs | 17 +-
src/Clients/MainApp/Pinta/CairoExtensions.cs | 2 +-
src/Clients/MainApp/Pinta/ColorBgra.cs | 3 -
src/Clients/MainApp/Pinta/GaussianBlurEffect.cs | 3 +-
src/Clients/MainApp/PixbufUtils.cs | 75 ++-
src/Clients/MainApp/TagCommands.cs | 30 +-
src/Clients/MainApp/TagPopup.cs | 35 +-
src/Clients/MainApp/ThumbnailCommand.cs | 14 +-
src/Core/FSpot.Bling/FSpot.Bling/Animation.cs | 1 +
src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs | 2 -
src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs | 2 -
src/Core/FSpot.Cms/Cms/ColorCIELCh.cs | 7 -
src/Core/FSpot.Cms/Cms/ColorCIELab.cs | 5 -
src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs | 4 -
src/Core/FSpot.Cms/Cms/ColorCIExyY.cs | 12 +-
src/Core/FSpot.Cms/Cms/GammaTable.cs | 4 -
src/Core/FSpot.Cms/Cms/Profile.cs | 4 -
src/Core/FSpot.Cms/Cms/Transform.cs | 4 -
.../FSpot.Core/BrowsableCollectionProxy.cs | 2 -
.../FSpot.Core/FSpot.Core/BrowsableEventArgs.cs | 2 -
src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs | 19 +-
src/Core/FSpot.Core/FSpot.Core/Global.cs | 1 +
src/Core/FSpot.Core/FSpot.Core/IPhoto.cs | 3 -
src/Core/FSpot.Core/FSpot.Core/IPhotoComparer.cs | 1 +
src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs | 1 -
.../FSpot.Core/FSpot.Core/IPhotoVersionable.cs | 2 -
src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs | 1 -
src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs | 1 -
src/Core/FSpot.Core/FSpot.Core/Roll.cs | 1 +
src/Core/FSpot.Core/FSpot.Core/Tag.cs | 13 +-
src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs | 17 +-
src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs | 2 +-
.../FSpot.Gui/FSpot.Transitions/CairoTransition.cs | 6 -
.../FSpot.Transitions/SlideShowTransition.cs | 7 -
src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs | 1 -
src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs | 3 -
src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs | 11 +-
.../FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs | 11 +-
src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs | 10 +-
src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs | 395 ++++++------
.../FSpot.Gui/FSpot.Widgets/ImageView_Container.cs | 7 +-
.../FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs | 1 -
src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs | 2 -
src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs | 2 -
src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs | 16 +-
src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs | 1 +
src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs | 10 +-
.../FSpot.Gui/FSpot.Widgets/SelectionCollection.cs | 69 +-
src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs | 1 -
.../Banshee.Kernel/IInstanceCriticalJob.cs | 2 -
src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs | 2 -
.../Banshee.Kernel/IntervalHeap.cs | 715 ++++++++++----------
.../Banshee.Kernel/JobPriority.cs | 2 -
.../FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs | 11 +-
.../FSpot.Platform/PreferenceBackend.cs | 1 -
.../FSpot.Platform/FSpot.Platform/ScreenSaver.cs | 1 -
src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs | 1 +
src/Core/FSpot.Query/FSpot.Query/DateRange.cs | 1 +
src/Core/FSpot.Query/FSpot.Query/FolderSet.cs | 2 +-
src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs | 12 +-
src/Core/FSpot.Utils/FSpot.Utils/Cache.cs | 2 +-
src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs | 2 +-
src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs | 4 +-
.../FSpot.Utils/GIOTagLibFileAbstraction.cs | 2 +
src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs | 12 +-
src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs | 12 +-
src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs | 13 +-
src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs | 3 +-
.../FSpot.Utils/RecursiveFileEnumerator.cs | 2 +-
.../FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs | 7 +-
.../FSpot.Utils/SidecarXmpExtensions.cs | 2 +
.../FSpot.Utils/TargetListExtensionMethods.cs | 3 +-
src/Core/FSpot.Utils/FSpot.Utils/UriList.cs | 11 +-
src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs | 1 -
.../FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs | 11 +-
.../FSpot.Addins.Editors/BWEditor.cs | 21 +-
.../FSpot.Addins.Editors/BlackoutEditor.cs | 3 +-
.../FSpot.Addins.Editors/FlipEditor.cs | 15 +-
.../FSpot.Addins.Editors/PixelateEditor.cs | 3 +-
.../FSpot.Addins.Editors/ResizeEditor.cs | 18 +-
.../FSpot.Exporters.CD/Brasero.cs | 10 +-
.../FSpot.Exporters.CD/CDExport.cs | 30 +-
.../FSpot.Exporters.CD/CDExportDialog.cs | 26 +-
.../FSpot.Exporters.Facebook/FacebookExport.cs | 37 +-
.../FacebookExportDialog.cs | 40 +-
.../FSpot.Exporters.Facebook/FacebookTagPopup.cs | 12 +-
.../FindNullableClashes.cs | 1 +
.../Mono.Facebook/Album.cs | 17 +-
.../Mono.Facebook/Error.cs | 2 +-
.../Mono.Facebook/Event.cs | 7 +-
.../Mono.Facebook/FacebookException.cs | 1 +
.../Mono.Facebook/FacebookParam.cs | 1 +
.../Mono.Facebook/FacebookSession.cs | 13 +-
.../Mono.Facebook/Friend.cs | 7 +-
.../Mono.Facebook/FriendInfo.cs | 2 +-
.../Mono.Facebook/Group.cs | 3 +-
.../Mono.Facebook/Location.cs | 2 +-
.../Mono.Facebook/Notification.cs | 4 +-
.../Mono.Facebook/PeopleList.cs | 3 +-
.../Mono.Facebook/Photo.cs | 9 +-
.../Mono.Facebook/Responses.cs | 4 +-
.../Mono.Facebook/SessionInfo.cs | 4 +-
.../Mono.Facebook/SessionWrapper.cs | 1 -
.../FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs | 11 +-
.../FSpot.Exporters.Facebook/Mono.Facebook/User.cs | 1 +
.../FSpot.Exporters.Facebook/Mono.Facebook/Util.cs | 1 +
.../FSpot.Exporters.Flickr/FlickrExport.cs | 75 +-
.../FSpot.Exporters.Flickr/FlickrRemote.cs | 24 +-
.../FSpot.Exporters.Folder/FolderExport.cs | 16 +-
.../FSpot.Exporters.Folder/FolderGallery.cs | 17 +-
.../FSpot.Exporters.Folder/HtmlGallery.cs | 17 +-
.../FSpot.Exporters.Folder/OriginalGallery.cs | 5 +-
.../FSpot.Exporters.Gallery/AccountDialog.cs | 16 +-
.../FSpot.Exporters.Gallery/FormClient.cs | 1 -
.../FSpot.Exporters.Gallery/GalleryAccount.cs | 8 +-
.../FSpot.Exporters.Gallery/GalleryAddAlbum.cs | 12 +-
.../FSpot.Exporters.Gallery/GalleryExport.cs | 27 +-
.../FSpot.Exporters.Gallery/GalleryRemote.cs | 21 +-
.../FSpot.Exporters.PicasaWeb/GoogleAccount.cs | 28 +-
.../GoogleAccountDialog.cs | 34 +-
.../GoogleAccountManager.cs | 5 +-
.../FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs | 29 +-
.../FSpot.Exporters.PicasaWeb/PicasaWebExport.cs | 36 +-
.../FSpot.Exporters.SmugMug/SmugMugAccount.cs | 27 +-
.../SmugMugAccountDialog.cs | 17 +-
.../SmugMugAccountManager.cs | 30 +-
.../FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs | 26 +-
.../FSpot.Exporters.SmugMug/SmugMugExport.cs | 66 +-
.../ApplicationCentricCertificatePolicy.cs | 1 -
.../FSpot.Exporters.Tabblo/FSpotUploadProgress.cs | 13 +-
.../FSpot.Exporters.Tabblo/TabbloExport.cs | 27 +-
.../FSpot.Exporters.Tabblo/TabbloExportModel.cs | 21 +-
.../FSpot.Exporters.Tabblo/TabbloExportView.cs | 2 -
.../FSpot.Exporters.Zip/ZipExport.cs | 36 +-
.../ChangePhotoPathController.cs | 21 +-
.../ChangePhotoPathGui.cs | 16 +-
.../AbstractDevelopInUFRaw.cs | 26 +-
.../FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs | 9 -
.../DevelopInUFRawBatch.cs | 21 +-
.../GalleryRequestHandler.cs | 18 +-
.../FSpot.Tools.LiveWebGallery/LiveWebGallery.cs | 27 +-
.../LiveWebGalleryDialog.cs | 23 +-
.../PhotoRequestHandler.cs | 4 +-
.../ResourceRequestHandler.cs | 4 -
.../FSpot.Tools.LiveWebGallery/SimpleWebServer.cs | 25 +-
.../FSpot.Tools.MergeDb/MergeDb.cs | 120 ++--
.../FSpot.Tools.MergeDb/MergeDbDialog.cs | 3 +-
.../FSpot.Tools.MergeDb/PickFolderDialog.cs | 12 +-
.../FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs | 26 +-
.../FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs | 16 +-
.../ScreensaverConfig.cs | 21 +-
.../FSpot.Addins.Transitions/Cover.cs | 23 +-
.../FSpot.Addins.Transitions/Dissolve.cs | 23 +-
.../FSpot.Addins.Transitions/Push.cs | 23 +-
302 files changed, 2524 insertions(+), 2761 deletions(-)
---
diff --git a/src/Clients/MainApp/DependentListStore.cs b/src/Clients/MainApp/DependentListStore.cs
index 1c1161f..29d807a 100644
--- a/src/Clients/MainApp/DependentListStore.cs
+++ b/src/Clients/MainApp/DependentListStore.cs
@@ -28,8 +28,6 @@
//
using Gtk;
-using Gdk;
-using System;
public class DependentListStore : ListStore {
private TreeModel parent = null;
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
index e85da0a..6e8b053 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
@@ -27,12 +27,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot.Utils;
-using Cms;
+//
+
+using System.Collections.Generic;
+
+using Cms;
+
using Gdk;
-using System.Collections.Generic;
namespace FSpot.ColorAdjustment {
public abstract class Adjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
index e4181ac..7ef9b81 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
@@ -25,12 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Cms;
-using Gdk;
-using System;
-using System.Collections.Generic;
+//
+
+using System;
+using System.Collections.Generic;
+
+using Cms;
+
+using Gdk;
+
using Hyena;
namespace FSpot.ColorAdjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs
index 9c13282..ed5c9da 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs
@@ -25,11 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Cms;
+//
+
+using System.Collections.Generic;
+
+using Cms;
+
using Gdk;
-using System.Collections.Generic;
namespace FSpot.ColorAdjustment {
public class Desaturate : Adjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
index 22f39fd..5a12982 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
@@ -25,12 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Cms;
+//
+
+using System;
+using System.Collections.Generic;
+
using Gdk;
-using System;
-using System.Collections.Generic;
namespace FSpot.ColorAdjustment {
public class FullColorAdjustment : Adjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
index 2a84f96..c44c65f 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
@@ -25,11 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Cms;
+//
+
+using System.Collections.Generic;
+
+using Cms;
+
using Gdk;
-using System.Collections.Generic;
namespace FSpot.ColorAdjustment {
public class SepiaTone : Adjustment {
diff --git a/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs b/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs
index a0ff4dc..f47ecc0 100644
--- a/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.ColorAdjustment;
+
using Gdk;
+
using Mono.Unix;
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs b/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
index 41b3e12..58ad56c 100644
--- a/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
@@ -27,16 +27,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot;
-using FSpot.ColorAdjustment;
-using Gdk;
-using Gtk;
+//
+
+using System;
+
+using FSpot.ColorAdjustment;
+
+using Gdk;
+using Gtk;
+using GtkBeans;
+
using Mono.Unix;
-using System;
-
-using GtkBeans;
namespace FSpot.Editors {
class ColorEditor : Editor {
diff --git a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
index 0dc4d4c..49db471 100644
--- a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
@@ -25,19 +25,22 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot;
-using FSpot.UI.Dialog;
-using FSpot.Utils;
-using Hyena;
-using Gdk;
-using Gtk;
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+
+using FSpot.UI.Dialog;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
namespace FSpot.Editors {
class CropEditor : Editor {
diff --git a/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs b/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
index d8ad3b4..718608d 100644
--- a/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.ColorAdjustment;
+
using Gdk;
+
using Mono.Unix;
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs b/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs
index 72224fc..3ae323a 100644
--- a/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs
@@ -29,12 +29,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
-using FSpot.Utils;
using Gdk;
using Gtk;
+
using Mono.Unix;
-using System;
namespace FSpot.Editors {
class RedEyeEditor : Editor {
diff --git a/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs b/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
index 29b3cf1..55805d4 100644
--- a/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
@@ -27,9 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.ColorAdjustment;
+
using Gdk;
+
using Mono.Unix;
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs b/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
index 3d0f995..772b779 100644
--- a/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
@@ -27,16 +27,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Mono.Unix;
-using Cairo;
-using Gdk;
-using Gtk;
-
-using FSpot.Widgets;
-
+//
+
+using Cairo;
+
+using FSpot.Widgets;
+
+using Gdk;
+using Gtk;
+
+using Mono.Unix;
+
using Pinta.Core;
namespace FSpot.Editors
diff --git a/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs b/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
index 8d68283..f7f0343 100644
--- a/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
@@ -27,17 +27,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Mono.Unix;
-
-using Gdk;
-using Gtk;
-using Cairo;
-
-using FSpot.Widgets;
-
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Widgets;
+
+using Gdk;
+using Gtk;
+
+using Mono.Unix;
+
using Pinta.Core;
namespace FSpot.Editors
diff --git a/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
index 5ecd94f..51e65f3 100644
--- a/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
@@ -25,10 +25,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System;
+
using Mono.Addins;
-using System;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
index eeeb7d1..ac26075 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
@@ -27,13 +27,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System;
+
+using Hyena.Widgets;
+
using Mono.Addins;
-using FSpot.Widgets;
-using System;
-
-using Hyena.Widgets;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
index 3b430bd..5c16eae 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
@@ -25,12 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System;
+
+using FSpot.Core;
+
using Mono.Addins;
-using System;
-
-using FSpot.Core;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/IExporter.cs b/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
index 838a672..23228be 100644
--- a/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
@@ -27,12 +27,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using FSpot.Core;
+
using Mono.Addins;
-using System;
-
-using FSpot.Core;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs b/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs
index 8b81c61..110784b 100644
--- a/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/MenuNode.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Mono.Addins;
using Mono.Unix;
diff --git a/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs b/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs
index dccbdf9..28b5514 100644
--- a/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/PopupCommands.cs
@@ -30,8 +30,6 @@
//
using System;
-using GLib;
-using FSpot.Widgets;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs b/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs
index e83b4cc..c022c53 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ServiceNode.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Mono.Addins;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs b/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
index 93f88e3..fad2af7 100644
--- a/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
@@ -25,15 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot.Extensions;
-using FSpot.Utils;
-using Gtk;
+//
+
+using System;
+
+using Gtk;
+
using Mono.Addins;
-using Mono.Unix;
-using System;
-using System.Collections.Generic;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs b/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs
index 12e43a9..e31766d 100644
--- a/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/SidebarPageNode.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Mono.Addins;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
index dc7aecd..5d247d3 100644
--- a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
@@ -25,12 +25,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using FSpot.Transitions;
+
using Mono.Addins;
-using Gdk;
-using FSpot.Transitions;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs b/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs
index e110fab..ea3c913 100644
--- a/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs
+++ b/src/Clients/MainApp/FSpot.Filters/FilterRequest.cs
@@ -32,11 +32,9 @@
//
using System;
-using System.Collections;
using System.Collections.Generic;
using Hyena;
-using FSpot.Utils;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs b/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
index 4a0e50c..9f0bbba 100644
--- a/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
@@ -29,10 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using FSpot.Utils;
-using FSpot.Imaging;
-
namespace FSpot.Filters {
public class JpegFilter : IFilter {
private uint quality = 95;
diff --git a/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs b/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
index 5e6f397..9e7b8eb 100644
--- a/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
@@ -29,14 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
-
-using FSpot.Utils;
using FSpot.Imaging;
-using Mono.Unix;
-
using Gdk;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs b/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
index a4e3b6a..173dec8 100644
--- a/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
@@ -27,17 +27,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
+//
+
+using FSpot.Imaging;
+
using Gdk;
-using Mono.Unix;
-
-using FSpot.Utils;
-using FSpot.Imaging;
-
namespace FSpot.Filters {
public class SharpFilter : IFilter
{
diff --git a/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs b/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs
index cc90f1d..abda7a0 100644
--- a/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/UniqueNameFilter.cs
@@ -30,7 +30,7 @@
//
using System;
-using FSpot.Utils;
+
using Hyena;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Imaging/Ciff.cs b/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
index 55e1724..ffabf03 100644
--- a/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
@@ -30,10 +30,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
-using FSpot.Utils;
+
using Hyena;
+
using TagLib.Image;
namespace FSpot.Imaging.Ciff {
diff --git a/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs b/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs
index 08ecc49..809d400 100644
--- a/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/DCRawFile.cs
@@ -29,9 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Diagnostics;
-using System.IO;
-using System;
using Hyena;
namespace FSpot.Imaging {
diff --git a/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs b/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs
index 5d3ee55..ac6d972 100644
--- a/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/IImageFile.cs
@@ -33,14 +33,9 @@ using Hyena;
using System;
using System.IO;
-using System.Collections.Generic;
using FSpot.Utils;
-using Mono.Unix;
-using Mono.Unix.Native;
-using Gdk;
-using GLib;
using TagLib.Image;
using GFileInfo = GLib.FileInfo;
diff --git a/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs b/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs
index 043ccff..3356433 100644
--- a/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/IOChannel.cs
@@ -30,8 +30,8 @@
using System;
using System.IO;
using System.Runtime.InteropServices;
+
using GLib;
-using Hyena;
namespace FSpot.Imaging {
diff --git a/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs b/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
index 78a9358..6fd1fca 100644
--- a/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
@@ -28,22 +28,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Hyena;
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-
-using FSpot.Utils;
-using Mono.Unix;
-using Mono.Unix.Native;
-using Gdk;
-
-using GLib;
-using TagLib.Image;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using Hyena;
+
+using TagLib.Image;
+
using GFileInfo = GLib.FileInfo;
namespace FSpot.Imaging
diff --git a/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs b/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
index 852ada3..0d2d793 100644
--- a/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
@@ -28,8 +28,8 @@
//
using System;
-using System.IO;
using System.Runtime.InteropServices;
+
using GLib;
namespace FSpot.Imaging {
diff --git a/src/Clients/MainApp/FSpot.Imaging/RafFile.cs b/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
index 422d8cc..3fd1728 100644
--- a/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
@@ -29,8 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Utils;
using Hyena;
+
using TagLib.Image;
namespace FSpot.Imaging {
diff --git a/src/Clients/MainApp/FSpot.Imaging/Tiff.cs b/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
index 5f026c5..af7ea0a 100644
--- a/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
@@ -28,12 +28,11 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
-using FSpot.Utils;
using System;
using System.IO;
-using System.Collections.Generic;
+
using Hyena;
+
using TagLib;
using TagLib.Image;
using TagLib.IFD;
diff --git a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
index 337abfe..84df28e 100644
--- a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
+++ b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
@@ -25,16 +25,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Gtk;
+
using Hyena;
-using System;
-using System.Threading;
-using System.Collections.Generic;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Imaging;
-using Gtk;
-using Mono.Unix.Native;
namespace FSpot.Import
{
diff --git a/src/Clients/MainApp/FSpot.Import/IImportSource.cs b/src/Clients/MainApp/FSpot.Import/IImportSource.cs
index 0790486..e2926c9 100644
--- a/src/Clients/MainApp/FSpot.Import/IImportSource.cs
+++ b/src/Clients/MainApp/FSpot.Import/IImportSource.cs
@@ -29,12 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Hyena;
-using System;
-
using FSpot.Core;
-
namespace FSpot.Import
{
public interface IImportSource {
diff --git a/src/Clients/MainApp/FSpot.Import/ImportController.cs b/src/Clients/MainApp/FSpot.Import/ImportController.cs
index 292878f..c4e2ce4 100644
--- a/src/Clients/MainApp/FSpot.Import/ImportController.cs
+++ b/src/Clients/MainApp/FSpot.Import/ImportController.cs
@@ -25,14 +25,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Hyena;
-using FSpot.Core;
-using FSpot.Utils;
-using System;
-using System.Collections.Generic;
-using System.Threading;
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.Utils;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Import
diff --git a/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs b/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
index b170f91..8226ebf 100644
--- a/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
+++ b/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
@@ -25,13 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Utils;
+
using Mono.Unix;
-using System.Collections.Generic;
-using FSpot.Core;
-using FSpot.Utils;
namespace FSpot.Import {
internal class MetadataImporter {
diff --git a/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs b/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs
index 94836ad..a9cecbb 100644
--- a/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs
+++ b/src/Clients/MainApp/FSpot.Jobs/CalculateHashJob.cs
@@ -30,7 +30,9 @@
//
using System;
+
using Banshee.Kernel;
+
using Hyena;
namespace FSpot.Jobs {
diff --git a/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs b/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
index 9818f4a..3d97a55 100644
--- a/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
+++ b/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
@@ -27,14 +27,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Banshee.Kernel;
+//
+
+using System;
+
+using Banshee.Kernel;
+
+using FSpot.Core;
+using FSpot.Utils;
+
using Hyena;
-using FSpot.Core;
-using FSpot.Utils;
-using Mono.Unix;
namespace FSpot.Jobs {
public class SyncMetadataJob : Job
diff --git a/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs b/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
index 31d4a1b..0d4bc19 100644
--- a/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
@@ -28,7 +28,6 @@
//
using System;
-using Gdk;
namespace FSpot.Loaders {
public class AreaPreparedEventArgs : EventArgs
diff --git a/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs b/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
index cb48789..0a059b3 100644
--- a/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
@@ -28,7 +28,6 @@
//
using System;
-using Gdk;
namespace FSpot.Loaders {
public class AreaUpdatedEventArgs : EventArgs
diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
index ab5300b..c2091e1 100644
--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
@@ -1,40 +1,43 @@
-//
-// GdkImageLoader.cs
-//
-// Author:
-// Stephane Delcroix <stephane delcroix org>
-// Ruben Vermeersch <ruben savanne be>
-//
-// Copyright (C) 2009-2010 Novell, Inc.
-// Copyright (C) 2009 Stephane Delcroix
-// Copyright (C) 2009-2010 Ruben Vermeersch
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Threading;
-using Gdk;
-using FSpot.Utils;
-using FSpot.Platform;
-using FSpot.Imaging;
-using Hyena;
+//
+// GdkImageLoader.cs
+//
+// Author:
+// Stephane Delcroix <stephane delcroix org>
+// Ruben Vermeersch <ruben savanne be>
+//
+// Copyright (C) 2009-2010 Novell, Inc.
+// Copyright (C) 2009 Stephane Delcroix
+// Copyright (C) 2009-2010 Ruben Vermeersch
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Threading;
+
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Gdk;
+
+using Hyena;
+
using TagLib.Image;
namespace FSpot.Loaders
diff --git a/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs
index d477977..90c3758 100644
--- a/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/IImageLoader.cs
@@ -27,10 +27,12 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot.Utils;
using System;
+
using Gdk;
+
using Hyena;
+
using TagLib.Image;
namespace FSpot.Loaders {
diff --git a/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs
index 51a355c..89a5dee 100644
--- a/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs
@@ -27,13 +27,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot.Utils;
-using FSpot.Imaging;
-using System;
-using System.Collections.Generic;
-using Gdk;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Imaging;
+
using Hyena;
namespace FSpot.Loaders {
diff --git a/src/Clients/MainApp/FSpot.Query/HiddenTag.cs b/src/Clients/MainApp/FSpot.Query/HiddenTag.cs
index aa5e7db..e5141b6 100644
--- a/src/Clients/MainApp/FSpot.Query/HiddenTag.cs
+++ b/src/Clients/MainApp/FSpot.Query/HiddenTag.cs
@@ -31,10 +31,8 @@
using System;
-using FSpot;
using FSpot.Core;
-
namespace FSpot.Query
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
index da370cf..3b4b12c 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
@@ -25,12 +25,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
+//
+
+using System;
+using System.IO;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
index b6e4e8a..c82411d 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
@@ -29,16 +29,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using System.Collections;
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Widgets;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Widgets;
-using Hyena;
namespace FSpot.UI.Dialog {
public class AdjustTimeDialog : BuilderDialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
index f29b8b9..fe99e24 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using GtkBeans;
namespace FSpot.UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
index 8f811a7..2ffdc4d 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
@@ -27,13 +27,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using System;
+//
+
+using System;
+
+using FSpot.Query;
+using FSpot.Widgets;
+
+using Gtk;
+
using Mono.Unix;
-using FSpot.Query;
-using FSpot.Widgets;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
index ab1fd17..aaf5f05 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
@@ -27,14 +27,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using System;
+
+using FSpot.Core;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
-using Gtk;
-using Hyena;
-using Hyena.Widgets;
-using FSpot.Core;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
index 57fc7f7..4b3468d 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
@@ -1,38 +1,40 @@
-//
-// EditTagDialog.cs
-//
-// Author:
-// Stephane Delcroix <stephane delcroix org>
-//
-// Copyright (C) 2009 Novell, Inc.
-// Copyright (C) 2009 Stephane Delcroix
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections;
-using System.Collections.Generic;
+//
+// EditTagDialog.cs
+//
+// Author:
+// Stephane Delcroix <stephane delcroix org>
+//
+// Copyright (C) 2009 Novell, Inc.
+// Copyright (C) 2009 Stephane Delcroix
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Database;
+
+using Gtk;
+
using Mono.Unix;
-using Gtk;
-using FSpot.Core;
-using FSpot.Database;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
index 094dfa2..2caf49f 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
@@ -27,18 +27,22 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Imaging;
+using FSpot.Utils;
+using FSpot.Widgets;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
-using Gtk;
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Widgets;
-using FSpot.Utils;
-using FSpot.Imaging;
-using Hyena;
-using Hyena.Widgets;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
index e5f2104..2975123 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
@@ -25,17 +25,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot.Core;
-using FSpot.UI.Dialog;
-using FSpot.Widgets;
-using FSpot.Utils;
-using FSpot.Import;
-using Gtk;
-using Hyena;
-using System;
-using System.Collections.Generic;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Import;
+using FSpot.Utils;
+using FSpot.Widgets;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.UI.Dialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
index ad7b4db..b1ae7e0 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
@@ -25,13 +25,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using Gtk;
+//
+
+using System;
+using System.Collections.Generic;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
index 2a31caa..35239c3 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
@@ -1,41 +1,41 @@
-//
-// LastRollDialog.cs
-//
-// Author:
-// Ruben Vermeersch <ruben savanne be>
-// Stephane Delcroix <sdelcroix src gnome org>
-// Stephen Shaw <sshaw decriptor com>
-//
-// Copyright (C) 2007-2010 Novell, Inc.
-// Copyright (C) 2010 Ruben Vermeersch
-// Copyright (C) 2007-2008 Stephane Delcroix
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections.Generic;
-
+//
+// LastRollDialog.cs
+//
+// Author:
+// Ruben Vermeersch <ruben savanne be>
+// Stephane Delcroix <sdelcroix src gnome org>
+// Stephen Shaw <sshaw decriptor com>
+//
+// Copyright (C) 2007-2010 Novell, Inc.
+// Copyright (C) 2010 Ruben Vermeersch
+// Copyright (C) 2007-2008 Stephane Delcroix
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Query;
+
using Gtk;
-using FSpot.Core;
-using FSpot.Query;
-using FSpot.UI.Dialog;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
index 39c48d5..acb30b9 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
@@ -27,17 +27,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Linq;
-using Gtk;
+//
+
+using System;
+using System.IO;
+using System.Linq;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
-
-using FSpot.Widgets;
namespace FSpot.UI.Dialog {
public class PreferenceDialog : BuilderDialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs
index 9a1a6f3..9d92c73 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs
@@ -27,12 +27,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using GLib;
-using Gtk;
-using System;
-
+//
+
+using System;
+
+using Gtk;
+
using Mono.Unix;
namespace FSpot.UI.Dialog {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
index 4e80982..3e20321 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
@@ -29,14 +29,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using FSpot;
-using FSpot.Query;
-using FSpot.Widgets;
-using FSpot.UI.Dialog;
-
+//
+
+using FSpot.Query;
+using FSpot.Widgets;
+
+using Gtk;
+
namespace FSpot.UI.Dialog
{
public class RatingFilterDialog : BuilderDialog {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
index b38f9f5..ba1f9e9 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
@@ -27,13 +27,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
+//
+
+using System;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
-using Hyena;
-using Hyena.Widgets;
namespace FSpot.UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs
index e62a223..9b4dc7d 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs
@@ -27,14 +27,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Widgets;
+
using Gtk;
-using System;
-using System.IO;
-using FSpot.Widgets;
-
-using FSpot.Core;
namespace FSpot. UI.Dialog
{
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
index 4135f6d..3b29d07 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
@@ -25,17 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Xml.Serialization;
-using System.Collections.Generic;
-
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
namespace FSpot.UI.Dialog {
public class SelectionRatioDialog : BuilderDialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
index cae51bf..48d3afb 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
@@ -29,12 +29,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gdk;
+//
+
+using FSpot.Core;
+
using Gtk;
-using FSpot.Core;
namespace FSpot.UI.Dialog {
public class TagSelectionDialog : BuilderDialog
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs
index c728af9..7cdf9af 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs
@@ -29,16 +29,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Threading;
-using System.Collections.Generic;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Utils;
+
using Gtk;
-using FSpot.Utils;
-
namespace FSpot.UI.Dialog {
public class ThreadProgressDialog : Gtk.Dialog {
DelayedOperation delay;
diff --git a/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs b/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
index c9b0f4a..5266a7a 100644
--- a/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
@@ -25,14 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
+//
+
+using System;
+
+using FSpot.Core;
+
using Gdk;
-using Gtk;
-
-using FSpot.Core;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs b/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs
index 2d1c7fc..e1900fc 100644
--- a/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/CellRendererTextProgress.cs
@@ -30,15 +30,8 @@
//
using System;
-using System.Collections.Generic;
using Gtk;
-using GLib;
-
-using FSpot;
-using FSpot.Utils;
-
-using Mono.Unix;
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.cs b/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.cs
index bc1a825..fb3bfc8 100644
--- a/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.cs
@@ -25,15 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Utils;
+
+using Gdk;
using Gtk;
-using Gdk;
-
-using FSpot.Core;
-using FSpot.Utils;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs b/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
index c9576a5..8aed1c2 100644
--- a/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
@@ -27,25 +27,25 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot;
-using FSpot.Extensions;
-using FSpot.Editors;
-using FSpot.UI.Dialog;
-using FSpot.Utils;
-using FSpot.Core;
-
-using Gtk;
-
-using Mono.Addins;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Editors;
+using FSpot.Extensions;
+using FSpot.UI.Dialog;
+using FSpot.Utils;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
+using Mono.Addins;
using Mono.Unix;
-using System;
-using System.Collections.Generic;
-using Hyena;
-using Hyena.Widgets;
-
namespace FSpot.Widgets {
public class EditorPage : SidebarPage {
internal bool InPhotoView;
diff --git a/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs b/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
index 7b33096..71eb754 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
@@ -34,19 +34,18 @@
//TODO:
// * only redraw required parts on ExposeEvents (low)
-// * Handle orientation changes (low) (require gtk# changes, so I can trigger an OrientationChanged event)
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-
-using Gtk;
-using Gdk;
-
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Platform;
-using FSpot.Bling;
+// * Handle orientation changes (low) (require gtk# changes, so I can trigger an OrientationChanged event)
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Bling;
+using FSpot.Core;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Hyena;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/FindBar.cs b/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
index 75ee91d..52e8fa8 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
@@ -29,20 +29,21 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Text;
-using System.Text.RegularExpressions;
-using Gtk;
-using Gdk;
+//
+
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using FSpot.Core;
+using FSpot.Query;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using FSpot.Core;
-using FSpot.Query;
-using Hyena;
-
namespace FSpot.Widgets {
public class FindBar : HighlightedBox {
private Entry entry;
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
index 9c047c7..b00a41f 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
@@ -27,22 +27,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-using GLib;
-
-using FSpot;
-using FSpot.Database;
-using FSpot.Core;
-using Hyena;
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Database;
+
+using Gtk;
+
+using Hyena;
using Hyena.Data.Sqlite;
-using Mono.Unix;
-
namespace FSpot.Widgets
{
public class FolderTreeModel : TreeStore
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
index aba8bc8..24442fd 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
@@ -27,12 +27,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
+//
+
+using FSpot.Extensions;
+
+using Gtk;
+
using Mono.Unix;
-using FSpot.Extensions;
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
index c760a5a..3a5e742 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
@@ -27,18 +27,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-using GLib;
-
-using FSpot;
-using FSpot.Utils;
-
-using Hyena;
+//
+
+using System;
+
+using FSpot.Utils;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs b/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
index 55dbacd..18a5dc9 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
@@ -27,14 +27,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Cairo;
-using Gdk;
-using Gtk;
-using FSpot.Utils;
-using FSpot.Imaging;
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Hyena;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/Loupe.cs b/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
index 12bae67..4d22df6 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
@@ -25,18 +25,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Cairo;
-
-using Gtk;
-using Gdk;
-using System;
-using System.Runtime.InteropServices;
-using Mono.Unix;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Gui;
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Core;
+using FSpot.Gui;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Hyena;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs b/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
index 2201dbd..e412af5 100644
--- a/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
@@ -25,21 +25,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.Collections.Generic;
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Utils;
+
+using Gtk;
+
using Mono.Unix;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Extensions;
-using FSpot.Imaging;
-
namespace FSpot.Widgets {
public class MetadataDisplayPage : SidebarPage {
public MetadataDisplayPage() : base(new MetadataDisplayWidget(),
@@ -158,7 +156,7 @@ namespace FSpot.Widgets {
}
internal void HandleSelectionChanged (IBrowsableCollection collection) {
- // Don't show metadata when multiple photos are selected.
+ // Don't show metadata when multiple photos are selected.
Photo = (collection != null && collection.Count == 1) ? collection [0] : null;
}
@@ -168,16 +166,16 @@ namespace FSpot.Widgets {
if (!Visible) {
up_to_date = false;
- } else {
+ } else {
update_delay.Start ();
- }
+ }
}
- private new bool Visible {
- get {
- return (Page.Sidebar as Sidebar).IsActive (Page);
- }
- }
+ private new bool Visible {
+ get {
+ return (Page.Sidebar as Sidebar).IsActive (Page);
+ }
+ }
private ListStore AddExpander (string name, int pos)
{
@@ -232,8 +230,8 @@ namespace FSpot.Widgets {
System.Exception error = null;
/*
- // FIXME: The stuff below needs to be ported to Taglib#.
- TreeIter iter;
+ // FIXME: The stuff below needs to be ported to Taglib#.
+ TreeIter iter;
ListStore model;
string name;
@@ -377,11 +375,11 @@ namespace FSpot.Widgets {
if (empty) {
string msg;
if (photo == null) {
- msg = Catalog.GetString ("No active photo");
+ msg = Catalog.GetString ("No active photo");
} else if (missing) {
msg = String.Format (Catalog.GetString ("The photo \"{0}\" does not exist"), photo.DefaultVersion.Uri);
} else {
- msg = Catalog.GetString ("No metadata available");
+ msg = Catalog.GetString ("No metadata available");
if (error != null) {
msg = String.Format ("<i>{0}</i>", error);
@@ -414,7 +412,7 @@ namespace FSpot.Widgets {
return false;
}
- /*
+ /*
private void WriteCollection (MemoryStore substore, StringBuilder collection)
{
string type = null;
diff --git a/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs b/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
index eac9421..1f8806b 100644
--- a/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
@@ -29,17 +29,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using FSpot.Core;
-using FSpot.Editors;
-using FSpot.Utils;
-using FSpot.Loaders;
-
-using Hyena;
-using Gdk;
-
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Loaders;
+
+using Gdk;
+
+using Hyena;
+
using TagLib.Image;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs b/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
index 1c08095..4265081 100644
--- a/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
@@ -27,15 +27,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Cairo;
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Core;
+using FSpot.Gui;
+using FSpot.Utils;
+using FSpot.Widgets;
+
using Gdk;
-using FSpot.Core;
-using FSpot.Widgets;
-using FSpot.Utils;
-using FSpot.Gui;
namespace FSpot {
public class PreviewPopup : Gtk.Window {
diff --git a/src/Clients/MainApp/FSpot.Widgets/QueryView.cs b/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
index 16fb9b1..1771fcf 100644
--- a/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
@@ -33,16 +33,13 @@
// QueryView.cs
//
// Copyright (C) 2004 Novell, Inc.
-//
-
-using System;
-
-using Gdk;
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
-using FSpot.Core;
-
-
namespace FSpot.Widgets
{
public class QueryView : SelectionCollectionGridView
diff --git a/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs b/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs
index 74d786e..496d564 100644
--- a/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/RatingMenuItem.cs
@@ -30,7 +30,6 @@
using System;
-
namespace FSpot.Widgets
{
public class RatingMenuItem : Hyena.Widgets.RatingMenuItem
diff --git a/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs b/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
index 23952fc..4d22b22 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
@@ -25,16 +25,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gdk;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
-using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs b/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
index 3e3ebc5..b34443f 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
@@ -27,17 +27,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using Cairo;
-
-using Gtk;
-using Gdk;
-using System;
-using System.Runtime.InteropServices;
+//
+
+using System;
+
+using FSpot.UI.Dialog;
+
+using Gtk;
+
+using Hyena.Widgets;
+
using Mono.Unix;
-using FSpot.Widgets;
-using FSpot.UI.Dialog;
-using Hyena.Widgets;
namespace FSpot.Widgets
{
@@ -58,17 +58,17 @@ namespace FSpot.Widgets
{
if (!okClicked) {
base.UpdateSample ();
-
+
if (overlay != null)
overlay.Dispose ();
-
+
overlay = null;
if (source != null)
overlay = PixbufUtils.UnsharpMask (source,
- radius_spin.Value,
- amount_spin.Value,
- threshold_spin.Value,
- null);
+ radius_spin.Value,
+ amount_spin.Value,
+ threshold_spin.Value,
+ null);
}
}
@@ -92,10 +92,10 @@ namespace FSpot.Widgets
try {
Gdk.Pixbuf orig = view.Pixbuf;
Gdk.Pixbuf final = PixbufUtils.UnsharpMask (orig,
- radius_spin.Value,
- amount_spin.Value,
- threshold_spin.Value,
- progressDialog);
+ radius_spin.Value,
+ amount_spin.Value,
+ threshold_spin.Value,
+ progressDialog);
bool create_version = photo.DefaultVersion.IsProtected;
@@ -105,13 +105,13 @@ namespace FSpot.Widgets
} catch (System.Exception e) {
string msg = Catalog.GetString ("Error saving sharpened photo");
string desc = String.Format (Catalog.GetString ("Received exception \"{0}\". Unable to save photo {1}"),
- e.Message, photo.Name);
+ e.Message, photo.Name);
HigMessageDialog md = new HigMessageDialog (this, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error,
- ButtonsType.Ok,
- msg,
- desc);
+ Gtk.MessageType.Error,
+ ButtonsType.Ok,
+ msg,
+ desc);
md.Run ();
md.Destroy ();
}
diff --git a/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs b/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
index 40fa08d..9e4f040 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
@@ -25,16 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Utils;
-using Gtk;
-using Mono.Addins;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Extensions;
+
+using Gtk;
+
+using Mono.Addins;
using Mono.Unix;
-using System;
-using System.Collections.Generic;
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
index bd20866..47b58c4 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
@@ -25,20 +25,22 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-using Gdk;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Bling;
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Imaging;
+using FSpot.Transitions;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Mono.Addins;
-using FSpot.Core;
-using FSpot.Bling;
-using FSpot.Extensions;
-using FSpot.Imaging;
-using FSpot.Transitions;
-using FSpot.Utils;
namespace FSpot.Widgets
{
@@ -77,7 +79,7 @@ namespace FSpot.Widgets
SlideShowTransition transition;
public SlideShowTransition Transition {
- get { return transition; }
+ get { return transition; }
set {
if (value == transition)
return;
diff --git a/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs b/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
index 613f13a..03698e4 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
@@ -27,12 +27,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Cairo;
-using System;
-using System.Runtime.InteropServices;
-
+//
+
+using System;
+
+using Cairo;
+
using Pinta.Core;
namespace FSpot.Widgets {
@@ -112,9 +112,9 @@ namespace FSpot.Widgets {
((IDisposable)ctx).Dispose ();
Gdk.Pixbuf normal = image.ToPixbuf();
- Gdk.Pixbuf blur = PixbufUtils.Blur (normal, 3, null);
+ Gdk.Pixbuf blur = PixbufUtils.Blur (normal, 3, null);
- ImageInfo overlay = new ImageInfo (blur);
+ ImageInfo overlay = new ImageInfo (blur);
blur.Dispose ();
normal.Dispose ();
image.Destroy ();
@@ -129,7 +129,7 @@ namespace FSpot.Widgets {
RadialGradient circle;
circle = new RadialGradient (center.X * scale, center.Y * scale, radius * max * .7,
- center.X * scale, center.Y * scale, radius * max + max * .2);
+ center.X * scale, center.Y * scale, radius * max + max * .2);
circle.AddColorStop (0, new Cairo.Color (0.0, 0.0, 0.0, 0.0));
circle.AddColorStop (1.0, new Cairo.Color (1.0, 1.0, 1.0, 1.0));
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs b/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
index ad18266..e5d039c 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
@@ -30,11 +30,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
+//
+
+using System.Collections.Generic;
+using System.Text;
+
using FSpot.Core;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs b/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
index 58818e1..2abdc99 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagMenu.cs
@@ -31,15 +31,19 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Gtk;
+// FIXME: Not sure we need this conditional since gtkbeans is used in several other places
#if GTK_2_16
using GtkBeans;
#endif
-using System;
+
using FSpot;
+using FSpot.Core;
using FSpot.Utils;
+
using Hyena;
-using FSpot.Core;
public class TagMenu : Menu {
private TagStore tag_store;
@@ -75,8 +79,8 @@ public class TagMenu : Menu {
System.Text.StringBuilder label_builder = new System.Text.StringBuilder ();
for (Category parent = t.Category;
- parent != null && parent.Category != null;
- parent = parent.Category)
+ parent != null && parent.Category != null;
+ parent = parent.Category)
label_builder.Append (" ");
label_builder.Append (t.Name);
@@ -129,7 +133,7 @@ public class TagMenu : Menu {
}
}
- public void PopulateFlat (Category cat, Gtk.Menu parent)
+ public void PopulateFlat (Category cat, Gtk.Menu parent)
{
foreach (Tag t in cat.Children) {
TagMenuItem item = TagMenuItem.IndentedItem (t);
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagView.cs b/src/Clients/MainApp/FSpot.Widgets/TagView.cs
index b337e7b..471104e 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagView.cs
@@ -29,12 +29,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using System;
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
-using Gdk;
-using FSpot.Core;
namespace FSpot.Widgets {
public class TagView : EventBox {
@@ -136,12 +138,12 @@ public class TagView : EventBox {
FSpot.ColorManagement.ApplyProfile (scaled_icon, screen_profile);
scaled_icon.RenderToDrawable (GdkWindow, Style.WhiteGC,
- 0, 0, tag_x, tag_y, thumbnail_size, thumbnail_size,
- RgbDither.None, tag_x, tag_y);
+ 0, 0, tag_x, tag_y, thumbnail_size, thumbnail_size,
+ RgbDither.None, tag_x, tag_y);
tag_x += thumbnail_size + TAG_ICON_VSPACING;
}
- this.TooltipText = String.Join (", ", names);
+ this.TooltipText = String.Join (", ", names);
}
}
}
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
index e17ed3c..3d5e0c4 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
@@ -25,15 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
-using Gdk;
-
-using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
index 0bf105d..f34db67 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
@@ -25,19 +25,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-using Gdk;
-
+//
+
+using System.Collections.Generic;
+
+using FSpot.Core;
+
+using Gdk;
+using Gtk;
+
using Hyena.Gui;
-using FSpot.Core;
-
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
index 534e44e..7f6a067 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
@@ -25,14 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
-using Gdk;
-
-using FSpot.Core;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs
index 55cf635..5e93fcd 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailFilenameCaptionRenderer.cs
@@ -27,12 +27,10 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
index 12a9a6e..91da990 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
@@ -25,15 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
-using Gdk;
-
-using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
index d668f2e..1dd9a83 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
@@ -25,15 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
-using Gdk;
-
-using FSpot.Core;
-
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
index 2b3555a..a77b7e7 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
@@ -25,18 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Gtk;
-using Gdk;
-
+//
+
+using FSpot.Core;
+
+using Gdk;
+using Gtk;
+
using Hyena.Gui;
-using FSpot.Core;
-
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot.Widgets/TrayView.cs b/src/Clients/MainApp/FSpot.Widgets/TrayView.cs
index 82e5b23..157c4ec 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TrayView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TrayView.cs
@@ -29,12 +29,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
-using Gtk;
-
using FSpot.Core;
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Clients/MainApp/FSpot/Accelerometer.cs b/src/Clients/MainApp/FSpot/Accelerometer.cs
index 77ac544..2ddb061 100644
--- a/src/Clients/MainApp/FSpot/Accelerometer.cs
+++ b/src/Clients/MainApp/FSpot/Accelerometer.cs
@@ -36,7 +36,6 @@
using System;
using System.IO;
-using FSpot.Utils;
using Hyena;
using TagLib.Image;
diff --git a/src/Clients/MainApp/FSpot/BitConverter.cs b/src/Clients/MainApp/FSpot/BitConverter.cs
index 6dc953e..440de93 100644
--- a/src/Clients/MainApp/FSpot/BitConverter.cs
+++ b/src/Clients/MainApp/FSpot/BitConverter.cs
@@ -29,9 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.Runtime.InteropServices;
-
namespace FSpot {
//[Obsolete ("use Mono.DataConvert instead")]
public class BitConverter {
diff --git a/src/Clients/MainApp/FSpot/ColorManagement.cs b/src/Clients/MainApp/FSpot/ColorManagement.cs
index c297154..24ac115 100644
--- a/src/Clients/MainApp/FSpot/ColorManagement.cs
+++ b/src/Clients/MainApp/FSpot/ColorManagement.cs
@@ -27,9 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
using System.Collections.Generic;
+
using FSpot.Core;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/ControlOverlay.cs b/src/Clients/MainApp/FSpot/ControlOverlay.cs
index f91b6dc..5b5b3bb 100644
--- a/src/Clients/MainApp/FSpot/ControlOverlay.cs
+++ b/src/Clients/MainApp/FSpot/ControlOverlay.cs
@@ -29,13 +29,13 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Cairo;
-using System;
using Gtk;
-using FSpot.Widgets;
+
using FSpot.Utils;
-using FSpot.Core;
using FSpot.Gui;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/DragDropTargets.cs b/src/Clients/MainApp/FSpot/DragDropTargets.cs
index ab5e034..5f71484 100644
--- a/src/Clients/MainApp/FSpot/DragDropTargets.cs
+++ b/src/Clients/MainApp/FSpot/DragDropTargets.cs
@@ -31,7 +31,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using Gtk;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/ExportStore.cs b/src/Clients/MainApp/FSpot/ExportStore.cs
index a29d187..871e456 100644
--- a/src/Clients/MainApp/FSpot/ExportStore.cs
+++ b/src/Clients/MainApp/FSpot/ExportStore.cs
@@ -31,15 +31,9 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-using Gdk;
-using Gtk;
-
using System;
-using System.Collections;
using System.Collections.Generic;
-using System.IO;
-using FSpot;
using FSpot.Core;
using FSpot.Database;
using Hyena.Data.Sqlite;
diff --git a/src/Clients/MainApp/FSpot/FolderQueryWidget.cs b/src/Clients/MainApp/FSpot/FolderQueryWidget.cs
index 1431cb1..3aeccd7 100644
--- a/src/Clients/MainApp/FSpot/FolderQueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/FolderQueryWidget.cs
@@ -31,15 +31,12 @@
using System;
using System.Text;
-using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Gtk;
using Hyena;
-using FSpot;
-using FSpot.Utils;
using FSpot.Query;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/FullScreenView.cs b/src/Clients/MainApp/FSpot/FullScreenView.cs
index 3de6420..b2f749a 100644
--- a/src/Clients/MainApp/FSpot/FullScreenView.cs
+++ b/src/Clients/MainApp/FSpot/FullScreenView.cs
@@ -30,13 +30,16 @@
//
using System;
+
using Gtk;
-using Gdk;
+
using FSpot.Core;
using FSpot.Widgets;
using FSpot.Gui;
using FSpot.Utils;
+
using Hyena;
+
using Mono.Unix;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/GroupAdaptor.cs b/src/Clients/MainApp/FSpot/GroupAdaptor.cs
index e7c0c4f..1f1828b 100644
--- a/src/Clients/MainApp/FSpot/GroupAdaptor.cs
+++ b/src/Clients/MainApp/FSpot/GroupAdaptor.cs
@@ -30,7 +30,6 @@
//
using FSpot.Core;
-using FSpot.Utils;
namespace FSpot {
public interface ILimitable {
diff --git a/src/Clients/MainApp/FSpot/GroupSelector.cs b/src/Clients/MainApp/FSpot/GroupSelector.cs
index e9e172c..0e6803b 100644
--- a/src/Clients/MainApp/FSpot/GroupSelector.cs
+++ b/src/Clients/MainApp/FSpot/GroupSelector.cs
@@ -30,11 +30,13 @@
//
using System;
+
using Mono.Unix;
+
using Gtk;
using Gdk;
using GLib;
-using FSpot.Core;
+
using FSpot.Utils;
using FSpot.Widgets;
diff --git a/src/Clients/MainApp/FSpot/InfoOverlay.cs b/src/Clients/MainApp/FSpot/InfoOverlay.cs
index 665a56a..471597a 100644
--- a/src/Clients/MainApp/FSpot/InfoOverlay.cs
+++ b/src/Clients/MainApp/FSpot/InfoOverlay.cs
@@ -32,6 +32,7 @@
//
using Gtk;
+
using FSpot.Core;
using FSpot.Widgets;
diff --git a/src/Clients/MainApp/FSpot/ItemAction.cs b/src/Clients/MainApp/FSpot/ItemAction.cs
index ce377c6..3dad05c 100644
--- a/src/Clients/MainApp/FSpot/ItemAction.cs
+++ b/src/Clients/MainApp/FSpot/ItemAction.cs
@@ -31,11 +31,13 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+using System;
+
using Gtk;
+
using Mono.Unix;
+
using FSpot.Core;
-using FSpot.Filters;
-using System;
using FSpot.UI.Dialog;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/JobStore.cs b/src/Clients/MainApp/FSpot/JobStore.cs
index ca50335..6f2330f 100644
--- a/src/Clients/MainApp/FSpot/JobStore.cs
+++ b/src/Clients/MainApp/FSpot/JobStore.cs
@@ -27,17 +27,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.IO;
-using System;
-using Banshee.Kernel;
-using FSpot.Jobs;
-using FSpot.Database;
-using FSpot;
-using FSpot.Core;
-using Hyena;
+//
+
+using System;
+
+using Banshee.Kernel;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Jobs;
+
+using Hyena;
using Hyena.Data.Sqlite;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/Literal.cs b/src/Clients/MainApp/FSpot/Literal.cs
index df2a168..d678eef 100644
--- a/src/Clients/MainApp/FSpot/Literal.cs
+++ b/src/Clients/MainApp/FSpot/Literal.cs
@@ -32,16 +32,18 @@
// This has to do with Finding photos based on tags
// http://mail.gnome.org/archives/f-spot-list/2005-November/msg00053.html
-// http://bugzilla-attachments.gnome.org/attachment.cgi?id=54566
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
+// http://bugzilla-attachments.gnome.org/attachment.cgi?id=54566
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using FSpot.Core;
+
+using Gdk;
+using Gtk;
+
using Mono.Unix;
-using Gtk;
-using Gdk;
-using Hyena;
-using FSpot.Core;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/MainWindow.cs b/src/Clients/MainApp/FSpot/MainWindow.cs
index 378f2db..ee3f44b 100644
--- a/src/Clients/MainApp/FSpot/MainWindow.cs
+++ b/src/Clients/MainApp/FSpot/MainWindow.cs
@@ -30,10 +30,7 @@
//
using System;
-using System.Text;
using System.Linq;
-using System.IO;
-using System.Collections;
using System.Collections.Generic;
using Gdk;
@@ -44,9 +41,7 @@ using Mono.Unix;
using Hyena;
using Hyena.Widgets;
-using Banshee.Kernel;
-using FSpot;
using FSpot.Core;
using FSpot.Database;
using FSpot.Extensions;
diff --git a/src/Clients/MainApp/FSpot/MetaStore.cs b/src/Clients/MainApp/FSpot/MetaStore.cs
index 643bcb9..cded2be 100644
--- a/src/Clients/MainApp/FSpot/MetaStore.cs
+++ b/src/Clients/MainApp/FSpot/MetaStore.cs
@@ -29,14 +29,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using Gdk;
-using Gtk;
-using System.Collections;
-using System.IO;
using System;
-using FSpot;
+
using FSpot.Core;
using FSpot.Database;
+
using Hyena.Data.Sqlite;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/Photo.cs b/src/Clients/MainApp/FSpot/Photo.cs
index 78c64aa..773c69a 100644
--- a/src/Clients/MainApp/FSpot/Photo.cs
+++ b/src/Clients/MainApp/FSpot/Photo.cs
@@ -34,14 +34,12 @@ using Hyena;
using System;
using System.IO;
using System.Linq;
-using System.Collections;
using System.Collections.Generic;
using Mono.Unix;
using FSpot.Core;
using FSpot.Utils;
-using FSpot.Platform;
using FSpot.Imaging;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/PhotoLoader.cs b/src/Clients/MainApp/FSpot/PhotoLoader.cs
index 6d281b2..1f0bfe1 100644
--- a/src/Clients/MainApp/FSpot/PhotoLoader.cs
+++ b/src/Clients/MainApp/FSpot/PhotoLoader.cs
@@ -34,9 +34,7 @@
using System;
using FSpot.Core;
-using FSpot.Platform;
using FSpot.Imaging;
-using Hyena;
namespace FSpot {
[Obsolete ("nuke or rename this")]
diff --git a/src/Clients/MainApp/FSpot/PhotoQuery.cs b/src/Clients/MainApp/FSpot/PhotoQuery.cs
index 3f9c4af..1ed8600 100644
--- a/src/Clients/MainApp/FSpot/PhotoQuery.cs
+++ b/src/Clients/MainApp/FSpot/PhotoQuery.cs
@@ -34,10 +34,11 @@
//
using System;
-using System.Collections;
using System.Collections.Generic;
+
using FSpot.Core;
using FSpot.Query;
+
using Hyena;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/PhotoStore.cs b/src/Clients/MainApp/FSpot/PhotoStore.cs
index 79f823f..c4c1c31 100644
--- a/src/Clients/MainApp/FSpot/PhotoStore.cs
+++ b/src/Clients/MainApp/FSpot/PhotoStore.cs
@@ -31,30 +31,22 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gdk;
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Jobs;
+using FSpot.Query;
+
+using Hyena;
+using Hyena.Data.Sqlite;
+
using Mono.Unix;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Text;
-using System;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Jobs;
-using FSpot.Query;
-using FSpot.Utils;
-using FSpot.Platform;
-
-using Hyena;
-using Hyena.Data.Sqlite;
-
namespace FSpot {
public class PhotoStore : DbStore<Photo> {
public int TotalPhotos {
diff --git a/src/Clients/MainApp/FSpot/PhotoVersion.cs b/src/Clients/MainApp/FSpot/PhotoVersion.cs
index 4e9f61f..20eb22b 100644
--- a/src/Clients/MainApp/FSpot/PhotoVersion.cs
+++ b/src/Clients/MainApp/FSpot/PhotoVersion.cs
@@ -25,10 +25,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using FSpot.Core;
+
using Hyena;
-using FSpot.Core;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/PhotoView.cs b/src/Clients/MainApp/FSpot/PhotoView.cs
index b02e057..1f16e5d 100644
--- a/src/Clients/MainApp/FSpot/PhotoView.cs
+++ b/src/Clients/MainApp/FSpot/PhotoView.cs
@@ -29,23 +29,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gdk;
-using GLib;
-using Gtk;
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Xml.Serialization;
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Utils;
+using FSpot.Widgets;
+
+using Gdk;
+using Gtk;
+
using Mono.Unix;
-using FSpot.Core;
-using FSpot.Widgets;
-using FSpot.Utils;
-using Hyena;
-using FSpot.UI.Dialog;
-
namespace FSpot {
public class PhotoView : EventBox {
DelayedOperation commit_delay;
diff --git a/src/Clients/MainApp/FSpot/PixbufCache.cs b/src/Clients/MainApp/FSpot/PixbufCache.cs
index f276cbf..8a630a1 100644
--- a/src/Clients/MainApp/FSpot/PixbufCache.cs
+++ b/src/Clients/MainApp/FSpot/PixbufCache.cs
@@ -27,17 +27,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
+//
+
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Utils;
+
using Hyena;
-using FSpot.Utils;
-using FSpot.Platform;
-
namespace FSpot
{
public class PixbufCache
diff --git a/src/Clients/MainApp/FSpot/Preferences.cs b/src/Clients/MainApp/FSpot/Preferences.cs
index dba243d..c1dee47 100644
--- a/src/Clients/MainApp/FSpot/Preferences.cs
+++ b/src/Clients/MainApp/FSpot/Preferences.cs
@@ -29,15 +29,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Net;
-using System;
-using System.Collections.Generic;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Platform;
+
+using Hyena;
+
using Mono.Unix;
-using FSpot.Core;
-using FSpot.Platform;
-using Hyena;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/PrintOperation.cs b/src/Clients/MainApp/FSpot/PrintOperation.cs
index c5aaaf5..2e0b081 100644
--- a/src/Clients/MainApp/FSpot/PrintOperation.cs
+++ b/src/Clients/MainApp/FSpot/PrintOperation.cs
@@ -25,18 +25,21 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Cairo;
-using System;
-using System.Runtime.InteropServices;
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+using Cairo;
+
+using FSpot.Core;
+using FSpot.Imaging;
+using FSpot.Widgets;
+
+using Hyena;
+
using Mono.Unix;
-using FSpot.Core;
-using FSpot.Widgets;
-using FSpot.Imaging;
-using Hyena;
-
namespace FSpot
{
public class PrintOperation : Gtk.PrintOperation
diff --git a/src/Clients/MainApp/FSpot/ProgressItem.cs b/src/Clients/MainApp/FSpot/ProgressItem.cs
index 5313275..1879151 100644
--- a/src/Clients/MainApp/FSpot/ProgressItem.cs
+++ b/src/Clients/MainApp/FSpot/ProgressItem.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot {
public class ProgressItem {
public ProgressItem () {
diff --git a/src/Clients/MainApp/FSpot/QueryWidget.cs b/src/Clients/MainApp/FSpot/QueryWidget.cs
index fe41915..92a487c 100644
--- a/src/Clients/MainApp/FSpot/QueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/QueryWidget.cs
@@ -31,22 +31,21 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Widgets;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using Gtk;
-
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Utils;
-using FSpot.Query;
-using FSpot.Widgets;
-using Hyena;
-
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/RollStore.cs b/src/Clients/MainApp/FSpot/RollStore.cs
index 7f355eb..55e35ca 100644
--- a/src/Clients/MainApp/FSpot/RollStore.cs
+++ b/src/Clients/MainApp/FSpot/RollStore.cs
@@ -1,47 +1,43 @@
-//
-// RollStore.cs
-//
-// Author:
-// Mike GemÃnde <mike gemuende de>
-// Ettore Perazzoli <ettore src gnome org>
-// Stephane Delcroix <sdelcroix src gnome org>
-// Stephen Shaw <sshaw decriptor com>
-//
-// Copyright (C) 2003-2010 Novell, Inc.
-// Copyright (C) 2010 Mike GemÃnde
-// Copyright (C) 2003 Ettore Perazzoli
-// Copyright (C) 2007-2008 Stephane Delcroix
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System;
-
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Utils;
-using FSpot;
-
-using Hyena;
+using System;
+//
+// RollStore.cs
+//
+// Author:
+// Mike GemÃnde <mike gemuende de>
+// Ettore Perazzoli <ettore src gnome org>
+// Stephane Delcroix <sdelcroix src gnome org>
+// Stephen Shaw <sshaw decriptor com>
+//
+// Copyright (C) 2003-2010 Novell, Inc.
+// Copyright (C) 2010 Mike GemÃnde
+// Copyright (C) 2003 Ettore Perazzoli
+// Copyright (C) 2007-2008 Stephane Delcroix
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Database;
+
+using Hyena;
using Hyena.Data.Sqlite;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/RotateCommand.cs b/src/Clients/MainApp/FSpot/RotateCommand.cs
index 3c0f889..2af0150 100644
--- a/src/Clients/MainApp/FSpot/RotateCommand.cs
+++ b/src/Clients/MainApp/FSpot/RotateCommand.cs
@@ -34,12 +34,11 @@
using System;
using System.IO;
-using Gtk;
-using Gdk;
-
using FSpot;
using FSpot.UI.Dialog;
+using Gtk;
+
using Hyena;
using Hyena.Widgets;
using FSpot.Utils;
diff --git a/src/Clients/MainApp/FSpot/SelectionDataExtensions.cs b/src/Clients/MainApp/FSpot/SelectionDataExtensions.cs
index 9d3d29e..2398aee 100644
--- a/src/Clients/MainApp/FSpot/SelectionDataExtensions.cs
+++ b/src/Clients/MainApp/FSpot/SelectionDataExtensions.cs
@@ -29,18 +29,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Text;
-using System.Linq;
-
+//
+
+using System;
+using System.Linq;
+using System.Text;
+
+using FSpot.Core;
+using FSpot.Utils;
+
+using Gdk;
using Gtk;
-using Gdk;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/SendEmail.cs b/src/Clients/MainApp/FSpot/SendEmail.cs
index 602e6db..933a668 100644
--- a/src/Clients/MainApp/FSpot/SendEmail.cs
+++ b/src/Clients/MainApp/FSpot/SendEmail.cs
@@ -31,19 +31,20 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using GLib;
-using System;
-
-using FSpot.Core;
-using FSpot.Widgets;
-using FSpot.Filters;
-using FSpot.UI.Dialog;
-
-using Hyena;
-using Hyena.Widgets;
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/SingleView.cs b/src/Clients/MainApp/FSpot/SingleView.cs
index 8607683..4529b86 100644
--- a/src/Clients/MainApp/FSpot/SingleView.cs
+++ b/src/Clients/MainApp/FSpot/SingleView.cs
@@ -29,24 +29,26 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using Gdk;
-using System;
-using System.Collections.Generic;
-
-using Mono.Addins;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Platform;
+using FSpot.UI.Dialog;
+using FSpot.Utils;
+using FSpot.Widgets;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
+using Mono.Addins;
using Mono.Unix;
-using Hyena;
-using FSpot.Extensions;
-using FSpot.Utils;
-using FSpot.UI.Dialog;
-using FSpot.Widgets;
-using FSpot.Platform;
-using FSpot.Core;
-
namespace FSpot {
public class SingleView {
[GtkBeans.Builder.Object] Gtk.HBox toolbar_hbox;
diff --git a/src/Clients/MainApp/FSpot/TagQueryWidget.cs b/src/Clients/MainApp/FSpot/TagQueryWidget.cs
index 94fe2e8..012e559 100644
--- a/src/Clients/MainApp/FSpot/TagQueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/TagQueryWidget.cs
@@ -27,19 +27,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Query;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Mono.Unix;
-using Gtk;
-using Gdk;
-
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Query;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/TagSelectionWidget.cs b/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
index afc3a8e..62e1cff 100644
--- a/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
+++ b/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
@@ -27,29 +27,23 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System;
-
-using GLib;
-
-using Gdk;
-
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Utils;
+using FSpot.Widgets;
+
+using Gdk;
+using Gtk;
+
+using Hyena.Widgets;
+
using Mono.Unix;
-using FSpot;
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Utils;
-using FSpot.Widgets;
-using FSpot.UI.Dialog;
-using Hyena.Widgets;
-
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/TagStore.cs b/src/Clients/MainApp/FSpot/TagStore.cs
index a532434..5f5a2ff 100644
--- a/src/Clients/MainApp/FSpot/TagStore.cs
+++ b/src/Clients/MainApp/FSpot/TagStore.cs
@@ -29,23 +29,21 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gdk;
-using Gtk;
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Jobs;
+using FSpot.Utils;
+
+using Hyena;
+using Hyena.Data.Sqlite;
+
using Mono.Unix;
-using System.Collections.Generic;
-using System.Collections;
-using System.IO;
-using System;
-using FSpot;
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Jobs;
-using FSpot.Query;
-using FSpot.Utils;
-using Hyena;
-using Hyena.Data.Sqlite;
namespace FSpot {
public class InvalidTagOperationException : InvalidOperationException {
diff --git a/src/Clients/MainApp/FSpot/Term.cs b/src/Clients/MainApp/FSpot/Term.cs
index b79e595..da70b29 100644
--- a/src/Clients/MainApp/FSpot/Term.cs
+++ b/src/Clients/MainApp/FSpot/Term.cs
@@ -32,16 +32,19 @@
// This has to do with Finding photos based on tags
// http://mail.gnome.org/archives/f-spot-list/2005-November/msg00053.html
-// http://bugzilla-attachments.gnome.org/attachment.cgi?id=54566
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
+// http://bugzilla-attachments.gnome.org/attachment.cgi?id=54566
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using FSpot.Core;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using Gtk;
-using Gdk;
-using Hyena;
-using FSpot.Core;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/ThumbnailCache.cs b/src/Clients/MainApp/FSpot/ThumbnailCache.cs
index c785c5e..e493b85 100644
--- a/src/Clients/MainApp/FSpot/ThumbnailCache.cs
+++ b/src/Clients/MainApp/FSpot/ThumbnailCache.cs
@@ -30,15 +30,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Gdk;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Utils;
+
+using Gdk;
+
using Hyena;
-using FSpot.Utils;
namespace FSpot
{
diff --git a/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs b/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
index 26e7233..f91b40d 100644
--- a/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
+++ b/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
@@ -29,16 +29,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Hyena;
-using FSpot.Utils;
-using FSpot.Platform;
-
-using Mono.Unix.Native;
-using GFileInfo = GLib.FileInfo;
-
+//
+
+using FSpot.Utils;
+
+using Hyena;
+
namespace FSpot {
public class ThumbnailLoader : ImageLoaderThread {
diff --git a/src/Clients/MainApp/FSpot/TimeAdaptor.cs b/src/Clients/MainApp/FSpot/TimeAdaptor.cs
index 33c970f..3e12207 100644
--- a/src/Clients/MainApp/FSpot/TimeAdaptor.cs
+++ b/src/Clients/MainApp/FSpot/TimeAdaptor.cs
@@ -31,13 +31,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Threading;
-using System.Collections.Generic;
-using FSpot.Core;
-using FSpot.Query;
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.Query;
+
using Hyena;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/UriCollection.cs b/src/Clients/MainApp/FSpot/UriCollection.cs
index 85f168f..95e917e 100644
--- a/src/Clients/MainApp/FSpot/UriCollection.cs
+++ b/src/Clients/MainApp/FSpot/UriCollection.cs
@@ -27,19 +27,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Xml;
-
+//
+
+using System.Collections.Generic;
+using System.Xml;
+
+using FSpot.Core;
+using FSpot.Imaging;
+
using Hyena;
-using GLib;
-
-using FSpot.Core;
-using FSpot.Imaging;
namespace FSpot {
public class UriCollection : PhotoList {
diff --git a/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs b/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
index 1c4e0b6..9824c85 100644
--- a/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
+++ b/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
@@ -27,16 +27,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System;
+
+using Gdk;
using Gtk;
-using Gdk;
-using System;
-using GLib;
-using System.Runtime.InteropServices;
-using FSpot;
-using FSpot.Utils;
-using Hyena;
namespace FSpot {
public class XScreenSaverSlide : Gtk.Window {
diff --git a/src/Clients/MainApp/FSpot/main.cs b/src/Clients/MainApp/FSpot/main.cs
index 64b44db..9684022 100644
--- a/src/Clients/MainApp/FSpot/main.cs
+++ b/src/Clients/MainApp/FSpot/main.cs
@@ -31,27 +31,23 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using System;
-using System.Reflection;
-using System.IO;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Reflection;
+
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Hyena;
+using Hyena.CommandLine;
+using Hyena.Gui;
+
+using Mono.Addins;
+using Mono.Addins.Setup;
using Mono.Unix;
-using Mono.Addins;
-using Mono.Addins.Setup;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.UI.Dialog;
-using FSpot.Extensions;
-using FSpot.Imaging;
-using Hyena;
-using Hyena.CommandLine;
-using Hyena.Gui;
namespace FSpot
{
diff --git a/src/Clients/MainApp/ImageLoaderThread.cs b/src/Clients/MainApp/ImageLoaderThread.cs
index 4668f6f..80c9cbc 100644
--- a/src/Clients/MainApp/ImageLoaderThread.cs
+++ b/src/Clients/MainApp/ImageLoaderThread.cs
@@ -29,19 +29,20 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using Gdk;
-using Gtk;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-using System;
-
+//
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Hyena;
-using FSpot.Utils;
-using FSpot.Imaging;
-
public class ImageLoaderThread
{
// Types.
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index 6300e12..8cd79b0 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+ï<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003";>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -323,6 +323,8 @@
</MonoDevelop>
</ProjectExtensions>
<ItemGroup>
+ <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
<Reference Include="System.Data" />
diff --git a/src/Clients/MainApp/PhotoTagMenu.cs b/src/Clients/MainApp/PhotoTagMenu.cs
index bf183c6..43a0c39 100644
--- a/src/Clients/MainApp/PhotoTagMenu.cs
+++ b/src/Clients/MainApp/PhotoTagMenu.cs
@@ -26,15 +26,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using Gtk;
-
-using FSpot;
-using FSpot.Core;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+
+using Gtk;
+
using Hyena;
public class PhotoTagMenu : Menu {
diff --git a/src/Clients/MainApp/PhotoVersionCommands.cs b/src/Clients/MainApp/PhotoVersionCommands.cs
index 873733c..4c34b93 100644
--- a/src/Clients/MainApp/PhotoVersionCommands.cs
+++ b/src/Clients/MainApp/PhotoVersionCommands.cs
@@ -29,15 +29,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using System;
+//
+
+using System;
+
+using FSpot;
+using FSpot.UI.Dialog;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
-using FSpot;
-using Hyena;
-using Hyena.Widgets;
-using FSpot.UI.Dialog;
public class PhotoVersionCommands
{
diff --git a/src/Clients/MainApp/PhotoVersionMenu.cs b/src/Clients/MainApp/PhotoVersionMenu.cs
index 6e4fbbc..de794d9 100644
--- a/src/Clients/MainApp/PhotoVersionMenu.cs
+++ b/src/Clients/MainApp/PhotoVersionMenu.cs
@@ -27,18 +27,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+
using Gtk;
-using System;
-using System.Collections.Generic;
-
-using FSpot;
-using FSpot.Core;
-
-
public class PhotoVersionMenu : Menu {
public IPhotoVersion Version {
diff --git a/src/Clients/MainApp/Pinta/CairoExtensions.cs b/src/Clients/MainApp/Pinta/CairoExtensions.cs
index 2a663af..f443427 100644
--- a/src/Clients/MainApp/Pinta/CairoExtensions.cs
+++ b/src/Clients/MainApp/Pinta/CairoExtensions.cs
@@ -34,8 +34,8 @@
/////////////////////////////////////////////////////////////////////////////////
using System;
+
using Cairo;
-using System.Collections.Generic;
namespace Pinta.Core
{
diff --git a/src/Clients/MainApp/Pinta/ColorBgra.cs b/src/Clients/MainApp/Pinta/ColorBgra.cs
index d07ec11..8525453 100644
--- a/src/Clients/MainApp/Pinta/ColorBgra.cs
+++ b/src/Clients/MainApp/Pinta/ColorBgra.cs
@@ -6,9 +6,6 @@
/////////////////////////////////////////////////////////////////////////////////
using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Reflection;
using System.Runtime.InteropServices;
namespace Pinta.Core
diff --git a/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs b/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs
index 2009e6f..6d9d029 100644
--- a/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs
+++ b/src/Clients/MainApp/Pinta/GaussianBlurEffect.cs
@@ -7,10 +7,9 @@
// Ported to Pinta by: Jonathan Pobst <monkey jpobst com> //
/////////////////////////////////////////////////////////////////////////////////
-using System;
using Cairo;
+
using Pinta.Core;
-using Mono.Unix;
namespace Pinta.Effects
{
diff --git a/src/Clients/MainApp/PixbufUtils.cs b/src/Clients/MainApp/PixbufUtils.cs
index 4594ca4..ff35366 100644
--- a/src/Clients/MainApp/PixbufUtils.cs
+++ b/src/Clients/MainApp/PixbufUtils.cs
@@ -29,23 +29,28 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using Gdk;
-using System.Collections;
-using System.Runtime.InteropServices;
-using System;
-using System.IO;
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Imaging;
-using Hyena;
+//
+
+using System;
+using System.IO;
+using System.Runtime.InteropServices;
+
+using Cairo;
+
+using FSpot;
+using FSpot.Core;
+using FSpot.Imaging;
+using FSpot.UI.Dialog;
+using FSpot.Utils;
+
+using Gdk;
+
+using Hyena;
+
+using Pinta.Core;
+using Pinta.Effects;
+
using TagLib.Image;
-using Cairo;
-using FSpot.UI.Dialog;
-
-using Pinta.Core;
-using Pinta.Effects;
public static class PixbufUtils
{
@@ -67,9 +72,9 @@ public static class PixbufUtils
out int fit_width, out int fit_height)
{
return Fit (pixbuf.Width, pixbuf.Height,
- dest_width, dest_height,
- upscale_smaller,
- out fit_width, out fit_height);
+ dest_width, dest_height,
+ upscale_smaller,
+ out fit_width, out fit_height);
}
public static double Fit (int orig_width, int orig_height,
@@ -251,10 +256,10 @@ public static class PixbufUtils
Pixbuf flattened = new Pixbuf (Colorspace.Rgb, false, 8, pixbuf.Width, pixbuf.Height);
pixbuf.CompositeColor (flattened, 0, 0,
- pixbuf.Width, pixbuf.Height,
- 0, 0, 1, 1,
- InterpType.Bilinear,
- 255, 0, 0, 2000, 0xffffff, 0xffffff);
+ pixbuf.Width, pixbuf.Height,
+ 0, 0, 1, 1,
+ InterpType.Bilinear,
+ 255, 0, 0, 2000, 0xffffff, 0xffffff);
return flattened;
}
@@ -278,10 +283,10 @@ public static class PixbufUtils
}
unsafe public static Pixbuf UnsharpMask (Pixbuf src,
- double radius,
- double amount,
- double threshold,
- ThreadProgressDialog progressDialog)
+ double radius,
+ double amount,
+ double threshold,
+ ThreadProgressDialog progressDialog)
{
// Make sure the pixbuf has an alpha channel before we try to blur it
src = src.AddAlpha (false, 0, 0, 0);
@@ -361,7 +366,7 @@ public static class PixbufUtils
g.SetSource (surf);
g.Paint ();
}
-
+
return newsurf;
}
@@ -392,7 +397,7 @@ public static class PixbufUtils
int adjusted_blue = (int)(s [2] * BLUE_FACTOR);
if (adjusted_red >= adjusted_green - threshold
- && adjusted_red >= adjusted_blue - threshold)
+ && adjusted_red >= adjusted_blue - threshold)
s [0] = (byte)(((double)(adjusted_green + adjusted_blue)) / (2.0 * RED_FACTOR));
s += channels;
}
@@ -416,9 +421,9 @@ public static class PixbufUtils
}
public static unsafe void ColorAdjust (Pixbuf src, Pixbuf dest,
- double brightness, double contrast,
- double hue, double saturation,
- int src_color, int dest_color)
+ double brightness, double contrast,
+ double hue, double saturation,
+ int src_color, int dest_color)
{
if (src.Width != dest.Width || src.Height != dest.Height)
throw new Exception ("Invalid Dimensions");
@@ -452,8 +457,8 @@ public static class PixbufUtils
for (int row = 0; row < src.Height; row++) {
trans.Apply ((IntPtr)(srcpix + row * src.Rowstride),
- (IntPtr)(destpix + row * dest.Rowstride),
- (uint)width);
+ (IntPtr)(destpix + row * dest.Rowstride),
+ (uint)width);
}
}
@@ -584,7 +589,7 @@ public static class PixbufUtils
[DllImport("libgdk_pixbuf-2.0-0.dll")]
static extern bool gdk_pixbuf_save (IntPtr raw, IntPtr filename, IntPtr type, out IntPtr error,
- IntPtr optlabel1, IntPtr optvalue1, IntPtr dummy);
+ IntPtr optlabel1, IntPtr optvalue1, IntPtr dummy);
private static bool Save (this Pixbuf pixbuf, string filename, string type, uint jpeg_quality)
{
diff --git a/src/Clients/MainApp/TagCommands.cs b/src/Clients/MainApp/TagCommands.cs
index 82276f4..03f17de 100644
--- a/src/Clients/MainApp/TagCommands.cs
+++ b/src/Clients/MainApp/TagCommands.cs
@@ -29,23 +29,21 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gtk;
-using Gdk;
-
-using System;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot;
+using FSpot.Core;
+using FSpot.UI.Dialog;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.UI.Dialog;
-using FSpot.Widgets;
-using Hyena;
public class TagCommands {
diff --git a/src/Clients/MainApp/TagPopup.cs b/src/Clients/MainApp/TagPopup.cs
index 51abf8f..37bd780 100644
--- a/src/Clients/MainApp/TagPopup.cs
+++ b/src/Clients/MainApp/TagPopup.cs
@@ -31,12 +31,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
+//
+
+using System;
+
+using FSpot;
+using FSpot.Core;
+using FSpot.Utils;
+
using Mono.Unix;
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
public class TagPopup
{
@@ -48,18 +51,18 @@ public class TagPopup
Gtk.Menu popup_menu = new Gtk.Menu ();
GtkUtil.MakeMenuItem (popup_menu,
- String.Format (Catalog.GetPluralString ("Find", "Find", tags.Length), tags.Length),
- "gtk-add",
- new EventHandler (App.Instance.Organizer.HandleIncludeTag),
- true
- );
+ String.Format (Catalog.GetPluralString ("Find", "Find", tags.Length), tags.Length),
+ "gtk-add",
+ new EventHandler (App.Instance.Organizer.HandleIncludeTag),
+ true
+ );
FSpot.TermMenuItem.Create (tags, popup_menu);
GtkUtil.MakeMenuSeparator (popup_menu);
GtkUtil.MakeMenuItem (popup_menu, Catalog.GetString ("Create New Tag..."), "tag-new",
- App.Instance.Organizer.HandleCreateNewCategoryCommand, true);
+ App.Instance.Organizer.HandleCreateNewCategoryCommand, true);
GtkUtil.MakeMenuSeparator (popup_menu);
@@ -75,18 +78,18 @@ public class TagPopup
GtkUtil.MakeMenuSeparator (popup_menu);
GtkUtil.MakeMenuItem (popup_menu,
- Catalog.GetPluralString ("Attach Tag to Selection", "Attach Tags to Selection", tags_count), "gtk-add",
- new EventHandler (App.Instance.Organizer.HandleAttachTagCommand), tag != null && photo_count > 0);
+ Catalog.GetPluralString ("Attach Tag to Selection", "Attach Tags to Selection", tags_count), "gtk-add",
+ new EventHandler (App.Instance.Organizer.HandleAttachTagCommand), tag != null && photo_count > 0);
GtkUtil.MakeMenuItem (popup_menu,
- Catalog.GetPluralString ("Remove Tag From Selection", "Remove Tags From Selection", tags_count), "gtk-remove",
- new EventHandler (App.Instance.Organizer.HandleRemoveTagCommand), tag != null && photo_count > 0);
+ Catalog.GetPluralString ("Remove Tag From Selection", "Remove Tags From Selection", tags_count), "gtk-remove",
+ new EventHandler (App.Instance.Organizer.HandleRemoveTagCommand), tag != null && photo_count > 0);
if (tags_count > 1 && tag != null) {
GtkUtil.MakeMenuSeparator (popup_menu);
GtkUtil.MakeMenuItem (popup_menu, Catalog.GetString ("Merge Tags"),
- new EventHandler (App.Instance.Organizer.HandleMergeTagsCommand), true);
+ new EventHandler (App.Instance.Organizer.HandleMergeTagsCommand), true);
}
diff --git a/src/Clients/MainApp/ThumbnailCommand.cs b/src/Clients/MainApp/ThumbnailCommand.cs
index ba36a81..3a40058 100644
--- a/src/Clients/MainApp/ThumbnailCommand.cs
+++ b/src/Clients/MainApp/ThumbnailCommand.cs
@@ -27,14 +27,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gtk;
-using FSpot;
-using FSpot.Core;
+//
+
+using System;
+
+using FSpot;
+using FSpot.Core;
+using FSpot.UI.Dialog;
using FSpot.Utils;
-using FSpot.UI.Dialog;
public class ThumbnailCommand {
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs b/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs
index b007ab5..1809d6f 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/Animation.cs
@@ -31,6 +31,7 @@
using System;
using System.ComponentModel;
+
using GLibBeans;
namespace FSpot.Bling
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
index 99647c0..a31e93c 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Bling
{ public class CubicEase : EasingFunction
{
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
index 3542641..f1c0fb0 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Bling
{ public abstract class QuinticEase : EasingFunction
{
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs b/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs
index 25fea0c..425f6b3 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIELCh.cs
@@ -27,13 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
-using System.Collections;
-using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
-
namespace Cms {
public struct ColorCIELCh {
public double L;
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIELab.cs b/src/Core/FSpot.Cms/Cms/ColorCIELab.cs
index 5c14bde..9ffd5c6 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIELab.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIELab.cs
@@ -28,11 +28,6 @@
//
using System;
-using System.IO;
-using System.Collections;
-using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
namespace Cms {
public struct ColorCIELab {
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs b/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs
index 479a69a..e6440b9 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIEXYZ.cs
@@ -28,11 +28,7 @@
//
using System;
-using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
namespace Cms {
public struct ColorCIEXYZ {
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs b/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
index 7397bb9..8cdca5d 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
@@ -25,14 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections;
+//
+
+using System;
+using System.IO;
+using System.Reflection;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
namespace Cms {
public struct ColorCIExyY {
diff --git a/src/Core/FSpot.Cms/Cms/GammaTable.cs b/src/Core/FSpot.Cms/Cms/GammaTable.cs
index 8d95350..5605b77 100644
--- a/src/Core/FSpot.Cms/Cms/GammaTable.cs
+++ b/src/Core/FSpot.Cms/Cms/GammaTable.cs
@@ -28,11 +28,7 @@
//
using System;
-using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
namespace Cms {
public class GammaTable : IDisposable {
diff --git a/src/Core/FSpot.Cms/Cms/Profile.cs b/src/Core/FSpot.Cms/Cms/Profile.cs
index c469858..deef8ed 100644
--- a/src/Core/FSpot.Cms/Cms/Profile.cs
+++ b/src/Core/FSpot.Cms/Cms/Profile.cs
@@ -28,11 +28,7 @@
//
using System;
-using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
namespace Cms {
public class Profile : IDisposable {
diff --git a/src/Core/FSpot.Cms/Cms/Transform.cs b/src/Core/FSpot.Cms/Cms/Transform.cs
index 2ceddc8..d7816e4 100644
--- a/src/Core/FSpot.Cms/Cms/Transform.cs
+++ b/src/Core/FSpot.Cms/Cms/Transform.cs
@@ -28,11 +28,7 @@
//
using System;
-using System.IO;
-using System.Collections;
using System.Runtime.InteropServices;
-using System.Reflection;
-using System.Runtime.Serialization;
namespace Cms {
public class Transform : IDisposable {
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
index 87bb6e1..d2c9fba 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Collections.Generic;
-
namespace FSpot.Core {
public class BrowsableCollectionProxy : IBrowsableCollection {
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs
index 7df9e43..b31354b 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsableEventArgs.cs
@@ -29,8 +29,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Core
{
public class BrowsableEventArgs : System.EventArgs {
diff --git a/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs b/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
index 834e3e8..a2f336f 100644
--- a/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
@@ -25,16 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-using System.Xml;
-
-using Hyena;
-using FSpot.Utils;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Utils;
+
+using Hyena;
+
using Mono.Unix.Native;
namespace FSpot.Core
diff --git a/src/Core/FSpot.Core/FSpot.Core/Global.cs b/src/Core/FSpot.Core/FSpot.Core/Global.cs
index 4e9596d..02320c3 100644
--- a/src/Core/FSpot.Core/FSpot.Core/Global.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/Global.cs
@@ -32,6 +32,7 @@
//
using System;
+
using Hyena;
namespace FSpot.Core {
diff --git a/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs b/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs
index 44f07d0..0070b46 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IPhoto.cs
@@ -29,9 +29,6 @@
using System.Collections.Generic;
-using Hyena;
-
-
namespace FSpot.Core
{
diff --git a/src/Core/FSpot.Core/FSpot.Core/IPhotoComparer.cs b/src/Core/FSpot.Core/FSpot.Core/IPhotoComparer.cs
index 4e969d2..8cefeab 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IPhotoComparer.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IPhotoComparer.cs
@@ -28,6 +28,7 @@
//
using System;
+// FIXME: Why do we still have System.Collections here
using System.Collections;
using System.Collections.Generic;
diff --git a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs
index bbd6c6e..d2d84de 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersion.cs
@@ -29,7 +29,6 @@
using Hyena;
-
namespace FSpot.Core
{
diff --git a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs
index 0a3eee6..8d2dedf 100644
--- a/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/IPhotoVersionable.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Collections.Generic;
-
namespace FSpot.Core
{
/// <summary>
diff --git a/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs b/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
index cb903c4..9652153 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
namespace FSpot.Core
diff --git a/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs b/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
index f986eba..c9657cb 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
@@ -28,7 +28,6 @@
//
using System;
-using System.Collections.Generic;
namespace FSpot.Core
{
diff --git a/src/Core/FSpot.Core/FSpot.Core/Roll.cs b/src/Core/FSpot.Core/FSpot.Core/Roll.cs
index f99e31a..61d36a3 100644
--- a/src/Core/FSpot.Core/FSpot.Core/Roll.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/Roll.cs
@@ -32,6 +32,7 @@
//
using System;
+
using Hyena;
namespace FSpot.Core
diff --git a/src/Core/FSpot.Core/FSpot.Core/Tag.cs b/src/Core/FSpot.Core/FSpot.Core/Tag.cs
index 912d807..bd4efc4 100644
--- a/src/Core/FSpot.Core/FSpot.Core/Tag.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/Tag.cs
@@ -27,11 +27,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gdk;
-using FSpot.Utils;
+//
+
+using System;
+
+using FSpot.Utils;
+
+using Gdk;
+
using Hyena;
namespace FSpot.Core
diff --git a/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs b/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
index 3e4d87b..db8de5b 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
+++ b/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
@@ -25,13 +25,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Runtime.InteropServices;
-using Gdk;
-using Gtk;
-using FSpot.Utils;
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Hyena;
namespace FSpot.Gui {
diff --git a/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs b/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs
index 9c1645e..e2040e2 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs
+++ b/src/Core/FSpot.Gui/FSpot.Gui/WindowOpacityFader.cs
@@ -28,7 +28,7 @@
//
using System;
-using Gtk;
+
using FSpot.Bling;
namespace FSpot.Gui
diff --git a/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
index cf7f0b1..a09ec85 100644
--- a/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
@@ -27,15 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
using Cairo;
using Gdk;
-using FSpot.Utils;
-
-using Color = Cairo.Color;
-
namespace FSpot.Transitions
{
public abstract class CairoTransition : SlideShowTransition
diff --git a/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
index 042c122..afcc74a 100644
--- a/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
@@ -27,15 +27,8 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
-using Cairo;
using Gdk;
-using FSpot.Utils;
-
-using Color = Cairo.Color;
-
namespace FSpot.Transitions
{
public abstract class SlideShowTransition
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs b/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs
index 19533ca..131d699 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/BuilderWindow.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using GtkBeans;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
index 8a31ab4..1e521f1 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
@@ -33,9 +33,6 @@ using System.Collections.Generic;
using Gtk;
using Gdk;
-using Hyena;
-
-
namespace FSpot.Widgets
{
/// <summary>
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs
index 079e0da..7648075 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CheckPattern.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Gdk;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs b/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
index 37d4a6e..d93e8f7 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
@@ -25,12 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
+//
+
+using System;
+using System.Collections.Generic;
+
+using Gdk;
using Gtk;
-using Gdk;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
index f90f609..29b74a6 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
@@ -27,12 +27,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using System;
+
+using Gtk;
+
using Mono.Unix;
-using Gtk;
-using FSpot.Utils;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs b/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
index 9b2964f..c8d5cf4 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
@@ -25,11 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using System;
+
+using Gtk;
+
using Mono.Unix;
-using Gtk;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs b/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
index 975f182..5f3b439 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Gtk;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
index 8843d85..b464b31 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
@@ -27,20 +27,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-using System.Runtime.InteropServices;
-
-using Gtk;
-using Gdk;
-
-using FSpot.Utils;
+//
+
+using System;
+
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
using TagLib.Image;
-using Hyena;
-
namespace FSpot.Widgets
{
public partial class ImageView : Container
@@ -183,14 +182,14 @@ namespace FSpot.Widgets
}
}
- double zoom = 1.0;
- public double Zoom {
- get { return zoom; }
- set {
- // Zoom around the center of the image.
- DoZoom (value, Allocation.Width / 2, Allocation.Height / 2);
- }
- }
+ double zoom = 1.0;
+ public double Zoom {
+ get { return zoom; }
+ set {
+ // Zoom around the center of the image.
+ DoZoom (value, Allocation.Width / 2, Allocation.Height / 2);
+ }
+ }
public void ZoomIn ()
{
@@ -207,27 +206,27 @@ namespace FSpot.Widgets
DoZoom (zoom * zoom_increment, x, y);
}
- public bool Fit { get; private set; }
+ public bool Fit { get; private set; }
- public void ZoomFit (bool upscale)
- {
- Gtk.ScrolledWindow scrolled = Parent as Gtk.ScrolledWindow;
- if (scrolled != null)
- scrolled.SetPolicy (Gtk.PolicyType.Never, Gtk.PolicyType.Never);
+ public void ZoomFit (bool upscale)
+ {
+ Gtk.ScrolledWindow scrolled = Parent as Gtk.ScrolledWindow;
+ if (scrolled != null)
+ scrolled.SetPolicy (Gtk.PolicyType.Never, Gtk.PolicyType.Never);
- min_zoom = ComputeMinZoom (upscale);
+ min_zoom = ComputeMinZoom (upscale);
- this.upscale = upscale;
+ this.upscale = upscale;
- Fit = true;
- DoZoom (MIN_ZOOM, Allocation.Width / 2, Allocation.Height / 2);
+ Fit = true;
+ DoZoom (MIN_ZOOM, Allocation.Width / 2, Allocation.Height / 2);
- if (scrolled != null) {
- ThreadAssist.ProxyToMain (() => {
- scrolled.SetPolicy (Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic);
- });
- }
- }
+ if (scrolled != null) {
+ ThreadAssist.ProxyToMain (() => {
+ scrolled.SetPolicy (Gtk.PolicyType.Automatic, Gtk.PolicyType.Automatic);
+ });
+ }
+ }
public Point WindowCoordsToImage (Point win)
{
@@ -308,82 +307,82 @@ namespace FSpot.Widgets
#region GtkWidgetry
- protected override void OnRealized ()
- {
- SetFlag (Gtk.WidgetFlags.Realized);
- GdkWindow = new Gdk.Window (ParentWindow,
- new Gdk.WindowAttr {
- WindowType = Gdk.WindowType.Child,
- X = Allocation.X,
- Y = Allocation.Y,
- Width = Allocation.Width,
- Height = Allocation.Height,
- Wclass = Gdk.WindowClass.InputOutput,
- Visual = ParentWindow.Visual,
- Colormap = ParentWindow.Colormap,
- Mask = this.Events
- | EventMask.ExposureMask
- | EventMask.ButtonPressMask
- | EventMask.ButtonReleaseMask
- | EventMask.PointerMotionMask
- | EventMask.PointerMotionHintMask
- | EventMask.ScrollMask
- | EventMask.KeyPressMask
- },
- Gdk.WindowAttributesType.X | Gdk.WindowAttributesType.Y |
- Gdk.WindowAttributesType.Visual | Gdk.WindowAttributesType.Colormap);
-
- GdkWindow.SetBackPixmap (null, false);
- GdkWindow.UserData = Handle;
-
- Style.Attach (GdkWindow);
- Style.SetBackground (GdkWindow, Gtk.StateType.Normal);
-
- OnRealizedChildren ();
- }
-
- protected override void OnMapped ()
- {
- SetFlag (Gtk.WidgetFlags.Mapped);
- OnMappedChildren ();
- GdkWindow.Show ();
- }
-
- protected override void OnSizeRequested (ref Gtk.Requisition requisition)
- {
- requisition.Width = requisition.Height = 0;
- OnSizeRequestedChildren ();
- }
-
- protected override void OnSizeAllocated (Gdk.Rectangle allocation)
- {
- min_zoom = ComputeMinZoom (upscale);
-
- if (Fit || zoom < MIN_ZOOM)
- zoom = MIN_ZOOM;
- // Since this affects the zoom_scale we should alert it
- EventHandler eh = ZoomChanged;
- if (eh != null)
- eh (this, System.EventArgs.Empty);
-
- ComputeScaledSize ();
-
- OnSizeAllocatedChildren ();
-
- if (IsRealized) {
- GdkWindow.MoveResize (allocation.X, allocation.Y, allocation.Width, allocation.Height);
- }
-
- if (XOffset > Hadjustment.Upper - Hadjustment.PageSize)
- ScrollTo ((int)(Hadjustment.Upper - Hadjustment.PageSize), YOffset, false);
- if (YOffset > Vadjustment.Upper - Vadjustment.PageSize)
- ScrollTo (XOffset, (int)(Vadjustment.Upper - Vadjustment.PageSize), false);
-
- base.OnSizeAllocated (allocation);
-
- if (Fit)
- ZoomFit (upscale);
- }
+ protected override void OnRealized ()
+ {
+ SetFlag (Gtk.WidgetFlags.Realized);
+ GdkWindow = new Gdk.Window (ParentWindow,
+ new Gdk.WindowAttr {
+ WindowType = Gdk.WindowType.Child,
+ X = Allocation.X,
+ Y = Allocation.Y,
+ Width = Allocation.Width,
+ Height = Allocation.Height,
+ Wclass = Gdk.WindowClass.InputOutput,
+ Visual = ParentWindow.Visual,
+ Colormap = ParentWindow.Colormap,
+ Mask = this.Events
+ | EventMask.ExposureMask
+ | EventMask.ButtonPressMask
+ | EventMask.ButtonReleaseMask
+ | EventMask.PointerMotionMask
+ | EventMask.PointerMotionHintMask
+ | EventMask.ScrollMask
+ | EventMask.KeyPressMask
+ },
+ Gdk.WindowAttributesType.X | Gdk.WindowAttributesType.Y |
+ Gdk.WindowAttributesType.Visual | Gdk.WindowAttributesType.Colormap);
+
+ GdkWindow.SetBackPixmap (null, false);
+ GdkWindow.UserData = Handle;
+
+ Style.Attach (GdkWindow);
+ Style.SetBackground (GdkWindow, Gtk.StateType.Normal);
+
+ OnRealizedChildren ();
+ }
+
+ protected override void OnMapped ()
+ {
+ SetFlag (Gtk.WidgetFlags.Mapped);
+ OnMappedChildren ();
+ GdkWindow.Show ();
+ }
+
+ protected override void OnSizeRequested (ref Gtk.Requisition requisition)
+ {
+ requisition.Width = requisition.Height = 0;
+ OnSizeRequestedChildren ();
+ }
+
+ protected override void OnSizeAllocated (Gdk.Rectangle allocation)
+ {
+ min_zoom = ComputeMinZoom (upscale);
+
+ if (Fit || zoom < MIN_ZOOM)
+ zoom = MIN_ZOOM;
+ // Since this affects the zoom_scale we should alert it
+ EventHandler eh = ZoomChanged;
+ if (eh != null)
+ eh (this, System.EventArgs.Empty);
+
+ ComputeScaledSize ();
+
+ OnSizeAllocatedChildren ();
+
+ if (IsRealized) {
+ GdkWindow.MoveResize (allocation.X, allocation.Y, allocation.Width, allocation.Height);
+ }
+
+ if (XOffset > Hadjustment.Upper - Hadjustment.PageSize)
+ ScrollTo ((int)(Hadjustment.Upper - Hadjustment.PageSize), YOffset, false);
+ if (YOffset > Vadjustment.Upper - Vadjustment.PageSize)
+ ScrollTo (XOffset, (int)(Vadjustment.Upper - Vadjustment.PageSize), false);
+
+ base.OnSizeAllocated (allocation);
+
+ if (Fit)
+ ZoomFit (upscale);
+ }
protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
@@ -393,7 +392,7 @@ namespace FSpot.Widgets
foreach (Rectangle area in evnt.Region.GetRectangles ())
{
var p_area = new Rectangle (Math.Max (0, area.X), Math.Max (0, area.Y),
- Math.Min (Allocation.Width, area.Width), Math.Min (Allocation.Height, area.Height));
+ Math.Min (Allocation.Width, area.Width), Math.Min (Allocation.Height, area.Height));
if (p_area == Rectangle.Zero)
continue;
@@ -571,58 +570,58 @@ namespace FSpot.Widgets
#region private painting, zooming and misc
- int XOffset { get; set;}
- int YOffset { get; set;}
-
- /// <summary>
- /// Zoom to the given factor.
- /// </summary>
- /// <param name='zoom'>
- /// A zoom factor, expressed as a double.
- /// </param>
- /// <param name='x'>
- /// The point of the viewport around which to zoom.
- /// </param>
- /// <param name='y'>
- /// The point of the viewport around which to zoom.
- /// </param>
- void DoZoom (double zoom, int x, int y)
- {
- Fit = zoom == MIN_ZOOM;
-
- if (zoom == this.zoom || System.Math.Abs (this.zoom - zoom) < System.Double.Epsilon) {
- // Don't recalculate if the zoom factor stays the same.
- return;
- }
-
- // Clamp the zoom factor within the [ MIN_ZOOM , MAX_ZOOM ] interval.
- zoom = Math.Max (Math.Min (zoom, MAX_ZOOM), MIN_ZOOM);
-
- this.zoom = zoom;
-
- int x_offset = scaled_width < Allocation.Width ? (int)(Allocation.Width - scaled_width) / 2 : -XOffset;
- int y_offset = scaled_height < Allocation.Height ? (int)(Allocation.Height - scaled_height) / 2 : -YOffset;
- double x_anchor = (double)(x - x_offset) / (double)scaled_width;
- double y_anchor = (double)(y - y_offset) / (double)scaled_height;
- ComputeScaledSize ();
-
- AdjustmentsChanged -= ScrollToAdjustments;
- if (scaled_width < Allocation.Width)
- Hadjustment.Value = XOffset = 0;
- else
- Hadjustment.Value = XOffset = Clamp ((int)(x_anchor * scaled_width - x), 0, (int)(Hadjustment.Upper - Hadjustment.PageSize));
- if (scaled_height < Allocation.Height)
- Vadjustment.Value = YOffset = 0;
- else
- Vadjustment.Value = YOffset = Clamp ((int)(y_anchor * scaled_height - y), 0, (int)(Vadjustment.Upper - Vadjustment.PageSize));
- AdjustmentsChanged += ScrollToAdjustments;
-
- EventHandler eh = ZoomChanged;
- if (eh != null)
- eh (this, EventArgs.Empty);
-
- QueueDraw ();
- }
+ int XOffset { get; set;}
+ int YOffset { get; set;}
+
+ /// <summary>
+ /// Zoom to the given factor.
+ /// </summary>
+ /// <param name='zoom'>
+ /// A zoom factor, expressed as a double.
+ /// </param>
+ /// <param name='x'>
+ /// The point of the viewport around which to zoom.
+ /// </param>
+ /// <param name='y'>
+ /// The point of the viewport around which to zoom.
+ /// </param>
+ void DoZoom (double zoom, int x, int y)
+ {
+ Fit = zoom == MIN_ZOOM;
+
+ if (zoom == this.zoom || System.Math.Abs (this.zoom - zoom) < System.Double.Epsilon) {
+ // Don't recalculate if the zoom factor stays the same.
+ return;
+ }
+
+ // Clamp the zoom factor within the [ MIN_ZOOM , MAX_ZOOM ] interval.
+ zoom = Math.Max (Math.Min (zoom, MAX_ZOOM), MIN_ZOOM);
+
+ this.zoom = zoom;
+
+ int x_offset = scaled_width < Allocation.Width ? (int)(Allocation.Width - scaled_width) / 2 : -XOffset;
+ int y_offset = scaled_height < Allocation.Height ? (int)(Allocation.Height - scaled_height) / 2 : -YOffset;
+ double x_anchor = (double)(x - x_offset) / (double)scaled_width;
+ double y_anchor = (double)(y - y_offset) / (double)scaled_height;
+ ComputeScaledSize ();
+
+ AdjustmentsChanged -= ScrollToAdjustments;
+ if (scaled_width < Allocation.Width)
+ Hadjustment.Value = XOffset = 0;
+ else
+ Hadjustment.Value = XOffset = Clamp ((int)(x_anchor * scaled_width - x), 0, (int)(Hadjustment.Upper - Hadjustment.PageSize));
+ if (scaled_height < Allocation.Height)
+ Vadjustment.Value = YOffset = 0;
+ else
+ Vadjustment.Value = YOffset = Clamp ((int)(y_anchor * scaled_height - y), 0, (int)(Vadjustment.Upper - Vadjustment.PageSize));
+ AdjustmentsChanged += ScrollToAdjustments;
+
+ EventHandler eh = ZoomChanged;
+ if (eh != null)
+ eh (this, EventArgs.Empty);
+
+ QueueDraw ();
+ }
void PaintBackground (Rectangle backgound, Rectangle area)
{
@@ -653,16 +652,16 @@ namespace FSpot.Widgets
//Short circuit for 1:1 zoom
if (zoom == 1.0 &&
- !Pixbuf.HasAlpha &&
- Pixbuf.BitsPerSample == 8 &&
- pixbuf_orientation == ImageOrientation.TopLeft) {
+ !Pixbuf.HasAlpha &&
+ Pixbuf.BitsPerSample == 8 &&
+ pixbuf_orientation == ImageOrientation.TopLeft) {
GdkWindow.DrawPixbuf (Style.BlackGC,
- Pixbuf,
- area.X - x_offset, area.Y - y_offset,
- area.X, area.Y,
- area.Width, area.Height,
- RgbDither.Max,
- area.X - x_offset, area.Y - y_offset);
+ Pixbuf,
+ area.X - x_offset, area.Y - y_offset,
+ area.X, area.Y,
+ area.Width, area.Height,
+ RgbDither.Max,
+ area.X - x_offset, area.Y - y_offset);
return;
}
@@ -678,25 +677,25 @@ namespace FSpot.Widgets
temp_pixbuf.Fill (0x00000000);
Pixbuf.CompositeColor (temp_pixbuf,
- 0, 0,
- pixbuf_area.Width, pixbuf_area.Height,
- -pixbuf_area.X, -pixbuf_area.Y,
- zoom, zoom,
- zoom == 1.0 ? InterpType.Nearest : interpolation, 255,
- pixbuf_area.X, pixbuf_area.Y,
- CheckPattern.CheckSize, CheckPattern.Color1, CheckPattern.Color2);
+ 0, 0,
+ pixbuf_area.Width, pixbuf_area.Height,
+ -pixbuf_area.X, -pixbuf_area.Y,
+ zoom, zoom,
+ zoom == 1.0 ? InterpType.Nearest : interpolation, 255,
+ pixbuf_area.X, pixbuf_area.Y,
+ CheckPattern.CheckSize, CheckPattern.Color1, CheckPattern.Color2);
ApplyColorTransform (temp_pixbuf);
using (var dest_pixbuf = PixbufUtils.TransformOrientation (temp_pixbuf, pixbuf_orientation)) {
GdkWindow.DrawPixbuf (Style.BlackGC,
- dest_pixbuf,
- 0, 0,
- area.X, area.Y,
- area.Width, area.Height,
- RgbDither.Max,
- area.X - x_offset, area.Y - y_offset);
+ dest_pixbuf,
+ 0, 0,
+ area.X, area.Y,
+ area.Width, area.Height,
+ RgbDither.Max,
+ area.X - x_offset, area.Y - y_offset);
}
}
}
@@ -873,7 +872,7 @@ namespace FSpot.Widgets
Rectangle win_sel = ImageCoordsToWindow (Selection);
is_dragging_selection = true;
if (Math.Abs (win_sel.X - evnt.X) < SELECTION_SNAP_DISTANCE &&
- Math.Abs (win_sel.Y - evnt.Y) < SELECTION_SNAP_DISTANCE) { //TopLeft
+ Math.Abs (win_sel.Y - evnt.Y) < SELECTION_SNAP_DISTANCE) { //TopLeft
selection_anchor = new Point (Selection.X + Selection.Width, Selection.Y + Selection.Height);
} else if (Math.Abs (win_sel.X + win_sel.Width - evnt.X) < SELECTION_SNAP_DISTANCE &&
Math.Abs (win_sel.Y - evnt.Y) < SELECTION_SNAP_DISTANCE) { //TopRight
@@ -940,7 +939,7 @@ namespace FSpot.Widgets
case DragMode.Extend:
Rectangle win_sel = ImageCoordsToWindow (Selection);
if (Math.Abs (win_sel.X - x) < SELECTION_SNAP_DISTANCE &&
- Math.Abs (win_sel.Y - y) < SELECTION_SNAP_DISTANCE) { //TopLeft
+ Math.Abs (win_sel.Y - y) < SELECTION_SNAP_DISTANCE) { //TopLeft
GdkWindow.Cursor = new Cursor (CursorType.TopLeftCorner);
} else if (Math.Abs (win_sel.X + win_sel.Width - x) < SELECTION_SNAP_DISTANCE &&
Math.Abs (win_sel.Y - y) < SELECTION_SNAP_DISTANCE) { //TopRight
@@ -983,8 +982,8 @@ namespace FSpot.Widgets
if (is_dragging_selection) {
Point win_anchor = ImageCoordsToWindow (selection_anchor);
if (Selection == Rectangle.Zero &&
- Math.Abs (evnt.X - win_anchor.X) < SELECTION_THRESHOLD &&
- Math.Abs (evnt.Y - win_anchor.Y) < SELECTION_THRESHOLD) {
+ Math.Abs (evnt.X - win_anchor.X) < SELECTION_THRESHOLD &&
+ Math.Abs (evnt.Y - win_anchor.Y) < SELECTION_THRESHOLD) {
SelectionSetPointer (x, y);
return true;
}
@@ -998,9 +997,9 @@ namespace FSpot.Widgets
else
Selection = ConstrainSelection (new Rectangle (Math.Min (selection_anchor.X, img.X),
- Math.Min (selection_anchor.Y, img.Y),
- Math.Abs (selection_anchor.X - img.X),
- Math.Abs (selection_anchor.Y - img.Y)),
+ Math.Min (selection_anchor.Y, img.Y),
+ Math.Abs (selection_anchor.X - img.X),
+ Math.Abs (selection_anchor.Y - img.Y)),
fixed_width, fixed_height);
SelectionSetPointer (x, y);
@@ -1024,7 +1023,7 @@ namespace FSpot.Widgets
{
double constrain = selection_xy_ratio;
if ((double)sel.Width > (double)sel.Height && selection_xy_ratio < 1 ||
- (double)sel.Width < (double)sel.Height && selection_xy_ratio > 1)
+ (double)sel.Width < (double)sel.Height && selection_xy_ratio > 1)
constrain = 1.0 / constrain;
@@ -1046,10 +1045,10 @@ namespace FSpot.Widgets
}
return new Rectangle (sel.X + width < Pixbuf.Width ? sel.X : Pixbuf.Width - width,
- sel.Y + height < Pixbuf.Height ? sel.Y : Pixbuf.Height - height,
- width, height);
+ sel.Y + height < Pixbuf.Height ? sel.Y : Pixbuf.Height - height,
+ width, height);
}
#endregion
- }
+ }
}
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
index ca6995d..02157bb 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
@@ -25,10 +25,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System.Collections.Generic;
+
using Gtk;
-using System.Collections.Generic;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs
index 57ee06d..fd0a7f5 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Panning.cs
@@ -28,7 +28,6 @@
//
using Gdk;
-using Gtk;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs b/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
index 50dab91..3f2a2f2 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
@@ -29,6 +29,7 @@
using System;
using System.Collections.Generic;
+
using Hyena;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
index 444eeb8..d71b604 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
@@ -33,8 +33,6 @@ using System;
using System.Collections.Generic;
using Gtk;
-using Gdk;
-using GLib;
using GtkBeans;
using Mono.Unix;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs b/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs
index 6fc6723..ef2977c 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/RatingEntry.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-
namespace FSpot.Widgets
{
public class RatingEntry : Hyena.Widgets.RatingEntry
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs b/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
index f47bb50..9d03d94 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
@@ -25,18 +25,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
-using Gdk;
-using Cairo;
-
+//
+
+using FSpot.Utils;
+
+using Gdk;
+
using Hyena.Gui;
-using FSpot.Utils;
-
-
namespace FSpot.Widgets
{
public class RatingRenderer : Hyena.Gui.RatingRenderer
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs
index 94e0092..c10f367 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/SaneTreeView.cs
@@ -38,6 +38,7 @@
*/
using System;
+
using Gdk;
using Gtk;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
index 3f4a270..bf7a40e 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
@@ -25,11 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
+//
+
+using System;
+
+using FSpot.Utils;
+
using Gtk;
-using FSpot.Utils;
namespace FSpot.Widgets {
public class ScrolledView : Fixed {
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs b/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
index 5973bba..787f133 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
@@ -1,37 +1,38 @@
-//
-// SelectionCollection.cs
-//
-// Author:
-// Mike GemÃnde <mike gemuende de>
-// Stephen Shaw <sshaw decriptor com>
-//
-// Copyright (C) 2010 Novell, Inc.
-// Copyright (C) 2010 Mike GemÃnde
-//
-// Permission is hereby granted, free of charge, to any person obtaining
-// a copy of this software and associated documentation files (the
-// "Software"), to deal in the Software without restriction, including
-// without limitation the rights to use, copy, modify, merge, publish,
-// distribute, sublicense, and/or sell copies of the Software, and to
-// permit persons to whom the Software is furnished to do so, subject to
-// the following conditions:
-//
-// The above copyright notice and this permission notice shall be
-// included in all copies or substantial portions of the Software.
-//
-// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
-// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Linq;
-using System.Collections;
-using System.Collections.Generic;
-
+//
+// SelectionCollection.cs
+//
+// Author:
+// Mike GemÃnde <mike gemuende de>
+// Stephen Shaw <sshaw decriptor com>
+//
+// Copyright (C) 2010 Novell, Inc.
+// Copyright (C) 2010 Mike GemÃnde
+//
+// Permission is hereby granted, free of charge, to any person obtaining
+// a copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to
+// permit persons to whom the Software is furnished to do so, subject to
+// the following conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED AS IS, WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+//
+using System;
+using System.Collections;
+using System.Collections.Generic;
+
+using System.Linq;
+
using FSpot.Core;
namespace FSpot.Widgets
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs
index acd39f4..ba5adc4 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ToolTipWindow.cs
@@ -28,7 +28,6 @@
//
using Gtk;
-using Gdk;
namespace FSpot.Widgets
{
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs
index a99581a..0cdf324 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IInstanceCriticalJob.cs
@@ -55,8 +55,6 @@
* DEALINGS IN THE SOFTWARE.
*/
-using System;
-
namespace Banshee.Kernel
{
public interface IInstanceCriticalJob : IJob
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs
index 3855c93..21184f7 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IJob.cs
@@ -55,8 +55,6 @@
* DEALINGS IN THE SOFTWARE.
*/
-using System;
-
namespace Banshee.Kernel
{
public interface IJob
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IntervalHeap.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IntervalHeap.cs
index ff791fc..d470044 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/IntervalHeap.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/IntervalHeap.cs
@@ -56,384 +56,385 @@
*/
using System;
+// FIXME: Do we still need System.Collections?
using System.Collections;
using System.Collections.Generic;
namespace Banshee.Kernel
{
- public class IntervalHeap<T> : ICollection<T>, ICollection, IEnumerable<T>, IEnumerable
- {
- private const int MIN_CAPACITY = 16;
-
- private int count;
- private int generation;
-
- private Interval [] heap;
-
- public IntervalHeap()
- {
- Clear();
- }
-
- public virtual T Pop()
- {
- if(count == 0) {
- throw new InvalidOperationException();
- }
-
- T item = heap[0].Item;
- MoveDown(0, heap[--count]);
- generation++;
-
- return item;
- }
-
- public virtual T Peek()
- {
- if(count == 0) {
- throw new InvalidOperationException();
- }
-
- return heap[0].Item;
- }
+ public class IntervalHeap<T> : ICollection<T>, ICollection, IEnumerable<T>, IEnumerable
+ {
+ private const int MIN_CAPACITY = 16;
+
+ private int count;
+ private int generation;
+
+ private Interval [] heap;
+
+ public IntervalHeap()
+ {
+ Clear();
+ }
+
+ public virtual T Pop()
+ {
+ if(count == 0) {
+ throw new InvalidOperationException();
+ }
+
+ T item = heap[0].Item;
+ MoveDown(0, heap[--count]);
+ generation++;
+
+ return item;
+ }
+
+ public virtual T Peek()
+ {
+ if(count == 0) {
+ throw new InvalidOperationException();
+ }
+
+ return heap[0].Item;
+ }
- public virtual void Push(T item, int priority)
- {
- if(item == null) {
- throw new ArgumentNullException("item");
- }
-
- if(count == heap.Length) {
- OptimalArrayResize(ref heap, 1);
- }
-
- MoveUp(++count - 1, new Interval(item, priority));
- generation++;
- }
-
- public virtual void Clear()
- {
- generation = 0;
- heap = new Interval[MIN_CAPACITY];
- }
-
- void ICollection.CopyTo(Array array, int index)
- {
- if(array == null) {
- throw new ArgumentNullException("array");
- }
+ public virtual void Push(T item, int priority)
+ {
+ if(item == null) {
+ throw new ArgumentNullException("item");
+ }
+
+ if(count == heap.Length) {
+ OptimalArrayResize(ref heap, 1);
+ }
+
+ MoveUp(++count - 1, new Interval(item, priority));
+ generation++;
+ }
+
+ public virtual void Clear()
+ {
+ generation = 0;
+ heap = new Interval[MIN_CAPACITY];
+ }
+
+ void ICollection.CopyTo(Array array, int index)
+ {
+ if(array == null) {
+ throw new ArgumentNullException("array");
+ }
- if(index < 0) {
- throw new ArgumentOutOfRangeException("index");
- }
+ if(index < 0) {
+ throw new ArgumentOutOfRangeException("index");
+ }
- Array.Copy(heap, 0, array, index, count);
- }
-
- public virtual void CopyTo(T [] array, int index)
- {
- if(array == null) {
- throw new ArgumentNullException("array");
- }
+ Array.Copy(heap, 0, array, index, count);
+ }
+
+ public virtual void CopyTo(T [] array, int index)
+ {
+ if(array == null) {
+ throw new ArgumentNullException("array");
+ }
- if(index < 0) {
- throw new ArgumentOutOfRangeException("index");
- }
+ if(index < 0) {
+ throw new ArgumentOutOfRangeException("index");
+ }
- Array.Copy(heap, 0, array, index, count);
- }
+ Array.Copy(heap, 0, array, index, count);
+ }
- public virtual bool Contains(T item)
- {
- if(item == null) {
- throw new ArgumentNullException("item");
- }
-
- return FindItemHeapIndex(item) >= 0;
- }
-
- public virtual void Add(T item)
- {
- if(item == null) {
- throw new ArgumentNullException("item");
- }
-
- Push(item, 0);
- }
-
- public virtual bool Remove(T item)
- {
- if(item == null) {
- throw new ArgumentNullException("item");
- }
-
- int index = FindItemHeapIndex(item);
-
- if(index < 0) {
- return false;
- }
-
- MoveDown(index, heap[--count]);
- generation++;
-
- return true;
- }
-
- public virtual void TrimExcess()
- {
- if(count < heap.Length * 0.9) {
- Array.Resize(ref heap, count);
- }
- }
-
- IEnumerator IEnumerable.GetEnumerator()
- {
- return GetEnumerator();
- }
-
- public virtual IEnumerator<T> GetEnumerator()
- {
- return new IntervalHeapEnumerator(this);
- }
-
- public static IntervalHeap<T> Synchronized(IntervalHeap<T> heap)
- {
- if(heap == null) {
- throw new ArgumentNullException("heap");
- }
-
- return new SyncIntervalHeap(heap);
- }
-
- private int FindItemHeapIndex(T item)
- {
- for(int i = 0; i < count; i++) {
- if(item.Equals(heap[i].Item)) {
- return i;
- }
- }
-
- return -1;
- }
-
- private static int GetLeftChildIndex(int index)
- {
- return index * 2 + 1;
- }
-
- private static int GetParentIndex(int index)
- {
- return (index - 1) / 2;
- }
-
- // grow array to nearest minimum power of two
- private static void OptimalArrayResize(ref Interval [] array, int grow)
- {
- int new_capacity = array.Length == 0 ? 1 : array.Length;
- int min_capacity = array.Length == 0 ? MIN_CAPACITY : array.Length + grow;
+ public virtual bool Contains(T item)
+ {
+ if(item == null) {
+ throw new ArgumentNullException("item");
+ }
+
+ return FindItemHeapIndex(item) >= 0;
+ }
+
+ public virtual void Add(T item)
+ {
+ if(item == null) {
+ throw new ArgumentNullException("item");
+ }
+
+ Push(item, 0);
+ }
+
+ public virtual bool Remove(T item)
+ {
+ if(item == null) {
+ throw new ArgumentNullException("item");
+ }
+
+ int index = FindItemHeapIndex(item);
+
+ if(index < 0) {
+ return false;
+ }
+
+ MoveDown(index, heap[--count]);
+ generation++;
+
+ return true;
+ }
+
+ public virtual void TrimExcess()
+ {
+ if(count < heap.Length * 0.9) {
+ Array.Resize(ref heap, count);
+ }
+ }
+
+ IEnumerator IEnumerable.GetEnumerator()
+ {
+ return GetEnumerator();
+ }
+
+ public virtual IEnumerator<T> GetEnumerator()
+ {
+ return new IntervalHeapEnumerator(this);
+ }
+
+ public static IntervalHeap<T> Synchronized(IntervalHeap<T> heap)
+ {
+ if(heap == null) {
+ throw new ArgumentNullException("heap");
+ }
+
+ return new SyncIntervalHeap(heap);
+ }
+
+ private int FindItemHeapIndex(T item)
+ {
+ for(int i = 0; i < count; i++) {
+ if(item.Equals(heap[i].Item)) {
+ return i;
+ }
+ }
+
+ return -1;
+ }
+
+ private static int GetLeftChildIndex(int index)
+ {
+ return index * 2 + 1;
+ }
+
+ private static int GetParentIndex(int index)
+ {
+ return (index - 1) / 2;
+ }
+
+ // grow array to nearest minimum power of two
+ private static void OptimalArrayResize(ref Interval [] array, int grow)
+ {
+ int new_capacity = array.Length == 0 ? 1 : array.Length;
+ int min_capacity = array.Length == 0 ? MIN_CAPACITY : array.Length + grow;
- while(new_capacity < min_capacity) {
- new_capacity <<= 1;
- }
+ while(new_capacity < min_capacity) {
+ new_capacity <<= 1;
+ }
- Array.Resize(ref array, new_capacity);
- }
+ Array.Resize(ref array, new_capacity);
+ }
- private void MoveUp(int index, Interval node)
- {
- int parent_index = GetParentIndex(index);
-
- while(index > 0 && heap[parent_index].Priority < node.Priority) {
- heap[index] = heap[parent_index];
- index = parent_index;
- parent_index = GetParentIndex(index);
- }
-
- heap[index] = node;
- }
-
- private void MoveDown(int index, Interval node)
- {
- int child_index = GetLeftChildIndex(index);
-
- while(child_index < count) {
- if(child_index + 1 < count
- && heap[child_index].Priority < heap[child_index + 1].Priority) {
- child_index++;
- }
-
- heap[index] = heap[child_index];
- index = child_index;
- child_index = GetLeftChildIndex(index);
- }
-
- MoveUp(index, node);
- }
+ private void MoveUp(int index, Interval node)
+ {
+ int parent_index = GetParentIndex(index);
+
+ while(index > 0 && heap[parent_index].Priority < node.Priority) {
+ heap[index] = heap[parent_index];
+ index = parent_index;
+ parent_index = GetParentIndex(index);
+ }
+
+ heap[index] = node;
+ }
+
+ private void MoveDown(int index, Interval node)
+ {
+ int child_index = GetLeftChildIndex(index);
+
+ while(child_index < count) {
+ if(child_index + 1 < count
+ && heap[child_index].Priority < heap[child_index + 1].Priority) {
+ child_index++;
+ }
+
+ heap[index] = heap[child_index];
+ index = child_index;
+ child_index = GetLeftChildIndex(index);
+ }
+
+ MoveUp(index, node);
+ }
- public virtual int Count {
- get { return count; }
- }
-
- public bool IsReadOnly {
- get { return false; }
- }
-
- public virtual object SyncRoot {
- get { return this; }
- }
-
- public virtual bool IsSynchronized {
- get { return false; }
- }
-
- private struct Interval
- {
- private T item;
- private int priority;
-
- public Interval(T item, int priority)
- {
- this.item = item;
- this.priority = priority;
- }
-
- public T Item {
- get { return item; }
- }
-
- public int Priority {
- get { return priority; }
- }
+ public virtual int Count {
+ get { return count; }
+ }
+
+ public bool IsReadOnly {
+ get { return false; }
+ }
+
+ public virtual object SyncRoot {
+ get { return this; }
+ }
+
+ public virtual bool IsSynchronized {
+ get { return false; }
+ }
+
+ private struct Interval
+ {
+ private T item;
+ private int priority;
+
+ public Interval(T item, int priority)
+ {
+ this.item = item;
+ this.priority = priority;
+ }
+
+ public T Item {
+ get { return item; }
+ }
+
+ public int Priority {
+ get { return priority; }
+ }
public override int GetHashCode ()
{
return priority.GetHashCode () ^ item.GetHashCode ();
}
- }
-
- private sealed class SyncIntervalHeap : IntervalHeap<T>
- {
- private IntervalHeap<T> heap;
-
- internal SyncIntervalHeap(IntervalHeap<T> heap)
- {
- this.heap = heap;
- }
-
- public override int Count {
- get { lock(heap) { return heap.Count; } }
- }
-
- public override bool IsSynchronized {
- get { return true; }
- }
-
- public override object SyncRoot {
- get { return heap.SyncRoot; }
- }
-
- public override void Clear()
- {
- lock(heap) { heap.Clear(); }
- }
-
- public override bool Contains(T item)
- {
- lock(heap) { return heap.Contains(item); }
- }
-
- public override T Pop()
- {
- lock(heap) { return heap.Pop(); }
- }
-
- public override T Peek()
- {
- lock(heap) { return heap.Peek(); }
- }
-
- public override void Push(T item, int priority)
- {
- lock(heap) { heap.Push(item, priority); }
- }
-
- public override void Add(T item)
- {
- lock(heap) { heap.Add(item); }
- }
-
- public override bool Remove(T item)
- {
- lock(heap) { return heap.Remove(item); }
- }
-
- public override void TrimExcess()
- {
- lock(heap) { heap.TrimExcess(); }
- }
-
- public override void CopyTo(T [] array, int index)
- {
- lock(heap) { heap.CopyTo(array, index); }
- }
-
- public override IEnumerator<T> GetEnumerator()
- {
- lock(heap) { return new IntervalHeapEnumerator(this); }
- }
- }
-
- private sealed class IntervalHeapEnumerator : IEnumerator<T>, IEnumerator
- {
- private IntervalHeap<T> heap;
- private int index;
- private int generation;
-
- public IntervalHeapEnumerator(IntervalHeap<T> heap)
- {
- this.heap = heap;
- Reset();
- }
-
- public void Reset()
- {
- generation = heap.generation;
- index = -1;
- }
-
- public void Dispose()
- {
- heap = null;
- }
+ }
+
+ private sealed class SyncIntervalHeap : IntervalHeap<T>
+ {
+ private IntervalHeap<T> heap;
+
+ internal SyncIntervalHeap(IntervalHeap<T> heap)
+ {
+ this.heap = heap;
+ }
+
+ public override int Count {
+ get { lock(heap) { return heap.Count; } }
+ }
+
+ public override bool IsSynchronized {
+ get { return true; }
+ }
+
+ public override object SyncRoot {
+ get { return heap.SyncRoot; }
+ }
+
+ public override void Clear()
+ {
+ lock(heap) { heap.Clear(); }
+ }
+
+ public override bool Contains(T item)
+ {
+ lock(heap) { return heap.Contains(item); }
+ }
+
+ public override T Pop()
+ {
+ lock(heap) { return heap.Pop(); }
+ }
+
+ public override T Peek()
+ {
+ lock(heap) { return heap.Peek(); }
+ }
+
+ public override void Push(T item, int priority)
+ {
+ lock(heap) { heap.Push(item, priority); }
+ }
+
+ public override void Add(T item)
+ {
+ lock(heap) { heap.Add(item); }
+ }
+
+ public override bool Remove(T item)
+ {
+ lock(heap) { return heap.Remove(item); }
+ }
+
+ public override void TrimExcess()
+ {
+ lock(heap) { heap.TrimExcess(); }
+ }
+
+ public override void CopyTo(T [] array, int index)
+ {
+ lock(heap) { heap.CopyTo(array, index); }
+ }
+
+ public override IEnumerator<T> GetEnumerator()
+ {
+ lock(heap) { return new IntervalHeapEnumerator(this); }
+ }
+ }
+
+ private sealed class IntervalHeapEnumerator : IEnumerator<T>, IEnumerator
+ {
+ private IntervalHeap<T> heap;
+ private int index;
+ private int generation;
+
+ public IntervalHeapEnumerator(IntervalHeap<T> heap)
+ {
+ this.heap = heap;
+ Reset();
+ }
+
+ public void Reset()
+ {
+ generation = heap.generation;
+ index = -1;
+ }
+
+ public void Dispose()
+ {
+ heap = null;
+ }
- public bool MoveNext()
- {
- if(generation != heap.generation) {
- throw new InvalidOperationException();
- }
-
- if(index + 1 == heap.count) {
- return false;
- }
-
- index++;
- return true;
- }
-
- object IEnumerator.Current {
- get { return Current; }
- }
+ public bool MoveNext()
+ {
+ if(generation != heap.generation) {
+ throw new InvalidOperationException();
+ }
+
+ if(index + 1 == heap.count) {
+ return false;
+ }
+
+ index++;
+ return true;
+ }
+
+ object IEnumerator.Current {
+ get { return Current; }
+ }
- public T Current {
- get {
- if(generation != heap.generation) {
- throw new InvalidOperationException();
- }
-
- return heap.heap[index].Item;
- }
- }
- }
- }
+ public T Current {
+ get {
+ if(generation != heap.generation) {
+ throw new InvalidOperationException();
+ }
+
+ return heap.heap[index].Item;
+ }
+ }
+ }
+ }
}
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs
index d9c309c..358fd4e 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/JobPriority.cs
@@ -55,8 +55,6 @@
* DEALINGS IN THE SOFTWARE.
*/
-using System;
-
namespace Banshee.Kernel
{
public enum JobPriority
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
index 575b9d2..e533a96 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
@@ -53,11 +53,12 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-
-using System;
-using System.Threading;
-using System.Collections.Generic;
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
using Hyena;
namespace Banshee.Kernel
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
index e420b93..fcd95d2 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
@@ -30,7 +30,6 @@
using System;
using System.Runtime.Serialization;
-
namespace FSpot
{
public class NotifyEventArgs : System.EventArgs
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs b/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
index b4e6742..6ef6360 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/ScreenSaver.cs
@@ -29,7 +29,6 @@
//
using System;
-using System.Runtime.InteropServices;
using DBus;
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs b/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
index 0cec2d0..84e3791 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/WebProxy.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Hyena;
namespace FSpot.Platform
diff --git a/src/Core/FSpot.Query/FSpot.Query/DateRange.cs b/src/Core/FSpot.Query/FSpot.Query/DateRange.cs
index e77a501..c3091d4 100644
--- a/src/Core/FSpot.Query/FSpot.Query/DateRange.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/DateRange.cs
@@ -28,6 +28,7 @@
//
using System;
+
using Hyena;
namespace FSpot.Query {
diff --git a/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs b/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
index 5f1ac52..d41c5d2 100644
--- a/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/FolderSet.cs
@@ -31,8 +31,8 @@
using System;
using System.Collections.Generic;
-using Hyena;
+using Hyena;
namespace FSpot.Query
{
diff --git a/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs b/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
index 3c4e5d6..ae7b618 100644
--- a/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
@@ -25,12 +25,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+
using Hyena;
-using FSpot.Core;
namespace FSpot.Query
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs b/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
index 15dc0a9..7481461 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
@@ -29,8 +29,8 @@
using System;
using System.Collections.Generic;
-using Hyena;
+using Hyena;
namespace FSpot.Utils
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
index 607575a..d5d1085 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/CairoUtils.cs
@@ -28,8 +28,8 @@
//
using System;
+
using Cairo;
-using System.Runtime.InteropServices;
namespace FSpot.Utils {
public class CairoUtils {
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
index 068a4dc..054e939 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/FileExtensions.cs
@@ -29,11 +29,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
-using Mono.Unix;
+
using GLib;
-using Hyena;
namespace FSpot.Utils
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs b/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
index d477648..7c5d2ca 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/GIOTagLibFileAbstraction.cs
@@ -29,7 +29,9 @@
using System;
using System.IO;
+
using GLib;
+
using Hyena;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
index 7804bac..54d1403 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
@@ -29,11 +29,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Gdk;
-using System.Runtime.InteropServices;
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+using Gdk;
+
using Hyena;
namespace FSpot.Utils {
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs b/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
index f1639b0..5b4f6b2 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/GtkUtil.cs
@@ -53,25 +53,25 @@ namespace FSpot.Utils
if (e != null)
i.Activated += e;
- i.Sensitive = enabled;
+ i.Sensitive = enabled;
menu.Append (i);
i.Show ();
- return i;
+ return i;
}
public static Gtk.MenuItem MakeMenuItem (Gtk.Menu menu, string label, string image_name, EventHandler e, bool enabled)
{
Gtk.ImageMenuItem i = new Gtk.ImageMenuItem (label);
i.Activated += e;
- i.Sensitive = enabled;
+ i.Sensitive = enabled;
i.Image = Gtk.Image.NewFromIconName (image_name, Gtk.IconSize.Menu);
menu.Append (i);
i.Show ();
- return i;
+ return i;
}
public static Gtk.MenuItem MakeCheckMenuItem (Gtk.Menu menu, string label, EventHandler e, bool enabled, bool active, bool as_radio)
@@ -81,12 +81,12 @@ namespace FSpot.Utils
i.DrawAsRadio = as_radio;
i.Active = active;
- i.Activated += e;
+ i.Activated += e;
menu.Append(i);
i.Show ();
- return i;
+ return i;
}
public static void MakeMenuSeparator (Gtk.Menu menu)
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs b/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
index bf65a31..c8453f5 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
@@ -25,12 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Hyena;
+//
+
+using System;
+
+using GLib;
+
+using Hyena;
+
using TagLib;
-using System;
-using GLib;
namespace FSpot.Utils
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
index 6c4a195..ae563a6 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/PixbufUtils.cs
@@ -30,8 +30,7 @@
//
using Gdk;
-using System;
-using System.Runtime.InteropServices;
+
using TagLib.Image;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs b/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
index de02098..9aeafda 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/RecursiveFileEnumerator.cs
@@ -29,9 +29,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections;
using System.Collections.Generic;
+
using GLib;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
index 9eb73cc..4144eaf 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
@@ -25,10 +25,11 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System;
+
using Hyena;
-using System;
namespace FSpot
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
index 81b2a3f..9d0fb8f 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/SidecarXmpExtensions.cs
@@ -31,7 +31,9 @@
using System;
using System.IO;
+
using Hyena;
+
using TagLib.Image;
using TagLib.Xmp;
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs b/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs
index 57a110d..a0c131d 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/TargetListExtensionMethods.cs
@@ -1,5 +1,4 @@
-using System;
-
+// FIXME: Missing license file?
using Gtk;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
index 3cfab05..a6853c2 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
@@ -25,11 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Collections.Generic;
-using System.Text;
-using System;
+//
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+
using Hyena;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
index a46b8bb..d9b71ab 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/UriUtils.cs
@@ -29,7 +29,6 @@
using System;
using System.Text;
-using System.IO;
namespace FSpot.Utils
{
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs b/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
index 5e42794..00d3371 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
@@ -25,11 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Gdk;
-using System;
-using System.Runtime.InteropServices;
+//
+
+using System;
+
+using Gdk;
+
using Hyena;
namespace FSpot.Utils
diff --git a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs
index 06a490b..8eced06 100644
--- a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs
@@ -25,16 +25,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using FSpot;
-using FSpot.Editors;
-using Gtk;
-using Gdk;
+//
+
+using System;
+
+using FSpot.Editors;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
+using Mono.Simd;
using Mono.Unix;
-using Mono.Simd;
-using Hyena;
namespace FSpot.Addins.Editors {
class BWEditor : Editor {
diff --git a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs
index 89964ae..b6910e2 100644
--- a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs
@@ -27,10 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.Editors;
+
using Gdk;
using Gtk;
+
using Mono.Unix;
namespace FSpot.Addins.Editors {
diff --git a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs
index 1f5c64a..ea910f6 100644
--- a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs
@@ -27,20 +27,21 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.Editors;
+
using Gdk;
+
using Mono.Unix;
namespace FSpot.Addins.Editors {
- class FlipEditor : Editor {
- public FlipEditor () : base (Catalog.GetString ("Flip"), "object-flip-horizontal") {
+ class FlipEditor : Editor {
+ public FlipEditor () : base (Catalog.GetString ("Flip"), "object-flip-horizontal") {
CanHandleMultiple = true;
- }
+ }
- protected override Pixbuf Process (Pixbuf input, Cms.Profile input_profile) {
+ protected override Pixbuf Process (Pixbuf input, Cms.Profile input_profile) {
Pixbuf output = (Pixbuf) input.Clone ();
return output.Flip (true);
- }
- }
+ }
+ }
}
diff --git a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs
index 62968f1..e7e9f7a 100644
--- a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs
@@ -29,10 +29,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using FSpot;
using FSpot.Editors;
+
using Gdk;
using Gtk;
+
using Mono.Unix;
namespace FSpot.Addins.Editors {
diff --git a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs
index b9d80fa..bb83ee0 100644
--- a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs
+++ b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs
@@ -25,14 +25,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using FSpot;
-using FSpot.Editors;
-using FSpot.Imaging;
-using Gtk;
-using Gdk;
+//
+
+using System;
+
+using FSpot.Editors;
+using FSpot.Imaging;
+
+using Gdk;
+using Gtk;
+
using Mono.Unix;
namespace FSpot.Addins.Editors {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs
index d723bec..bdefd85 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/Brasero.cs
@@ -26,11 +26,11 @@
//
// Borrowed parts from banshee.
-// src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
-using System;
-using System.IO;
-using System.Diagnostics;
-
+// src/Backends/Banshee.Gnome/Banshee.GnomeBackend/Brasero.cs
+
+using System.Diagnostics;
+using System.IO;
+
using Hyena;
namespace FSpot.Exporters.CD
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
index 871c743..8c1557d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs
@@ -27,26 +27,20 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-
+//
+
+using FSpot.Core;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+
+using GLib;
+using Gtk;
+using GtkBeans;
+
+using Hyena;
+
using Mono.Unix;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
-
-using GLib;
-using Gtk;
-using GtkBeans;
-
namespace FSpot.Exporters.CD {
public class CDExport : FSpot.Extensions.IExporter {
IBrowsableCollection selection;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
index 1e52b56..bd465a5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExportDialog.cs
@@ -27,21 +27,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Reflection;
-using System.Runtime.InteropServices;
-using Mono.Unix;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
-using GLib;
-using Gtk;
+//
+
+using System;
+using System.Reflection;
+
+using FSpot.Core;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
+using GLib;
+using Gtk;
using GtkBeans;
namespace FSpot.Exporters.CD
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
index 5ec17be..3bf51fc 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs
@@ -28,25 +28,26 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Threading;
-using System.Collections;
-using System.Collections.Generic;
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+
+using Gnome.Keyring;
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
+using Mono.Facebook;
using Mono.Unix;
-using Gtk;
-using Gnome.Keyring;
-
-using FSpot.Core;
-using Hyena;
-using Hyena.Widgets;
-using FSpot.UI.Dialog;
-using FSpot.Extensions;
-using FSpot.Filters;
-
-using Mono.Facebook;
namespace FSpot.Exporters.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs
index 9d0a630..0a39773 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs
@@ -25,26 +25,26 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using System.Threading;
-
-using Gtk;
-using GtkBeans;
-
-using Hyena;
-using Hyena.Widgets;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Widgets;
-using FSpot.Platform;
-using FSpot.UI.Dialog;
-
-using Mono.Facebook;
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Reflection;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.UI.Dialog;
+using FSpot.Utils;
+using FSpot.Widgets;
+
+using Gtk;
+using GtkBeans;
+
+using Hyena;
+using Hyena.Widgets;
+
+using Mono.Facebook;
using Mono.Unix;
namespace FSpot.Exporters.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
index 313d8c2..60adc3e 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookTagPopup.cs
@@ -25,11 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System.Reflection;
-using System.Collections.Generic;
-using FSpot.Widgets;
+//
+
+using System.Collections.Generic;
+using System.Reflection;
+
+using FSpot.Widgets;
+
using Mono.Facebook;
namespace FSpot.Exporters.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
index 4f6ea90..a8e6d7f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FindNullableClashes.cs
@@ -31,6 +31,7 @@
using System;
using System.Reflection;
+
using Hyena;
public class FindNullableClashes {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
index 9c27846..e8a84a8 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
@@ -25,21 +25,20 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
-using System.Text;
-using System.Net;
+//
+
+using System;
+using System.Text;
+using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
- [System.Xml.Serialization.XmlRootAttribute("photos_createAlbum_response", Namespace="http://api.facebook.com/1.0/";)]
+ [System.Xml.Serialization.XmlRootAttribute("photos_createAlbum_response", Namespace="http://api.facebook.com/1.0/";)]
public class Album : album, SessionWrapper
{
- [XmlIgnore]
+ [XmlIgnore]
public FacebookSession Session { get; set; }
public Photo[] GetPhotos ()
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
index 191a0fe..67bdae4 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Error.cs
@@ -26,7 +26,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
index 2ff027a..4da70c1 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Event.cs
@@ -22,11 +22,10 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
-using System.Collections.Generic;
-using System.IO;
using System.Xml.Serialization;
-using System.Text;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
@@ -41,7 +40,7 @@ namespace Mono.Facebook
public class Event : @event, SessionWrapper
{
- [XmlIgnore]
+ [XmlIgnore]
public FacebookSession Session { get; set; }
[XmlIgnore ()]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs
index ffcf8cf..15f2cf7 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs
@@ -26,6 +26,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
public class FacebookException : Exception
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs
index 11aaaf7..0d0e525 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs
@@ -27,6 +27,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Text;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
index 43377dd..c9fbfcc 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
@@ -26,15 +26,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-using System;
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
using System.Xml;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Net;
-using System.Linq;
-using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
index de26293..cbc13c3 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Friend.cs
@@ -24,18 +24,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Xml.Serialization;
-using System.Text;
namespace Mono.Facebook
{
public class Friend : SessionWrapper
{
public FacebookSession Session { get; set; }
- public long UId { get; set; }
+ public long UId { get; set; }
public Friend (long UId, FacebookSession session)
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
index c64e33a..093237d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FriendInfo.cs
@@ -24,7 +24,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
index 719fd83..5f3f907 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Group.cs
@@ -26,6 +26,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Xml.Serialization;
using Mono.Facebook.Schemas;
@@ -34,7 +35,7 @@ namespace Mono.Facebook
{
public class Group : group, SessionWrapper
{
- [XmlIgnore]
+ [XmlIgnore]
public FacebookSession Session { get; set; }
[XmlIgnore ()]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
index feb6221..18af52f 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Location.cs
@@ -23,7 +23,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
index 3792ebc..4daf7c0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Notification.cs
@@ -23,10 +23,8 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.IO;
+
using System.Xml.Serialization;
-using System.Text;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
index 6278330..49774a5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/PeopleList.cs
@@ -23,9 +23,8 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
+
using System.Xml.Serialization;
-using System.Collections;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
index 3ddbcdf..8800eeb 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Photo.cs
@@ -26,18 +26,19 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
- [System.Xml.Serialization.XmlRootAttribute("photos_upload_response", Namespace="http://api.facebook.com/1.0/";)]
+ [System.Xml.Serialization.XmlRootAttribute("photos_upload_response", Namespace="http://api.facebook.com/1.0/";)]
public class Photo : photo, SessionWrapper
{
- [XmlIgnore]
+ [XmlIgnore]
public FacebookSession Session { get; set; }
- [XmlIgnore]
- public string PId { get { return pid; } }
+ [XmlIgnore]
+ public string PId { get { return pid; } }
public Tag[] GetTags ()
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
index 105e737..eab2ee4 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Responses.cs
@@ -26,16 +26,14 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Xml.Serialization;
-using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
[XmlRoot ("photos_getAlbums_response", Namespace = "http://api.facebook.com/1.0/";, IsNullable = false)]
public class AlbumsResponse
{
- [XmlElement ("album")]
+ [XmlElement ("album")]
public Album[] album;
[XmlIgnore ()]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
index f385ef3..362a325 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionInfo.cs
@@ -25,13 +25,13 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
- [System.Xml.Serialization.XmlRootAttribute("auth_getSession_response", Namespace="http://api.facebook.com/1.0/";, IsNullable=false)]
+ [System.Xml.Serialization.XmlRootAttribute("auth_getSession_response", Namespace="http://api.facebook.com/1.0/";, IsNullable=false)]
public class SessionInfo : session_info
{
[XmlIgnore]
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
index 5874380..bd984b8 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/SessionWrapper.cs
@@ -26,7 +26,6 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System.Xml.Serialization;
namespace Mono.Facebook
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
index 4d7393e..35059f5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Tag.cs
@@ -27,18 +27,19 @@
//
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
{
public class Tag : photo_tag, SessionWrapper
{
- [XmlIgnore]
+ [XmlIgnore]
public FacebookSession Session { get; set; }
-
- [XmlIgnore]
- public long Subject { get { return subject; } }
-
+
+ [XmlIgnore]
+ public long Subject { get { return subject; } }
+
public Photo GetPhoto ()
{
PhotosResponse rsp = Session.Util.GetResponse<PhotosResponse> ("facebook.photos.get", FacebookParam.Create ("pids", pid),
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
index 3d1ca17..06a04eb 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/User.cs
@@ -29,6 +29,7 @@
//
using System;
using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
index b71cb0a..14ef367 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
@@ -26,6 +26,7 @@
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
+
using System;
using System.Collections.Generic;
using System.IO;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
index 3a738bc..2d148ad 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs
@@ -28,27 +28,26 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FlickrNet;
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.IO;
-using System.Threading;
+//
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
+using GtkBeans;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.Utils;
-using FSpot.UI.Dialog;
-using Hyena;
-using Hyena.Widgets;
-
-using GtkBeans;
-
namespace FSpot.Exporters.Flickr {
public class TwentyThreeHQExport : FlickrExport
{
@@ -264,10 +263,10 @@ namespace FSpot.Exporters.Flickr {
} catch (Exception e) {
HigMessageDialog md =
new HigMessageDialog (Dialog,
- Gtk.DialogFlags.Modal |
- Gtk.DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
- Catalog.GetString ("Unable to log on"), e.Message);
+ Gtk.DialogFlags.Modal |
+ Gtk.DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
+ Catalog.GetString ("Unable to log on"), e.Message);
md.Run ();
md.Destroy ();
@@ -333,10 +332,10 @@ namespace FSpot.Exporters.Flickr {
} else {
HigMessageDialog md =
new HigMessageDialog (Dialog,
- Gtk.DialogFlags.Modal |
- Gtk.DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
- Catalog.GetString ("Unable to log on"), e.Message);
+ Gtk.DialogFlags.Modal |
+ Gtk.DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
+ Catalog.GetString ("Unable to log on"), e.Message);
md.Run ();
md.Destroy ();
@@ -357,7 +356,7 @@ namespace FSpot.Exporters.Flickr {
if (args.UploadComplete) {
progress_dialog.Fraction = photo_index / (double) selection.Count;
progress_dialog.ProgressText = String.Format (Catalog.GetString ("Waiting for response {0} of {1}"),
- photo_index, selection.Count);
+ photo_index, selection.Count);
}
progress_dialog.Fraction = (photo_index - 1.0 + (args.Bytes / (double) info.Length)) / (double) selection.Count;
}
@@ -383,7 +382,7 @@ namespace FSpot.Exporters.Flickr {
try {
IPhoto photo = photos [index];
progress_dialog.Message = System.String.Format (
- Catalog.GetString ("Uploading picture \"{0}\""), photo.Name);
+ Catalog.GetString ("Uploading picture \"{0}\""), photo.Name);
progress_dialog.Fraction = photo_index / (double)selection.Count;
photo_index++;
@@ -401,9 +400,9 @@ namespace FSpot.Exporters.Flickr {
if (App.Instance.Database != null && photo is FSpot.Photo)
App.Instance.Database.Exports.Create ((photo as FSpot.Photo).Id,
- (photo as FSpot.Photo).DefaultVersionId,
- ExportStore.FlickrExportType,
- auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id);
+ (photo as FSpot.Photo).DefaultVersionId,
+ ExportStore.FlickrExportType,
+ auth.User.UserId + ":" + auth.User.Username + ":" + current_service.Name + ":" + id);
} catch (System.Exception e) {
progress_dialog.Message = String.Format (Catalog.GetString ("Error Uploading To {0}: {1}"),
@@ -490,12 +489,12 @@ namespace FSpot.Exporters.Flickr {
do_export_flickr.Sensitive = false;
HigMessageDialog md =
new HigMessageDialog (Dialog,
- Gtk.DialogFlags.Modal |
- Gtk.DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
- Catalog.GetString ("Unable to log on."),
- string.Format (Catalog.GetString ("F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."),
- current_service.Name));
+ Gtk.DialogFlags.Modal |
+ Gtk.DialogFlags.DestroyWithParent,
+ Gtk.MessageType.Error, Gtk.ButtonsType.Ok,
+ Catalog.GetString ("Unable to log on."),
+ string.Format (Catalog.GetString ("F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."),
+ current_service.Name));
md.Run ();
md.Destroy ();
return;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
index da35672..5b88491 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrRemote.cs
@@ -28,8 +28,8 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
/*
* Simple upload based on the api at
* http://www.flickr.com/services/api/upload.api.html
@@ -40,18 +40,14 @@
*
* We use now the search API also
*
- */
-using System;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-
-using FlickrNet;
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Filters;
+ */
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+using FSpot.Core;
+using FSpot.Filters;
+
using Hyena;
namespace FSpot.Exporters.Flickr {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
index 270f228..a837bcb 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs
@@ -53,25 +53,21 @@
//located on a GIO location.
using System;
using System.IO;
-using System.Runtime.InteropServices;
-using System.Collections;
-using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Filters;
+using FSpot.Widgets;
+using FSpot.UI.Dialog;
using Hyena;
using Mono.Unix;
+// FIXME: In a newer version of mono?
using ICSharpCode.SharpZipLib.Checksums;
using ICSharpCode.SharpZipLib.Zip;
using ICSharpCode.SharpZipLib.GZip;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.Utils;
-using FSpot.UI.Dialog;
-
namespace FSpot.Exporters.Folder
{
public class FolderExport : FSpot.Extensions.IExporter
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderGallery.cs b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderGallery.cs
index 6774650..4e22807 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderGallery.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderGallery.cs
@@ -50,17 +50,16 @@
*/
//This should be used to export the selected pics to an original gallery
-//located on a GIO location.
-
-using System;
-using System.IO;
-
+//located on a GIO location.
+
+using System;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Filters;
+
using Hyena;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-
namespace FSpot.Exporters.Folder
{
internal class FolderGallery
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs
index b877ebe..2c1df41 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/HtmlGallery.cs
@@ -50,17 +50,16 @@
*/
//This should be used to export the selected pics to an original gallery
-//located on a GIO location.
-
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-
+//located on a GIO location.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using FSpot.Core;
+
using Mono.Unix;
-using FSpot.Core;
-
namespace FSpot.Exporters.Folder
{
class HtmlGallery : FolderGallery
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/OriginalGallery.cs b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/OriginalGallery.cs
index 5bf7787..cb502b3 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/OriginalGallery.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/OriginalGallery.cs
@@ -55,13 +55,14 @@
using System;
using System.IO;
+using FSpot.Core;
+
using Hyena;
+// FIXME: Isn't there some zip library stuff in a newer version of mono?
using ICSharpCode.SharpZipLib.Checksums;
using ICSharpCode.SharpZipLib.Zip;
-using FSpot.Core;
-
namespace FSpot.Exporters.Folder
{
class OriginalGallery : FolderGallery
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs
index c98e249..c3b72d6 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs
@@ -25,17 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-
-using System;
-
+//
+
+using System;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
-using Hyena;
-using Hyena.Widgets;
-
-
namespace FSpot.Exporters.Gallery
{
public class AccountDialog {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
index b224103..23f16d7 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs
@@ -38,7 +38,6 @@ using System.Net;
using System.Text;
using System.Web;
-using FSpot.Core;
using Mono.Unix;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs
index b66427e..47ef950 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs
@@ -25,12 +25,12 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
-
namespace FSpot.Exporters.Gallery
{
public class GalleryAccount {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs
index b7bd0ac..ca095c5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs
@@ -25,14 +25,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-
+//
+
+using System;
+
+using Hyena.Widgets;
+
using Mono.Unix;
-using Hyena.Widgets;
-
namespace FSpot.Exporters.Gallery
{
public class GalleryAddAlbum
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
index a7bd093..7e737c3 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs
@@ -29,22 +29,21 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
+using Hyena;
+
using Mono.Unix;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.UI.Dialog;
-using FSpot.Extensions;
-
-using Hyena;
-using Hyena.Widgets;
-
namespace FSpot.Exporters.Gallery
{
public class GalleryExport : IExporter
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
index a225aa4..8230858 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs
@@ -28,20 +28,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
-
-using Mono.Unix;
-using FSpot;
-using FSpot.Core;
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using FSpot.Core;
+
using Hyena;
-using Hyena.Widgets;
/* These classes are based off the documentation at
*
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs
index 864867b..053c38c 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccount.cs
@@ -25,27 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
-using Hyena;
-using Hyena.Widgets;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
+//
+
+using System.Net;
+
+using Gnome.Keyring;
+
+using Hyena;
+
using Mono.Google;
-using Mono.Google.Picasa;
namespace FSpot.Exporters.PicasaWeb
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs
index cbe45f6..9c7df01 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountDialog.cs
@@ -25,27 +25,17 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
-using Hyena;
-using Hyena.Widgets;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
-using Mono.Google;
-using Mono.Google.Picasa;
+//
+
+using System;
+
+using FSpot.Imaging;
+
+using Gnome.Keyring;
+
+using Hyena;
+
+using Mono.Google;
namespace FSpot.Exporters.PicasaWeb
{
@@ -148,7 +138,7 @@ namespace FSpot.Exporters.PicasaWeb
private string username;
private string token;
- GtkBeans.Builder builder;
+ GtkBeans.Builder builder;
// widgets
[GtkBeans.Builder.Object] Gtk.Dialog dialog;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs
index 5389e59..ffe3f0a 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAccountManager.cs
@@ -29,11 +29,14 @@
//
using System;
+// FIXME: Why do we still have System.Collections
using System.Collections;
using System.Collections.Generic;
-using Hyena;
+
using Gnome.Keyring;
+using Hyena;
+
namespace FSpot.Exporters.PicasaWeb
{
public class GoogleAccountManager
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs
index 9fc6408..1ef12ed 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs
@@ -25,27 +25,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
+//
+
+using System;
+
+using Gnome.Keyring;
+
+using Hyena.Widgets;
+
+using Mono.Google.Picasa;
using Mono.Unix;
-using Hyena;
-using Hyena.Widgets;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
-using Mono.Google;
-using Mono.Google.Picasa;
namespace FSpot.Exporters.PicasaWeb
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
index f40d17d..0379582 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs
@@ -26,8 +26,8 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
/*
* PicasaWebExport.cs
*
@@ -35,23 +35,23 @@
* Stephane Delcroix <stephane delcroix org>
*
* Copyright (C) 2006 Stephane Delcroix
- */
-using System;
-using System.IO;
-using System.Text;
-using System.Collections;
-using System.Collections.Generic;
+ */
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using System.Text;
+
+using FSpot.Core;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
+using Hyena;
+
+using Mono.Google;
+using Mono.Google.Picasa;
using Mono.Unix;
-using Hyena;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using FSpot.UI.Dialog;
-
-using Mono.Google;
-using Mono.Google.Picasa;
namespace FSpot.Exporters.PicasaWeb
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs
index e103b03..1522285 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccount.cs
@@ -25,25 +25,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
-using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
+//
+
+using System.Net;
+
+using Gnome.Keyring;
+
+using Hyena;
+
using SmugMugNet;
namespace FSpot.Exporters.SmugMug
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs
index 114bfc2..d0a8ee0 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountDialog.cs
@@ -28,23 +28,8 @@
//
using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
-using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
+
using Gnome.Keyring;
-using SmugMugNet;
namespace FSpot.Exporters.SmugMug
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs
index bd1032c..66f3d8a 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAccountManager.cs
@@ -26,28 +26,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.Web;
-
-using Mono.Unix;
-using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
+//
+
+using System;
+// FIXME: Why do we still have System.Collections?
+using System.Collections;
+using System.Collections.Generic;
+
+using Gnome.Keyring;
+
using Hyena;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
-using SmugMugNet;
namespace FSpot.Exporters.SmugMug
{
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs
index df6d8c6..94cc918 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs
@@ -25,25 +25,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections;
-using System.Collections.Specialized;
-using System.Web;
-using Mono.Unix;
-using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
-using Gnome.Keyring;
+//
+
+using System;
+
+using Gnome.Keyring;
+using Gtk;
+
using SmugMugNet;
namespace FSpot.Exporters.SmugMug
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
index f2417e5..797ac93 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs
@@ -37,23 +37,21 @@
* Based on PicasaWebExport code from Stephane Delcroix.
*
* Copyright (C) 2006 Thomas Van Machelen
- */
-
-using System;
-using System.IO;
-using System.Text;
-using System.Threading;
-using System.Collections.Generic;
-using Mono.Unix;
-using Gtk;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.Widgets;
-using Hyena;
-using FSpot.UI.Dialog;
-
+ */
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
+using Hyena;
+
+using Mono.Unix;
+
using SmugMugNet;
namespace FSpot.Exporters.SmugMug {
@@ -64,16 +62,16 @@ namespace FSpot.Exporters.SmugMug {
builder = new GtkBeans.Builder (null, "smugmug_export_dialog.ui", null);
builder.Autoconnect (this);
- gallery_optionmenu = Gtk.ComboBox.NewText();
- album_optionmenu = Gtk.ComboBox.NewText();
+ gallery_optionmenu = Gtk.ComboBox.NewText();
+ album_optionmenu = Gtk.ComboBox.NewText();
- (edit_button.Parent as Gtk.HBox).PackStart (gallery_optionmenu);
- (album_button.Parent as Gtk.HBox).PackStart (album_optionmenu);
- (edit_button.Parent as Gtk.HBox).ReorderChild (gallery_optionmenu, 1);
- (album_button.Parent as Gtk.HBox).ReorderChild (album_optionmenu, 1);
+ (edit_button.Parent as Gtk.HBox).PackStart (gallery_optionmenu);
+ (album_button.Parent as Gtk.HBox).PackStart (album_optionmenu);
+ (edit_button.Parent as Gtk.HBox).ReorderChild (gallery_optionmenu, 1);
+ (album_button.Parent as Gtk.HBox).ReorderChild (album_optionmenu, 1);
- gallery_optionmenu.Show ();
- album_optionmenu.Show ();
+ gallery_optionmenu.Show ();
+ album_optionmenu.Show ();
this.items = selection.Items;
album_button.Sensitive = false;
@@ -230,9 +228,9 @@ namespace FSpot.Exporters.SmugMug {
int image_id = account.SmugMug.Upload (request.Current.LocalPath, album.AlbumID);
if (App.Instance.Database != null && item is Photo && image_id >= 0)
App.Instance.Database.Exports.Create ((item as Photo).Id,
- (item as Photo).DefaultVersionId,
- ExportStore.SmugMugExportType,
- account.SmugMug.GetAlbumUrl (image_id).ToString ());
+ (item as Photo).DefaultVersionId,
+ ExportStore.SmugMugExportType,
+ account.SmugMug.GetAlbumUrl (image_id).ToString ());
sent_bytes += file_info.Length;
@@ -269,7 +267,7 @@ namespace FSpot.Exporters.SmugMug {
accounts = manager.GetAccounts ();
if (accounts == null || accounts.Count == 0) {
- gallery_optionmenu.AppendText (Mono.Unix.Catalog.GetString ("(No Gallery)"));
+ gallery_optionmenu.AppendText (Mono.Unix.Catalog.GetString ("(No Gallery)"));
gallery_optionmenu.Sensitive = false;
edit_button.Sensitive = false;
@@ -279,7 +277,7 @@ namespace FSpot.Exporters.SmugMug {
if (account == changed_account)
pos = i;
- gallery_optionmenu.AppendText(account.Username);
+ gallery_optionmenu.AppendText(account.Username);
i++;
}
@@ -287,7 +285,7 @@ namespace FSpot.Exporters.SmugMug {
edit_button.Sensitive = true;
}
- gallery_optionmenu.Active = pos;
+ gallery_optionmenu.Active = pos;
}
private void Connect ()
@@ -340,7 +338,7 @@ namespace FSpot.Exporters.SmugMug {
Album[] albums = account.SmugMug.GetAlbums();
for (int i=0; i < albums.Length; i++) {
if (((Album)albums[i]).Title == title) {
- album_optionmenu.Active = 1;
+ album_optionmenu.Active = 1;
}
}
}
@@ -363,7 +361,7 @@ namespace FSpot.Exporters.SmugMug {
string msg = disconnected ? Mono.Unix.Catalog.GetString ("(Not Connected)")
: Mono.Unix.Catalog.GetString ("(No Albums)");
- album_optionmenu.AppendText(msg);
+ album_optionmenu.AppendText(msg);
export_button.Sensitive = false;
album_optionmenu.Sensitive = false;
@@ -374,7 +372,7 @@ namespace FSpot.Exporters.SmugMug {
label_builder.Append (album.Title);
- album_optionmenu.AppendText (label_builder.ToString());
+ album_optionmenu.AppendText (label_builder.ToString());
}
export_button.Sensitive = items.Length > 0;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
index 059114e..f8061aa 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/ApplicationCentricCertificatePolicy.cs
@@ -27,7 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.IO;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
index 8b0b1f6..25b61a5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/FSpotUploadProgress.cs
@@ -25,13 +25,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Mono.Tabblo;
+//
+
+using System;
+
+using FSpot.UI.Dialog;
+
+using Mono.Tabblo;
using Mono.Unix;
-using System;
-using FSpot.UI.Dialog;
-using FSpot.Utils;
namespace FSpot.Exporters.Tabblo {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
index 615c684..820a5d5 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs
@@ -25,22 +25,21 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using Mono.Tabblo;
+//
+
+using System;
+using System.Diagnostics;
+using System.Net;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.UI.Dialog;
+
+using Hyena;
+
+using Mono.Tabblo;
using Mono.Unix;
-using System;
-using System.Collections;
-using System.Diagnostics;
-using System.Net;
-using System.Threading;
-
-using Hyena;
-using FSpot;
-using FSpot.Core;
-using FSpot.UI.Dialog;
-
namespace FSpot.Exporters.Tabblo {
public class TabbloExport : FSpot.Extensions.IExporter {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
index c129c24..d9bc848 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportModel.cs
@@ -25,19 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
+//
+
+using System;
+// FIXME: Why do we still have System.Collections?
+using System.Collections;
+using System.Collections.Generic;
+using System.Diagnostics;
+
+using FSpot.Core;
+
using Hyena;
-using Mono.Tabblo;
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-using FSpot.Core;
-
namespace FSpot.Exporters.Tabblo {
class TabbloExportModel : Mono.Tabblo.IPreferences {
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
index 875064b..25f8ca7 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExportView.cs
@@ -27,8 +27,6 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
-using System.Diagnostics;
using System.Reflection;
using FSpot.Core;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
index 4f6382f..2bd4112 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
@@ -27,23 +27,27 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot;
-using FSpot.UI.Dialog;
-using FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Filters;
-using Hyena;
-using Hyena.Widgets;
-using System;
-using System.IO;
-using System.Collections;
+//
+
+using System;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
+// FIXME: Is this in a newer version of mono?
+using ICSharpCode.SharpZipLib.Checksums;
+using ICSharpCode.SharpZipLib.GZip;
+using ICSharpCode.SharpZipLib.Zip;
+
using Mono.Unix;
-using Gtk;
-using ICSharpCode.SharpZipLib.Checksums;
-using ICSharpCode.SharpZipLib.Zip;
-using ICSharpCode.SharpZipLib.GZip;
namespace FSpot.Exporters.Zip {
public class Zip : IExporter {
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs
index 3e62978..6c46628 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathController.cs
@@ -34,17 +34,16 @@
// Bengt Thuree (bengt thuree com)
//
// Copyright (C) 2007
-//
-
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Query;
-using System;
-using System.IO;
-using System.Collections;
-using System.Collections.Generic;
-using System.Collections.Specialized;
+//
+
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Specialized;
+using System.IO;
+
+using FSpot.Core;
+
using Hyena;
/*
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs
index d9c50f1..cb20417 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath/ChangePhotoPathGui.cs
@@ -34,14 +34,14 @@
// Bengt Thuree (bengt thuree com)
//
// Copyright (C) 2007
-//
-
-using FSpot.Extensions;
-using FSpot.UI.Dialog;
-using System;
-//using Gnome.Vfs;
-using Gtk;
-using Hyena;
+//
+
+using System;
+
+using FSpot.Extensions;
+using FSpot.UI.Dialog;
+
+using Hyena;
using Hyena.Widgets;
namespace FSpot.Tools.ChangePhotoPath
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
index 3985c58..d2afe7a 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
@@ -27,22 +27,22 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
+//
+
+using System;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Imaging;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Extensions;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
namespace FSpot.Tools.DevelopInUFraw
{
- // Abstract version, contains shared functionality
+ // Abstract version, contains shared functionality
public abstract class AbstractDevelopInUFRaw : ICommand
{
// The executable used for developing RAWs
@@ -152,7 +152,7 @@ namespace FSpot.Tools.DevelopInUFraw
{
string name_without_ext = System.IO.Path.GetFileNameWithoutExtension (p.Name);
return new System.Uri (System.IO.Path.Combine (DirectoryPath (p), name_without_ext
- + " (" + version_name + ")" + ".jpg"));
+ + " (" + version_name + ")" + ".jpg"));
}
private static string DirectoryPath (Photo p)
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
index bcbdd96..7779d8c 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
@@ -28,17 +28,8 @@
//
using System;
-using System.IO;
-
-using Mono.Unix;
using Hyena;
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Extensions;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
namespace FSpot.Tools.DevelopInUFraw
{
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
index 5dc4d35..9221239 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
@@ -25,22 +25,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
+//
+
+using System;
+
+using FSpot.UI.Dialog;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
-using FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-using FSpot.Extensions;
-using FSpot.Imaging;
-using FSpot.UI.Dialog;
namespace FSpot.Tools.DevelopInUFraw
{
- // Batch Version
+ // Batch Version
public class DevelopInUFRawBatch : AbstractDevelopInUFRaw {
public DevelopInUFRawBatch() : base("ufraw-batch")
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
index fa71e06..ff7b664 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
@@ -25,15 +25,15 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Text;
-using System.Reflection;
-
-using FSpot;
-using FSpot.Core;
+//
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Text;
+
+using FSpot.Core;
+
using Mono.Unix;
namespace FSpot.Tools.LiveWebGallery
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
index 386af52..b90d1fd 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
@@ -25,23 +25,16 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Net;
-using System.Collections.Generic;
-
-using Gtk;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Utils;
-using FSpot.Query;
-using FSpot.UI.Dialog;
-using Mono.Unix;
-
+//
+
+using System;
+using System.Net;
+
+using FSpot.Core;
+using FSpot.Extensions;
+
+using Gtk;
+
namespace FSpot.Tools.LiveWebGallery
{
public class LiveWebGallery : ICommand
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
index 6a2dd80..b732348 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
@@ -25,18 +25,19 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Net;
-using System.Reflection;
-using FSpot;
-using FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Query;
-using Gtk;
+//
+
+using System;
+using System.Net;
+using System.Reflection;
+
+using FSpot.Core;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
namespace FSpot.Tools.LiveWebGallery
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
index 84ed578..85eb387 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
@@ -27,13 +27,11 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
-using System.Text;
-using FSpot;
using FSpot.Filters;
using FSpot.Utils;
+
using Hyena;
namespace FSpot.Tools.LiveWebGallery
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
index 7ce3923..e9223df 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
@@ -27,13 +27,9 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
-using System;
using System.IO;
-using System.Text;
using System.Reflection;
-using FSpot;
-
namespace FSpot.Tools.LiveWebGallery
{
public class ResourceRequestHandler : RequestHandler
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
index 00c42a0..97964cf 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
@@ -25,19 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.Threading;
-
-using FSpot;
-using FSpot.Extensions;
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Text;
+using System.Threading;
+
+using FSpot.Extensions;
+
using Hyena;
namespace FSpot.Tools.LiveWebGallery
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
index 036a5de..d4bdb1f 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
@@ -27,23 +27,23 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.IO;
-using System.Collections.Generic;
-
-using Gtk;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Extensions;
-using FSpot.Query;
-using FSpot.UI.Dialog;
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Extensions;
+using FSpot.Query;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
-using Hyena;
-using Hyena.Widgets;
namespace FSpot.Tools.MergeDb
{
@@ -92,10 +92,10 @@ namespace FSpot.Tools.MergeDb
string desc = String.Format (Catalog.GetString ("The file you selected is not a valid or supported database.\n\nReceived exception \"{0}\"."), ex.Message);
HigMessageDialog md = new HigMessageDialog (mdd.Dialog, DialogFlags.DestroyWithParent,
- Gtk.MessageType.Error,
- ButtonsType.Ok,
- msg,
- desc);
+ Gtk.MessageType.Error,
+ ButtonsType.Ok,
+ msg,
+ desc);
md.Run ();
md.Destroy ();
@@ -301,45 +301,45 @@ namespace FSpot.Tools.MergeDb
to_store.Commit (newp);
}
- SafeUri FindImportDestination (SafeUri uri, DateTime time)
- {
- // Find a new unique location inside the photo folder
- string name = uri.GetFilename ();
-
- var dest_uri = FSpot.Core.Global.PhotoUri.Append (time.Year.ToString ())
- .Append (String.Format ("{0:D2}", time.Month))
- .Append (String.Format ("{0:D2}", time.Day));
- EnsureDirectory (dest_uri);
-
- // If the destination we'd like to use is the file itself return that
- if (dest_uri.Append (name) == uri)
- return uri;
-
- // Find an unused name
- int i = 1;
- var dest = dest_uri.Append (name);
- var file = GLib.FileFactory.NewForUri (dest);
- while (file.Exists) {
- var filename = uri.GetFilenameWithoutExtension ();
- var extension = uri.GetExtension ();
- dest = dest_uri.Append (String.Format ("{0}-{1}{2}", filename, i++, extension));
- file = GLib.FileFactory.NewForUri (dest);
- }
-
- return dest;
- }
-
- void EnsureDirectory (SafeUri uri)
- {
- var parts = uri.AbsolutePath.Split('/');
- SafeUri current = new SafeUri (uri.Scheme + ":///", true);
- for (int i = 0; i < parts.Length; i++) {
- current = current.Append (parts [i]);
- var file = GLib.FileFactory.NewForUri (current);
- if (!file.Exists) {
- file.MakeDirectory (null);
- }
- }
- }
+ SafeUri FindImportDestination (SafeUri uri, DateTime time)
+ {
+ // Find a new unique location inside the photo folder
+ string name = uri.GetFilename ();
+
+ var dest_uri = FSpot.Core.Global.PhotoUri.Append (time.Year.ToString ())
+ .Append (String.Format ("{0:D2}", time.Month))
+ .Append (String.Format ("{0:D2}", time.Day));
+ EnsureDirectory (dest_uri);
+
+ // If the destination we'd like to use is the file itself return that
+ if (dest_uri.Append (name) == uri)
+ return uri;
+
+ // Find an unused name
+ int i = 1;
+ var dest = dest_uri.Append (name);
+ var file = GLib.FileFactory.NewForUri (dest);
+ while (file.Exists) {
+ var filename = uri.GetFilenameWithoutExtension ();
+ var extension = uri.GetExtension ();
+ dest = dest_uri.Append (String.Format ("{0}-{1}{2}", filename, i++, extension));
+ file = GLib.FileFactory.NewForUri (dest);
+ }
+
+ return dest;
+ }
+
+ void EnsureDirectory (SafeUri uri)
+ {
+ var parts = uri.AbsolutePath.Split('/');
+ SafeUri current = new SafeUri (uri.Scheme + ":///", true);
+ for (int i = 0; i < parts.Length; i++) {
+ current = current.Append (parts [i]);
+ var file = GLib.FileFactory.NewForUri (current);
+ if (!file.Exists) {
+ file.MakeDirectory (null);
+ }
+ }
+ }
}
}
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
index 382c7e6..25ae378 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
@@ -30,9 +30,8 @@
//
using System;
-using FSpot;
+
using FSpot.Core;
-using FSpot.Query;
namespace FSpot.Tools.MergeDb
{
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
index c71dfbf..752fbbc 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
@@ -27,13 +27,13 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using FSpot;
-using FSpot.Query;
+//
+
+using System;
+
+using Hyena;
+
using Mono.Unix;
-using Hyena;
namespace FSpot.Tools.MergeDb
{
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
index 3ce0a74..2dd8405 100644
--- a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
@@ -25,20 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Collections.Generic;
-
-using Gtk;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.UI.Dialog;
-using FSpot.Extensions;
-using FSpot.Imaging;
-
-using Hyena;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Imaging;
+
+using Gtk;
+
+using Hyena;
using Hyena.Widgets;
namespace FSpot.Tools.RawPlusJpeg
diff --git a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
index 697644d..b7f47c6 100644
--- a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
@@ -27,14 +27,14 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using FSpot;
-using FSpot.Core;
-using FSpot.Extensions;
-using System;
-using Hyena;
-
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Extensions;
+
+using Hyena;
using Hyena.Data.Sqlite;
namespace FSpot.Tools.RetroactiveRoll
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
index fe6f4a6..8044408 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
@@ -25,19 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using System.Reflection;
-
+//
+
+using System;
+using System.Reflection;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
using Gtk;
-using FSpot;
-using FSpot.Core;
-using FSpot.UI.Dialog;
-using FSpot.Extensions;
-using FSpot.Widgets;
-
namespace FSpot.Tools.ScreensaverConfig
{
public class ScreensaverConfig : ICommand
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs
index 277c3a7..c9b6d19 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs
+++ b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs
@@ -25,17 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Mono.Unix;
-
-using Cairo;
-using Gdk;
-
-using FSpot.Utils;
-using FSpot.Transitions;
-
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Transitions;
+
+using Gdk;
+
+using Mono.Unix;
+
using Color = Cairo.Color;
namespace FSpot.Addins.Transitions
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs
index bb65a7d..8d01d12 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs
+++ b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs
@@ -25,17 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Mono.Unix;
-
-using Cairo;
-using Gdk;
-
-using FSpot.Utils;
-using FSpot.Transitions;
-
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Transitions;
+
+using Gdk;
+
+using Mono.Unix;
+
using Color = Cairo.Color;
namespace FSpot.Addins.Transitions
diff --git a/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs
index 1f5c63a..f064839 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs
+++ b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs
@@ -25,17 +25,18 @@
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-//
-
-using System;
-using Mono.Unix;
-
-using Cairo;
-using Gdk;
-
-using FSpot.Utils;
-using FSpot.Transitions;
-
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Transitions;
+
+using Gdk;
+
+using Mono.Unix;
+
using Color = Cairo.Color;
namespace FSpot.Addins.Transitions
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
