[f-spot] Fix CRLF
- From: Stephen Shaw <sshaw src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Fix CRLF
- Date: Tue, 10 Apr 2012 21:42:54 +0000 (UTC)
commit 9093456bc76d95a006d224ce56fb4ce55f3c6c3f
Author: Stephen Shaw <sshaw decriptor com>
Date: Tue Apr 10 15:40:49 2012 -0600
Fix CRLF
lib/Mono.Google/Mono.Google.csproj | 232 +-
lib/Mono.Tabblo/Mono.Tabblo.csproj | 212 +-
lib/SmugMugNet/SmugMugNet.csproj | 210 +-
lib/gio-sharp/generator/AliasGen.cs | 60 +-
lib/gio-sharp/generator/BoxedGen.cs | 164 +-
lib/gio-sharp/generator/ByRefGen.cs | 126 +-
lib/gio-sharp/generator/ChildProperty.cs | 90 +-
lib/gio-sharp/generator/ClassGen.cs | 188 +-
lib/gio-sharp/generator/CodeGenerator.cs | 244 +-
lib/gio-sharp/generator/ConstFilenameGen.cs | 104 +-
lib/gio-sharp/generator/ConstStringGen.cs | 118 +-
lib/gio-sharp/generator/Ctor.cs | 326 +-
lib/gio-sharp/generator/EnumGen.cs | 254 +-
lib/gio-sharp/generator/GenBase.cs | 264 +-
lib/gio-sharp/generator/GenerationInfo.cs | 376 +-
lib/gio-sharp/generator/IGeneratable.cs | 142 +-
lib/gio-sharp/generator/IManualMarshaler.cs | 64 +-
lib/gio-sharp/generator/InterfaceGen.cs | 766 +-
lib/gio-sharp/generator/LPGen.cs | 116 +-
lib/gio-sharp/generator/LPUGen.cs | 116 +-
lib/gio-sharp/generator/ManualGen.cs | 116 +-
lib/gio-sharp/generator/Method.cs | 598 +-
lib/gio-sharp/generator/MethodBody.cs | 354 +-
lib/gio-sharp/generator/ObjectGen.cs | 850 +-
lib/gio-sharp/generator/OpaqueGen.cs | 460 +-
lib/gio-sharp/generator/Parameters.cs | 1456 ++--
lib/gio-sharp/generator/Parser.cs | 340 +-
lib/gio-sharp/generator/Property.cs | 386 +-
lib/gio-sharp/generator/ReturnValue.cs | 340 +-
lib/gio-sharp/generator/Signal.cs | 1174 ++--
lib/gio-sharp/generator/Signature.cs | 246 +-
lib/gio-sharp/generator/SimpleBase.cs | 242 +-
lib/gio-sharp/generator/SimpleGen.cs | 62 +-
lib/gio-sharp/generator/Statistics.cs | 394 +-
lib/gio-sharp/generator/StructGen.cs | 106 +-
lib/gio-sharp/generator/SymbolTable.cs | 824 +-
lib/gio-sharp/generator/VMSignature.cs | 150 +-
lib/gio-sharp/gio/snk | Bin 596 -> 596 bytes
lib/unique-sharp/generator/AliasGen.cs | 60 +-
lib/unique-sharp/generator/BoxedGen.cs | 164 +-
lib/unique-sharp/generator/ByRefGen.cs | 126 +-
lib/unique-sharp/generator/ChildProperty.cs | 90 +-
lib/unique-sharp/generator/ClassGen.cs | 188 +-
lib/unique-sharp/generator/CodeGenerator.cs | 244 +-
lib/unique-sharp/generator/ConstFilenameGen.cs | 104 +-
lib/unique-sharp/generator/ConstStringGen.cs | 118 +-
lib/unique-sharp/generator/Ctor.cs | 326 +-
lib/unique-sharp/generator/EnumGen.cs | 254 +-
lib/unique-sharp/generator/GenBase.cs | 264 +-
lib/unique-sharp/generator/GenerationInfo.cs | 376 +-
lib/unique-sharp/generator/IGeneratable.cs | 142 +-
lib/unique-sharp/generator/IManualMarshaler.cs | 64 +-
lib/unique-sharp/generator/InterfaceGen.cs | 768 +-
lib/unique-sharp/generator/LPGen.cs | 116 +-
lib/unique-sharp/generator/LPUGen.cs | 116 +-
lib/unique-sharp/generator/ManualGen.cs | 116 +-
lib/unique-sharp/generator/Method.cs | 606 +-
lib/unique-sharp/generator/MethodBody.cs | 354 +-
lib/unique-sharp/generator/ObjectGen.cs | 850 +-
lib/unique-sharp/generator/OpaqueGen.cs | 460 +-
lib/unique-sharp/generator/Parameters.cs | 1456 ++--
lib/unique-sharp/generator/Parser.cs | 340 +-
lib/unique-sharp/generator/Property.cs | 386 +-
lib/unique-sharp/generator/ReturnValue.cs | 340 +-
lib/unique-sharp/generator/Signal.cs | 1174 ++--
lib/unique-sharp/generator/Signature.cs | 246 +-
lib/unique-sharp/generator/SimpleBase.cs | 242 +-
lib/unique-sharp/generator/SimpleGen.cs | 62 +-
lib/unique-sharp/generator/Statistics.cs | 394 +-
lib/unique-sharp/generator/StructGen.cs | 106 +-
lib/unique-sharp/generator/SymbolTable.cs | 824 +-
lib/unique-sharp/generator/VMSignature.cs | 150 +-
po/sl.po | 9422 ++++++++++----------
.../MainApp.UnitTest/MainApp.UnitTest.csproj | 168 +-
.../MainApp/FSpot.ColorAdjustment/Adjustment.cs | 12 +-
.../MainApp/FSpot.ColorAdjustment/AutoStretch.cs | 18 +-
.../MainApp/FSpot.ColorAdjustment/Desaturate.cs | 12 +-
.../FSpot.ColorAdjustment/FullColorAdjustment.cs | 10 +-
.../MainApp/FSpot.ColorAdjustment/SepiaTone.cs | 12 +-
src/Clients/MainApp/FSpot.Editors/ColorEditor.cs | 20 +-
src/Clients/MainApp/FSpot.Editors/CropEditor.cs | 32 +-
.../MainApp/FSpot.Editors/DesaturateEditor.cs | 2 +-
src/Clients/MainApp/FSpot.Editors/Editor.cs | 8 +-
src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs | 2 +-
.../MainApp/FSpot.Editors/SoftFocusEditor.cs | 22 +-
src/Clients/MainApp/FSpot.Editors/TiltEditor.cs | 28 +-
.../FSpot.Extensions/CommandMenuItemNode.cs | 8 +-
.../FSpot.Extensions/ComplexMenuItemNode.cs | 12 +-
.../MainApp/FSpot.Extensions/ExportMenuItemNode.cs | 12 +-
src/Clients/MainApp/FSpot.Extensions/IExporter.cs | 6 +-
.../FSpot.Extensions/PhotoSelectionCondition.cs | 10 +-
.../MainApp/FSpot.Extensions/SidebarPage.cs | 30 +-
.../MainApp/FSpot.Extensions/TransitionNode.cs | 10 +-
.../MainApp/FSpot.Extensions/ViewModeCondition.cs | 10 +-
src/Clients/MainApp/FSpot.Filters/JpegFilter.cs | 16 +-
src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs | 10 +-
src/Clients/MainApp/FSpot.Filters/SharpFilter.cs | 8 +-
src/Clients/MainApp/FSpot.Imaging/Ciff.cs | 14 +-
src/Clients/MainApp/FSpot.Imaging/ImageFile.cs | 46 +-
.../MainApp/FSpot.Imaging/InternalProcess.cs | 10 +-
src/Clients/MainApp/FSpot.Imaging/RafFile.cs | 4 +-
src/Clients/MainApp/FSpot.Imaging/Tiff.cs | 10 +-
.../MainApp/FSpot.Import/FileImportSource.cs | 36 +-
.../MainApp/FSpot.Import/ImportController.cs | 36 +-
.../MainApp/FSpot.Import/MetadataImporter.cs | 16 +-
src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs | 18 +-
.../MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs | 2 +-
.../MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs | 2 +-
.../MainApp/FSpot.Loaders/GdkImageLoader.cs | 118 +-
src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs | 14 +-
src/Clients/MainApp/FSpot.Query/HiddenTag.cs | 8 +-
src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs | 14 +-
.../MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs | 30 +-
.../MainApp/FSpot.UI.Dialog/BuilderDialog.cs | 4 +-
.../MainApp/FSpot.UI.Dialog/DateRangeDialog.cs | 30 +-
.../MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs | 28 +-
.../MainApp/FSpot.UI.Dialog/EditTagDialog.cs | 72 +-
.../MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs | 30 +-
.../MainApp/FSpot.UI.Dialog/ImportDialog.cs | 36 +-
.../MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs | 30 +-
.../MainApp/FSpot.UI.Dialog/LastRollDialog.cs | 78 +-
.../MainApp/FSpot.UI.Dialog/PreferenceDialog.cs | 20 +-
.../MainApp/FSpot.UI.Dialog/ProgressDialog.cs | 28 +-
.../MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs | 14 +-
.../MainApp/FSpot.UI.Dialog/RepairDbDialog.cs | 18 +-
.../MainApp/FSpot.UI.Dialog/RepairDialog.cs | 14 +-
.../FSpot.UI.Dialog/SelectionRatioDialog.cs | 22 +-
.../MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs | 10 +-
.../FSpot.UI.Dialog/ThreadProgressDialog.cs | 16 +-
.../FSpot.Widgets/BrowseablePointerGridView.cs | 12 +-
.../FSpot.Widgets/CollectionCellGridView.cs | 50 +-
src/Clients/MainApp/FSpot.Widgets/EditorPage.cs | 34 +-
src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs | 42 +-
src/Clients/MainApp/FSpot.Widgets/FindBar.cs | 90 +-
.../MainApp/FSpot.Widgets/FolderTreeModel.cs | 20 +-
.../MainApp/FSpot.Widgets/FolderTreePage.cs | 12 +-
.../MainApp/FSpot.Widgets/FolderTreeView.cs | 18 +-
src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs | 24 +-
src/Clients/MainApp/FSpot.Widgets/InfoBox.cs | 64 +-
src/Clients/MainApp/FSpot.Widgets/Loupe.cs | 48 +-
.../MainApp/FSpot.Widgets/MetadataDisplay.cs | 34 +-
.../MainApp/FSpot.Widgets/PhotoImageView.cs | 66 +-
src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs | 22 +-
src/Clients/MainApp/FSpot.Widgets/QueryView.cs | 10 +-
.../FSpot.Widgets/SelectionCollectionGridView.cs | 20 +-
src/Clients/MainApp/FSpot.Widgets/Sharpener.cs | 20 +-
src/Clients/MainApp/FSpot.Widgets/Sidebar.cs | 32 +-
src/Clients/MainApp/FSpot.Widgets/SlideShow.cs | 32 +-
src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs | 28 +-
src/Clients/MainApp/FSpot.Widgets/TagEntry.cs | 32 +-
src/Clients/MainApp/FSpot.Widgets/TagView.cs | 14 +-
.../FSpot.Widgets/ThumbnailCaptionRenderer.cs | 10 +-
.../FSpot.Widgets/ThumbnailDateCaptionRenderer.cs | 18 +-
.../FSpot.Widgets/ThumbnailDecorationRenderer.cs | 10 +-
.../ThumbnailRatingDecorationRenderer.cs | 10 +-
.../FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs | 10 +-
.../FSpot.Widgets/ThumbnailTextCaptionRenderer.cs | 14 +-
src/Clients/MainApp/FSpot/FullScreenView.cs | 10 +-
src/Clients/MainApp/FSpot/GroupSelector.cs | 30 +-
src/Clients/MainApp/FSpot/JobStore.cs | 34 +-
src/Clients/MainApp/FSpot/Literal.cs | 22 +-
src/Clients/MainApp/FSpot/MainWindow.cs | 50 +-
src/Clients/MainApp/FSpot/MetaStore.cs | 10 +-
src/Clients/MainApp/FSpot/Photo.cs | 42 +-
src/Clients/MainApp/FSpot/PhotoPopup.cs | 6 +-
src/Clients/MainApp/FSpot/PhotoQuery.cs | 12 +-
src/Clients/MainApp/FSpot/PhotoStore.cs | 34 +-
src/Clients/MainApp/FSpot/PhotoVersion.cs | 8 +-
src/Clients/MainApp/FSpot/PhotoView.cs | 40 +-
src/Clients/MainApp/FSpot/PixbufCache.cs | 14 +-
src/Clients/MainApp/FSpot/Preferences.cs | 20 +-
src/Clients/MainApp/FSpot/PrintOperation.cs | 26 +-
src/Clients/MainApp/FSpot/ProgressItem.cs | 2 +-
src/Clients/MainApp/FSpot/QueryWidget.cs | 26 +-
src/Clients/MainApp/FSpot/RollStore.cs | 84 +-
src/Clients/MainApp/FSpot/RotateCommand.cs | 6 +-
.../MainApp/FSpot/SelectionDataExtensions.cs | 20 +-
src/Clients/MainApp/FSpot/SendEmail.cs | 30 +-
src/Clients/MainApp/FSpot/SingleView.cs | 36 +-
src/Clients/MainApp/FSpot/TagQueryWidget.cs | 42 +-
src/Clients/MainApp/FSpot/TagSelectionWidget.cs | 32 +-
src/Clients/MainApp/FSpot/TagStore.cs | 50 +-
src/Clients/MainApp/FSpot/Term.cs | 42 +-
src/Clients/MainApp/FSpot/ThumbnailCache.cs | 42 +-
src/Clients/MainApp/FSpot/ThumbnailGenerator.cs | 12 +-
src/Clients/MainApp/FSpot/TimeAdaptor.cs | 40 +-
src/Clients/MainApp/FSpot/UriCollection.cs | 16 +-
src/Clients/MainApp/FSpot/XScreenSaverSlide.cs | 10 +-
src/Clients/MainApp/FSpot/main.cs | 38 +-
src/Clients/MainApp/ImageLoaderThread.cs | 36 +-
src/Clients/MainApp/MainApp.csproj | 848 +-
src/Clients/MainApp/PhotoTagMenu.cs | 20 +-
src/Clients/MainApp/PhotoVersionCommands.cs | 24 +-
src/Clients/MainApp/PhotoVersionMenu.cs | 14 +-
src/Clients/MainApp/PixbufUtils.cs | 50 +-
src/Clients/MainApp/TagCommands.cs | 38 +-
src/Clients/MainApp/TagPopup.cs | 16 +-
src/Clients/MainApp/ThumbnailCommand.cs | 14 +-
src/Core/FSpot.Bling/FSpot.Bling.csproj | 204 +-
src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs | 2 +-
src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs | 2 +-
src/Core/FSpot.Bling/FSpot.Bling/EasedAnimation.cs | 2 +-
src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs | 2 +-
src/Core/FSpot.Cms/Cms/CmsException.cs | 2 +-
src/Core/FSpot.Cms/Cms/ColorCIExyY.cs | 10 +-
src/Core/FSpot.Cms/Cms/Profile.cs | 20 +-
src/Core/FSpot.Cms/Cms/SaveException.cs | 2 +-
src/Core/FSpot.Cms/FSpot.Cms.csproj | 216 +-
src/Core/FSpot.Core/FSpot.Core.csproj | 258 +-
.../FSpot.Core/BrowsableCollectionProxy.cs | 10 +-
src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs | 20 +-
.../FSpot.Core/BrowsablePointerChangedEventArgs.cs | 2 +-
src/Core/FSpot.Core/FSpot.Core/DbItem.cs | 4 +-
src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs | 18 +-
src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs | 14 +-
src/Core/FSpot.Core/FSpot.Core/PhotoList.cs | 2 +-
src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs | 22 +-
src/Core/FSpot.Core/FSpot.Core/Tag.cs | 30 +-
src/Core/FSpot.Gui/FSpot.Gui.csproj | 312 +-
src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs | 20 +-
.../FSpot.Gui/FSpot.Transitions/CairoTransition.cs | 2 +-
.../FSpot.Transitions/SlideShowTransition.cs | 10 +-
.../FSpot.Widgets/ApplicationActivatedEventArgs.cs | 2 +-
src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs | 32 +-
src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs | 14 +-
.../FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs | 40 +-
src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs | 18 +-
src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs | 2 +-
src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs | 54 +-
.../FSpot.Gui/FSpot.Widgets/ImageView_Container.cs | 44 +-
src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs | 34 +-
src/Core/FSpot.Gui/FSpot.Widgets/MenuButton.cs | 18 +-
src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs | 18 +-
src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs | 26 +-
src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs | 14 +-
.../FSpot.Gui/FSpot.Widgets/SelectionCollection.cs | 84 +-
.../FSpot.JobScheduler/Banshee.Base/FSpotCompat.cs | 14 +-
.../FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs | 12 +-
.../FSpot.JobScheduler/FSpot.JobScheduler.csproj | 206 +-
src/Core/FSpot.Platform/FSpot.Platform.csproj | 206 +-
.../FSpot.Platform/PreferenceBackend.cs | 6 +-
src/Core/FSpot.Query/FSpot.Query.csproj | 224 +-
src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs | 56 +-
src/Core/FSpot.Utils/FSpot.Utils.csproj | 264 +-
src/Core/FSpot.Utils/FSpot.Utils/Cache.cs | 2 +-
src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs | 14 +-
src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs | 16 +-
.../FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs | 8 +-
src/Core/FSpot.Utils/FSpot.Utils/UriList.cs | 20 +-
.../FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs | 14 +-
.../FSpot.Addins.Editors/BWEditor.cs | 24 +-
.../FSpot.Editors.BW/FSpot.Editors.BW.csproj | 242 +-
.../FSpot.Editors.Blackout.csproj | 220 +-
.../FSpot.Editors.Flip/FSpot.Editors.Flip.csproj | 216 +-
.../FSpot.Editors.Pixelate.csproj | 220 +-
.../FSpot.Addins.Editors/ResizeEditor.cs | 20 +-
.../FSpot.Editors.Resize.csproj | 220 +-
.../FSpot.Exporters.CD/FSpot.Exporters.CD.csproj | 252 +-
.../FSpot.Exporters.CD/Brasero.cs | 10 +-
.../FSpot.Exporters.CD/CDExport.cs | 24 +-
.../FSpot.Exporters.CD/CDExportDialog.cs | 22 +-
.../FSpot.Exporters.Facebook.csproj | 330 +-
.../FSpot.Exporters.Facebook/FacebookExport.cs | 74 +-
.../FacebookExportDialog.cs | 66 +-
.../FSpot.Exporters.Facebook/FacebookTagPopup.cs | 22 +-
.../Mono.Facebook/Album.cs | 12 +-
.../Mono.Facebook/FacebookException.cs | 10 +-
.../Mono.Facebook/FacebookParam.cs | 20 +-
.../Mono.Facebook/FacebookSession.cs | 10 +-
.../FSpot.Exporters.Facebook/Mono.Facebook/Util.cs | 20 +-
.../FSpot.Exporters.Flickr.csproj | 266 +-
.../FSpot.Exporters.Flickr/FlickrExport.cs | 42 +-
.../FSpot.Exporters.Flickr/FlickrRemote.cs | 40 +-
.../FSpot.Exporters.Folder.csproj | 292 +-
.../FSpot.Exporters.Folder/FolderGallery.cs | 16 +-
.../FSpot.Exporters.Folder/HtmlGallery.cs | 16 +-
.../FSpot.Exporters.Gallery.csproj | 306 +-
.../FSpot.Exporters.Gallery/AccountDialog.cs | 14 +-
.../FSpot.Exporters.Gallery/FormClient.cs | 34 +-
.../FSpot.Exporters.Gallery/GalleryAccount.cs | 8 +-
.../FSpot.Exporters.Gallery/GalleryAddAlbum.cs | 12 +-
.../FSpot.Exporters.Gallery/GalleryExport.cs | 26 +-
.../FSpot.Exporters.Gallery/GalleryRemote.cs | 16 +-
.../FSpot.Exporters.PicasaWeb.csproj | 280 +-
.../FSpot.Exporters.PicasaWeb/GoogleAccount.cs | 36 +-
.../GoogleAccountDialog.cs | 22 +-
.../GoogleAccountManager.cs | 10 +-
.../FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs | 18 +-
.../FSpot.Exporters.PicasaWeb/PicasaWebExport.cs | 44 +-
.../FSpot.Exporters.SmugMug.csproj | 274 +-
.../FSpot.Exporters.SmugMug/SmugMugAccount.cs | 16 +-
.../SmugMugAccountDialog.cs | 2 +-
.../SmugMugAccountManager.cs | 22 +-
.../FSpot.Exporters.SmugMug/SmugMugAddAlbum.cs | 30 +-
.../FSpot.Exporters.SmugMug/SmugMugExport.cs | 36 +-
.../FSpot.Exporters.Tabblo.csproj | 284 +-
.../FSpot.Exporters.Tabblo/FSpotUploadProgress.cs | 14 +-
.../FSpot.Exporters.Tabblo/TabbloExport.cs | 26 +-
.../FSpot.Exporters.Tabblo/TabbloExportModel.cs | 36 +-
.../FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj | 256 +-
.../FSpot.Exporters.Zip/ZipExport.cs | 46 +-
.../FSpotExporters.UnitTests.csproj | 176 +-
.../FSpot.Tools.ChangePhotoPath.csproj | 264 +-
.../ChangePhotoPathController.cs | 20 +-
.../ChangePhotoPathGui.cs | 26 +-
.../FSpot.Tools.DevelopInUFraw.csproj | 252 +-
.../AbstractDevelopInUFRaw.cs | 24 +-
.../DevelopInUFRawBatch.cs | 16 +-
.../FSpot.Tools.LiveWebGallery.csproj | 284 +-
.../GalleryRequestHandler.cs | 58 +-
.../FSpot.Tools.LiveWebGallery/LiveWebGallery.cs | 20 +-
.../LiveWebGalleryDialog.cs | 24 +-
.../FSpot.Tools.LiveWebGallery/SimpleWebServer.cs | 24 +-
.../FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj | 278 +-
.../FSpot.Tools.MergeDb/MergeDb.cs | 38 +-
.../FSpot.Tools.MergeDb/MergeDbDialog.cs | 2 +-
.../FSpot.Tools.MergeDb/PickFolderDialog.cs | 14 +-
.../FSpot.Tools.RawPlusJpeg.csproj | 240 +-
.../FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs | 24 +-
.../FSpot.Tools.RetroactiveRoll.csproj | 222 +-
.../FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs | 16 +-
.../FSpot.Tools.ScreensaverConfig.csproj | 236 +-
.../ScreensaverConfig.cs | 20 +-
.../FSpot.Addins.Transitions/Cover.cs | 24 +-
.../FSpot.Transitions.Cover.csproj | 210 +-
.../FSpot.Addins.Transitions/Dissolve.cs | 24 +-
.../FSpot.Transitions.Dissolve.csproj | 210 +-
.../FSpot.Addins.Transitions/Push.cs | 24 +-
.../FSpot.Transitions.Push.csproj | 210 +-
329 files changed, 23784 insertions(+), 23784 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
old mode 100755
new mode 100644
diff --git a/build/dll-map-makefile-verifier b/build/dll-map-makefile-verifier
old mode 100755
new mode 100644
diff --git a/build/private-icon-theme-installer b/build/private-icon-theme-installer
old mode 100755
new mode 100644
diff --git a/icon-theme-installer b/icon-theme-installer
old mode 100755
new mode 100644
diff --git a/lib/Mono.Google/Mono.Google.csproj b/lib/Mono.Google/Mono.Google.csproj
index d4d74d7..2d73098 100644
--- a/lib/Mono.Google/Mono.Google.csproj
+++ b/lib/Mono.Google/Mono.Google.csproj
@@ -1,117 +1,117 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{40C7D4EA-FB93-49FE-B18F-700A28C3E670}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>Mono.Google</RootNamespace>
- <AssemblyName>Mono.Google</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="Mono.Google.Picasa\AlbumAccess.cs" />
- <Compile Include="Mono.Google\Authentication.cs" />
- <Compile Include="Mono.Google\CaptchaException.cs" />
- <Compile Include="Mono.Google.Picasa\CreateAlbumException.cs" />
- <Compile Include="Mono.Google.Picasa\DeleteAlbumException.cs" />
- <Compile Include="Mono.Google.Picasa\GDataApi.cs" />
- <Compile Include="Mono.Google\GoogleConnection.cs" />
- <Compile Include="Mono.Google\GoogleService.cs" />
- <Compile Include="Mono.Google\MultipartRequest.cs" />
- <Compile Include="Mono.Google\NoCheckCertificatePolicy.cs" />
- <Compile Include="Mono.Google.Picasa\PicasaAlbum.cs" />
- <Compile Include="Mono.Google.Picasa\PicasaAlbumCollection.cs" />
- <Compile Include="Mono.Google.Picasa\PicasaPicture.cs" />
- <Compile Include="Mono.Google.Picasa\PicasaPictureCollection.cs" />
- <Compile Include="Mono.Google.Picasa\PicasaWeb.cs" />
- <Compile Include="Mono.Google.Picasa\UploadPictureException.cs" />
- <Compile Include="Mono.Google.Picasa\UploadProgressEventArgs.cs" />
- <Compile Include="Mono.Google.Picasa\UploadProgressEventHandler.cs" />
- <Compile Include="Mono.Google.Picasa\XmlUtil.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{40C7D4EA-FB93-49FE-B18F-700A28C3E670}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>Mono.Google</RootNamespace>
+ <AssemblyName>Mono.Google</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="Mono.Google.Picasa\AlbumAccess.cs" />
+ <Compile Include="Mono.Google\Authentication.cs" />
+ <Compile Include="Mono.Google\CaptchaException.cs" />
+ <Compile Include="Mono.Google.Picasa\CreateAlbumException.cs" />
+ <Compile Include="Mono.Google.Picasa\DeleteAlbumException.cs" />
+ <Compile Include="Mono.Google.Picasa\GDataApi.cs" />
+ <Compile Include="Mono.Google\GoogleConnection.cs" />
+ <Compile Include="Mono.Google\GoogleService.cs" />
+ <Compile Include="Mono.Google\MultipartRequest.cs" />
+ <Compile Include="Mono.Google\NoCheckCertificatePolicy.cs" />
+ <Compile Include="Mono.Google.Picasa\PicasaAlbum.cs" />
+ <Compile Include="Mono.Google.Picasa\PicasaAlbumCollection.cs" />
+ <Compile Include="Mono.Google.Picasa\PicasaPicture.cs" />
+ <Compile Include="Mono.Google.Picasa\PicasaPictureCollection.cs" />
+ <Compile Include="Mono.Google.Picasa\PicasaWeb.cs" />
+ <Compile Include="Mono.Google.Picasa\UploadPictureException.cs" />
+ <Compile Include="Mono.Google.Picasa\UploadProgressEventArgs.cs" />
+ <Compile Include="Mono.Google.Picasa\UploadProgressEventHandler.cs" />
+ <Compile Include="Mono.Google.Picasa\XmlUtil.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/lib/Mono.Tabblo/Mono.Tabblo.csproj b/lib/Mono.Tabblo/Mono.Tabblo.csproj
index 8a1c973..14bbd57 100644
--- a/lib/Mono.Tabblo/Mono.Tabblo.csproj
+++ b/lib/Mono.Tabblo/Mono.Tabblo.csproj
@@ -1,107 +1,107 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{B5CDF05C-278A-40AA-A587-B27A00BD9135}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>Mono.Tabblo</RootNamespace>
- <AssemblyName>Mono.Tabblo</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="Mono.Tabblo\Connection.cs" />
- <Compile Include="Mono.Tabblo\IPreferences.cs" />
- <Compile Include="Mono.Tabblo\MultipartRequest.cs" />
- <Compile Include="Mono.Tabblo\Picture.cs" />
- <Compile Include="Mono.Tabblo\TabbloException.cs" />
- <Compile Include="Mono.Tabblo\TotalUploadProgress.cs" />
- <Compile Include="Mono.Tabblo\Uploader.cs" />
- <Compile Include="Mono.Tabblo\UploadProgressEventArgs.cs" />
- <Compile Include="Mono.Tabblo\UploadProgressEventHandler.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="Mono.Posix" />
- <Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{B5CDF05C-278A-40AA-A587-B27A00BD9135}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>Mono.Tabblo</RootNamespace>
+ <AssemblyName>Mono.Tabblo</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="Mono.Tabblo\Connection.cs" />
+ <Compile Include="Mono.Tabblo\IPreferences.cs" />
+ <Compile Include="Mono.Tabblo\MultipartRequest.cs" />
+ <Compile Include="Mono.Tabblo\Picture.cs" />
+ <Compile Include="Mono.Tabblo\TabbloException.cs" />
+ <Compile Include="Mono.Tabblo\TotalUploadProgress.cs" />
+ <Compile Include="Mono.Tabblo\Uploader.cs" />
+ <Compile Include="Mono.Tabblo\UploadProgressEventArgs.cs" />
+ <Compile Include="Mono.Tabblo\UploadProgressEventHandler.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="Mono.Posix" />
+ <Reference Include="System" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/lib/SmugMugNet/SmugMugNet.csproj b/lib/SmugMugNet/SmugMugNet.csproj
index b18efc4..fb60d37 100644
--- a/lib/SmugMugNet/SmugMugNet.csproj
+++ b/lib/SmugMugNet/SmugMugNet.csproj
@@ -1,106 +1,106 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>SmugMugNet</RootNamespace>
- <AssemblyName>SmugMugNet</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="SmugMugNet\NoCheckCertificatePolicy.cs" />
- <Compile Include="SmugMugNet\SmugMugApi.cs" />
- <Compile Include="SmugMugNet\Credentials.cs" />
- <Compile Include="SmugMugNet\Category.cs" />
- <Compile Include="SmugMugNet\Album.cs" />
- <Compile Include="SmugMugNet\SmugMugProxy.cs" />
- <Compile Include="SmugMugNet\SmugMugException.cs" />
- <Compile Include="SmugMugNet\SmugMugUploadException.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>SmugMugNet</RootNamespace>
+ <AssemblyName>SmugMugNet</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="SmugMugNet\NoCheckCertificatePolicy.cs" />
+ <Compile Include="SmugMugNet\SmugMugApi.cs" />
+ <Compile Include="SmugMugNet\Credentials.cs" />
+ <Compile Include="SmugMugNet\Category.cs" />
+ <Compile Include="SmugMugNet\Album.cs" />
+ <Compile Include="SmugMugNet\SmugMugProxy.cs" />
+ <Compile Include="SmugMugNet\SmugMugException.cs" />
+ <Compile Include="SmugMugNet\SmugMugUploadException.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="System.Xml" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/lib/dpap-sharp/dpap-client/dpap-sharp.dll b/lib/dpap-sharp/dpap-client/dpap-sharp.dll
deleted file mode 120000
index f4f70db..0000000
--- a/lib/dpap-sharp/dpap-client/dpap-sharp.dll
+++ /dev/null
@@ -1 +0,0 @@
-../lib/dpap-sharp.dll
\ No newline at end of file
diff --git a/lib/dpap-sharp/dpap-client/dpap-sharp.dll b/lib/dpap-sharp/dpap-client/dpap-sharp.dll
new file mode 100644
index 0000000..f4f70db
--- /dev/null
+++ b/lib/dpap-sharp/dpap-client/dpap-sharp.dll
@@ -0,0 +1 @@
+../lib/dpap-sharp.dll
\ No newline at end of file
diff --git a/lib/dpap-sharp/dpap-server/dpap-sharp.dll b/lib/dpap-sharp/dpap-server/dpap-sharp.dll
deleted file mode 120000
index f4f70db..0000000
--- a/lib/dpap-sharp/dpap-server/dpap-sharp.dll
+++ /dev/null
@@ -1 +0,0 @@
-../lib/dpap-sharp.dll
\ No newline at end of file
diff --git a/lib/dpap-sharp/dpap-server/dpap-sharp.dll b/lib/dpap-sharp/dpap-server/dpap-sharp.dll
new file mode 100644
index 0000000..f4f70db
--- /dev/null
+++ b/lib/dpap-sharp/dpap-server/dpap-sharp.dll
@@ -0,0 +1 @@
+../lib/dpap-sharp.dll
\ No newline at end of file
diff --git a/lib/gio-sharp/generator/AliasGen.cs b/lib/gio-sharp/generator/AliasGen.cs
index 19911d6..3134aa7 100644
--- a/lib/gio-sharp/generator/AliasGen.cs
+++ b/lib/gio-sharp/generator/AliasGen.cs
@@ -1,30 +1,30 @@
-// GtkSharp.Generation.AliasGen.cs - The Alias type Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class AliasGen : SimpleBase {
-
- public AliasGen (string ctype, string type) : base (ctype, type, String.Empty) {}
- }
-}
-
+// GtkSharp.Generation.AliasGen.cs - The Alias type Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class AliasGen : SimpleBase {
+
+ public AliasGen (string ctype, string type) : base (ctype, type, String.Empty) {}
+ }
+}
+
diff --git a/lib/gio-sharp/generator/BoxedGen.cs b/lib/gio-sharp/generator/BoxedGen.cs
index 759868c..6f0321d 100644
--- a/lib/gio-sharp/generator/BoxedGen.cs
+++ b/lib/gio-sharp/generator/BoxedGen.cs
@@ -1,82 +1,82 @@
-// GtkSharp.Generation.BoxedGen.cs - The Boxed Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
- using System.Xml;
-
- public class BoxedGen : StructBase {
-
- public BoxedGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override void Generate (GenerationInfo gen_info)
- {
- Method copy = methods["Copy"] as Method;
- methods.Remove ("Copy");
- methods.Remove ("Free");
-
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
- base.Generate (gen_info);
- sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
- sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);");
- sw.WriteLine ();
- sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
- sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");
- sw.WriteLine ("\t\t{");
-
- sw.WriteLine ("\t\t\tGLib.Value val = GLib.Value.Empty;");
- sw.WriteLine ("\t\t\tval.Init (" + QualifiedName + ".GType);");
- sw.WriteLine ("\t\t\tglibsharp_value_set_boxed (ref val, ref boxed);");
- sw.WriteLine ("\t\t\treturn val;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static explicit operator " + QualifiedName + " (GLib.Value val)");
- sw.WriteLine ("\t\t{");
-
- sw.WriteLine ("\t\t\tIntPtr boxed_ptr = glibsharp_value_get_boxed (ref val);");
- sw.WriteLine ("\t\t\treturn New (boxed_ptr);");
- sw.WriteLine ("\t\t}");
-
- if (copy != null && copy.IsDeprecated) {
- sw.WriteLine ();
- sw.WriteLine ("\t\t[Obsolete(\"This is a no-op\")]");
- sw.WriteLine ("\t\tpublic " + QualifiedName + " Copy() {");
- sw.WriteLine ("\t\t\treturn this;");
- sw.WriteLine ("\t\t}");
- }
-
- sw.WriteLine ("#endregion");
- AppendCustom(sw, gen_info.CustomDir);
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- Statistics.BoxedCount++;
- }
- }
-}
-
+// GtkSharp.Generation.BoxedGen.cs - The Boxed Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+ using System.Xml;
+
+ public class BoxedGen : StructBase {
+
+ public BoxedGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ Method copy = methods["Copy"] as Method;
+ methods.Remove ("Copy");
+ methods.Remove ("Free");
+
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ base.Generate (gen_info);
+ sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
+ sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
+ sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");
+ sw.WriteLine ("\t\t{");
+
+ sw.WriteLine ("\t\t\tGLib.Value val = GLib.Value.Empty;");
+ sw.WriteLine ("\t\t\tval.Init (" + QualifiedName + ".GType);");
+ sw.WriteLine ("\t\t\tglibsharp_value_set_boxed (ref val, ref boxed);");
+ sw.WriteLine ("\t\t\treturn val;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static explicit operator " + QualifiedName + " (GLib.Value val)");
+ sw.WriteLine ("\t\t{");
+
+ sw.WriteLine ("\t\t\tIntPtr boxed_ptr = glibsharp_value_get_boxed (ref val);");
+ sw.WriteLine ("\t\t\treturn New (boxed_ptr);");
+ sw.WriteLine ("\t\t}");
+
+ if (copy != null && copy.IsDeprecated) {
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t[Obsolete(\"This is a no-op\")]");
+ sw.WriteLine ("\t\tpublic " + QualifiedName + " Copy() {");
+ sw.WriteLine ("\t\t\treturn this;");
+ sw.WriteLine ("\t\t}");
+ }
+
+ sw.WriteLine ("#endregion");
+ AppendCustom(sw, gen_info.CustomDir);
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.BoxedCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/ByRefGen.cs b/lib/gio-sharp/generator/ByRefGen.cs
index 7a2641e..232c325 100644
--- a/lib/gio-sharp/generator/ByRefGen.cs
+++ b/lib/gio-sharp/generator/ByRefGen.cs
@@ -1,63 +1,63 @@
-// GtkSharp.Generation.ByRefGen.cs - The ByRef type Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ByRefGen : SimpleBase, IManualMarshaler {
-
- public ByRefGen (string ctype, string type) : base (ctype, type, type + ".Empty") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "native_" + var_name;
- }
-
- public string AllocNative ()
- {
- return "Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + QualifiedName + ")))";
- }
-
- public string AllocNative (string var_name)
- {
- return "GLib.Marshaller.StructureToPtrAlloc (" + var_name + ")";
- }
-
- public override string FromNative (string var_name)
- {
- return String.Format ("({0}) Marshal.PtrToStructure ({1}, typeof ({0}))", QualifiedName, var_name);
- }
-
- public string ReleaseNative (string var_name)
- {
- return "Marshal.FreeHGlobal (" + var_name + ")";
- }
- }
-}
-
+// GtkSharp.Generation.ByRefGen.cs - The ByRef type Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ByRefGen : SimpleBase, IManualMarshaler {
+
+ public ByRefGen (string ctype, string type) : base (ctype, type, type + ".Empty") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "native_" + var_name;
+ }
+
+ public string AllocNative ()
+ {
+ return "Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + QualifiedName + ")))";
+ }
+
+ public string AllocNative (string var_name)
+ {
+ return "GLib.Marshaller.StructureToPtrAlloc (" + var_name + ")";
+ }
+
+ public override string FromNative (string var_name)
+ {
+ return String.Format ("({0}) Marshal.PtrToStructure ({1}, typeof ({0}))", QualifiedName, var_name);
+ }
+
+ public string ReleaseNative (string var_name)
+ {
+ return "Marshal.FreeHGlobal (" + var_name + ")";
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/ChildProperty.cs b/lib/gio-sharp/generator/ChildProperty.cs
index fe361ed..a3041d0 100644
--- a/lib/gio-sharp/generator/ChildProperty.cs
+++ b/lib/gio-sharp/generator/ChildProperty.cs
@@ -1,45 +1,45 @@
-// GtkSharp.Generation.ChildProperty.cs - GtkContainer child properties
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class ChildProperty : Property {
-
- public ChildProperty (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
-
- protected override string PropertyAttribute (string qpname) {
- return "[Gtk.ChildProperty (" + qpname + ")]";
- }
-
- protected override string RawGetter (string qpname) {
- return "parent.ChildGetProperty (child, " + qpname + ")";
- }
-
- protected override string RawSetter (string qpname) {
- return "parent.ChildSetProperty(child, " + qpname + ", val)";
- }
-
- }
-}
-
+// GtkSharp.Generation.ChildProperty.cs - GtkContainer child properties
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class ChildProperty : Property {
+
+ public ChildProperty (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
+
+ protected override string PropertyAttribute (string qpname) {
+ return "[Gtk.ChildProperty (" + qpname + ")]";
+ }
+
+ protected override string RawGetter (string qpname) {
+ return "parent.ChildGetProperty (child, " + qpname + ")";
+ }
+
+ protected override string RawSetter (string qpname) {
+ return "parent.ChildSetProperty(child, " + qpname + ", val)";
+ }
+
+ }
+}
+
diff --git a/lib/gio-sharp/generator/ClassGen.cs b/lib/gio-sharp/generator/ClassGen.cs
index 700a27a..9f4a2f2 100644
--- a/lib/gio-sharp/generator/ClassGen.cs
+++ b/lib/gio-sharp/generator/ClassGen.cs
@@ -1,94 +1,94 @@
-// GtkSharp.Generation.ClassGen.cs - The Class Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Text;
- using System.Xml;
-
- public class ClassGen : ClassBase {
-
- public ClassGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override string AssignToName {
- get {
- return String.Empty;
- }
- }
-
- public override string MarshalType {
- get {
- return String.Empty;
- }
- }
-
- public override string CallByName ()
- {
- return String.Empty;
- }
-
- public override string CallByName (string var)
- {
- return String.Empty;
- }
-
- public override string FromNative (string var)
- {
- return String.Empty;
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream(Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- sw.WriteLine ("#region Autogenerated code");
- if (IsDeprecated)
- sw.WriteLine ("\t[Obsolete]");
- sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
- sw.WriteLine (" {");
- sw.WriteLine ();
-
- GenProperties (gen_info, null);
- GenMethods (gen_info, null, null);
-
- sw.WriteLine ("#endregion");
- AppendCustom(sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
-
- sw.Close ();
- gen_info.Writer = null;
- }
- }
-}
-
+// GtkSharp.Generation.ClassGen.cs - The Class Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Text;
+ using System.Xml;
+
+ public class ClassGen : ClassBase {
+
+ public ClassGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override string AssignToName {
+ get {
+ return String.Empty;
+ }
+ }
+
+ public override string MarshalType {
+ get {
+ return String.Empty;
+ }
+ }
+
+ public override string CallByName ()
+ {
+ return String.Empty;
+ }
+
+ public override string CallByName (string var)
+ {
+ return String.Empty;
+ }
+
+ public override string FromNative (string var)
+ {
+ return String.Empty;
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream(Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ sw.WriteLine ("#region Autogenerated code");
+ if (IsDeprecated)
+ sw.WriteLine ("\t[Obsolete]");
+ sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
+ sw.WriteLine (" {");
+ sw.WriteLine ();
+
+ GenProperties (gen_info, null);
+ GenMethods (gen_info, null, null);
+
+ sw.WriteLine ("#endregion");
+ AppendCustom(sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+
+ sw.Close ();
+ gen_info.Writer = null;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/CodeGenerator.cs b/lib/gio-sharp/generator/CodeGenerator.cs
index f45c7a0..dfb9526 100644
--- a/lib/gio-sharp/generator/CodeGenerator.cs
+++ b/lib/gio-sharp/generator/CodeGenerator.cs
@@ -1,122 +1,122 @@
-// GtkSharp.Generation.CodeGenerator.cs - The main code generation engine.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.Xml;
-
- public class CodeGenerator {
-
- public static int Main (string[] args)
- {
- if (args.Length < 2) {
- Console.WriteLine ("Usage: codegen --generate <filename1...>");
- return 0;
- }
-
- bool generate = false;
- string dir = "";
- string custom_dir = "";
- string assembly_name = "";
- string glue_filename = "";
- string glue_includes = "";
- string gluelib_name = "";
-
- SymbolTable table = SymbolTable.Table;
- ArrayList gens = new ArrayList ();
- foreach (string arg in args) {
- string filename = arg;
- if (arg == "--generate") {
- generate = true;
- continue;
- } else if (arg == "--include") {
- generate = false;
- continue;
- } else if (arg.StartsWith ("-I:")) {
- generate = false;
- filename = filename.Substring (3);
- } else if (arg.StartsWith ("--outdir=")) {
- generate = false;
- dir = arg.Substring (9);
- continue;
- } else if (arg.StartsWith ("--customdir=")) {
- generate = false;
- custom_dir = arg.Substring (12);
- continue;
- } else if (arg.StartsWith ("--assembly-name=")) {
- generate = false;
- assembly_name = arg.Substring (16);
- continue;
- } else if (arg.StartsWith ("--glue-filename=")) {
- generate = false;
- glue_filename = arg.Substring (16);
- continue;
- } else if (arg.StartsWith ("--glue-includes=")) {
- generate = false;
- glue_includes = arg.Substring (16);
- continue;
- } else if (arg.StartsWith ("--gluelib-name=")) {
- generate = false;
- gluelib_name = arg.Substring (15);
- continue;
- }
-
- Parser p = new Parser ();
- IGeneratable[] curr_gens = p.Parse (filename);
- table.AddTypes (curr_gens);
- if (generate)
- gens.AddRange (curr_gens);
- }
-
- // Now that everything is loaded, validate all the to-be-
- // generated generatables and then remove the invalid ones.
- ArrayList invalids = new ArrayList ();
- foreach (IGeneratable gen in gens) {
- if (!gen.Validate ())
- invalids.Add (gen);
- }
- foreach (IGeneratable gen in invalids)
- gens.Remove (gen);
-
- GenerationInfo gen_info = null;
- if (dir != "" || assembly_name != "" || glue_filename != "" || glue_includes != "" || gluelib_name != "")
- gen_info = new GenerationInfo (dir, custom_dir, assembly_name, glue_filename, glue_includes, gluelib_name);
-
- foreach (IGeneratable gen in gens) {
- if (gen_info == null)
- gen.Generate ();
- else
- gen.Generate (gen_info);
- }
-
- ObjectGen.GenerateMappers ();
-
- if (gen_info != null)
- gen_info.CloseGlueWriter ();
-
- Statistics.Report();
- return 0;
- }
- }
-}
+// GtkSharp.Generation.CodeGenerator.cs - The main code generation engine.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.Xml;
+
+ public class CodeGenerator {
+
+ public static int Main (string[] args)
+ {
+ if (args.Length < 2) {
+ Console.WriteLine ("Usage: codegen --generate <filename1...>");
+ return 0;
+ }
+
+ bool generate = false;
+ string dir = "";
+ string custom_dir = "";
+ string assembly_name = "";
+ string glue_filename = "";
+ string glue_includes = "";
+ string gluelib_name = "";
+
+ SymbolTable table = SymbolTable.Table;
+ ArrayList gens = new ArrayList ();
+ foreach (string arg in args) {
+ string filename = arg;
+ if (arg == "--generate") {
+ generate = true;
+ continue;
+ } else if (arg == "--include") {
+ generate = false;
+ continue;
+ } else if (arg.StartsWith ("-I:")) {
+ generate = false;
+ filename = filename.Substring (3);
+ } else if (arg.StartsWith ("--outdir=")) {
+ generate = false;
+ dir = arg.Substring (9);
+ continue;
+ } else if (arg.StartsWith ("--customdir=")) {
+ generate = false;
+ custom_dir = arg.Substring (12);
+ continue;
+ } else if (arg.StartsWith ("--assembly-name=")) {
+ generate = false;
+ assembly_name = arg.Substring (16);
+ continue;
+ } else if (arg.StartsWith ("--glue-filename=")) {
+ generate = false;
+ glue_filename = arg.Substring (16);
+ continue;
+ } else if (arg.StartsWith ("--glue-includes=")) {
+ generate = false;
+ glue_includes = arg.Substring (16);
+ continue;
+ } else if (arg.StartsWith ("--gluelib-name=")) {
+ generate = false;
+ gluelib_name = arg.Substring (15);
+ continue;
+ }
+
+ Parser p = new Parser ();
+ IGeneratable[] curr_gens = p.Parse (filename);
+ table.AddTypes (curr_gens);
+ if (generate)
+ gens.AddRange (curr_gens);
+ }
+
+ // Now that everything is loaded, validate all the to-be-
+ // generated generatables and then remove the invalid ones.
+ ArrayList invalids = new ArrayList ();
+ foreach (IGeneratable gen in gens) {
+ if (!gen.Validate ())
+ invalids.Add (gen);
+ }
+ foreach (IGeneratable gen in invalids)
+ gens.Remove (gen);
+
+ GenerationInfo gen_info = null;
+ if (dir != "" || assembly_name != "" || glue_filename != "" || glue_includes != "" || gluelib_name != "")
+ gen_info = new GenerationInfo (dir, custom_dir, assembly_name, glue_filename, glue_includes, gluelib_name);
+
+ foreach (IGeneratable gen in gens) {
+ if (gen_info == null)
+ gen.Generate ();
+ else
+ gen.Generate (gen_info);
+ }
+
+ ObjectGen.GenerateMappers ();
+
+ if (gen_info != null)
+ gen_info.CloseGlueWriter ();
+
+ Statistics.Report();
+ return 0;
+ }
+ }
+}
diff --git a/lib/gio-sharp/generator/ConstFilenameGen.cs b/lib/gio-sharp/generator/ConstFilenameGen.cs
index 562ab9c..f094aa1 100644
--- a/lib/gio-sharp/generator/ConstFilenameGen.cs
+++ b/lib/gio-sharp/generator/ConstFilenameGen.cs
@@ -1,52 +1,52 @@
-// ConstFilenameGen.cs - The Const Filename type Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ConstFilenameGen : SimpleBase, IManualMarshaler {
-
- public ConstFilenameGen (string ctype) : base (ctype, "string", "null") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string FromNative (string var)
- {
- return "GLib.Marshaller.FilenamePtrToString (" + var + ")";
- }
-
- public string AllocNative (string managed_var)
- {
- return "GLib.Marshaller.StringToFilenamePtr (" + managed_var + ")";
- }
-
- public string ReleaseNative (string native_var)
- {
- return "GLib.Marshaller.Free (" + native_var + ")";
- }
- }
-}
-
+// ConstFilenameGen.cs - The Const Filename type Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ConstFilenameGen : SimpleBase, IManualMarshaler {
+
+ public ConstFilenameGen (string ctype) : base (ctype, "string", "null") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string FromNative (string var)
+ {
+ return "GLib.Marshaller.FilenamePtrToString (" + var + ")";
+ }
+
+ public string AllocNative (string managed_var)
+ {
+ return "GLib.Marshaller.StringToFilenamePtr (" + managed_var + ")";
+ }
+
+ public string ReleaseNative (string native_var)
+ {
+ return "GLib.Marshaller.Free (" + native_var + ")";
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/ConstStringGen.cs b/lib/gio-sharp/generator/ConstStringGen.cs
index 70f882e..adef8d3 100644
--- a/lib/gio-sharp/generator/ConstStringGen.cs
+++ b/lib/gio-sharp/generator/ConstStringGen.cs
@@ -1,59 +1,59 @@
-// GtkSharp.Generation.ConstStringGen.cs - The Const String type Generatable.
-//
-// Author: Rachel Hestilow <rachel nullenvoid com>
-// Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2003 Rachel Hestilow
-// Copyright (c) 2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ConstStringGen : SimpleBase, IManualMarshaler {
-
- public ConstStringGen (string ctype) : base (ctype, "string", "null") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string FromNative (string var)
- {
- return "GLib.Marshaller.Utf8PtrToString (" + var + ")";
- }
-
- public override string ToNativeReturn (string var)
- {
- return "GLib.Marshaller.StringToPtrGStrdup (" + var + ")";
- }
-
- public string AllocNative (string managed_var)
- {
- return "GLib.Marshaller.StringToPtrGStrdup (" + managed_var + ")";
- }
-
- public string ReleaseNative (string native_var)
- {
- return "GLib.Marshaller.Free (" + native_var + ")";
- }
- }
-}
-
+// GtkSharp.Generation.ConstStringGen.cs - The Const String type Generatable.
+//
+// Author: Rachel Hestilow <rachel nullenvoid com>
+// Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2003 Rachel Hestilow
+// Copyright (c) 2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ConstStringGen : SimpleBase, IManualMarshaler {
+
+ public ConstStringGen (string ctype) : base (ctype, "string", "null") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string FromNative (string var)
+ {
+ return "GLib.Marshaller.Utf8PtrToString (" + var + ")";
+ }
+
+ public override string ToNativeReturn (string var)
+ {
+ return "GLib.Marshaller.StringToPtrGStrdup (" + var + ")";
+ }
+
+ public string AllocNative (string managed_var)
+ {
+ return "GLib.Marshaller.StringToPtrGStrdup (" + managed_var + ")";
+ }
+
+ public string ReleaseNative (string native_var)
+ {
+ return "GLib.Marshaller.Free (" + native_var + ")";
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Ctor.cs b/lib/gio-sharp/generator/Ctor.cs
index 9d57043..d6a427e 100644
--- a/lib/gio-sharp/generator/Ctor.cs
+++ b/lib/gio-sharp/generator/Ctor.cs
@@ -1,165 +1,165 @@
-// GtkSharp.Generation.Ctor.cs - The Constructor Generation Class.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004-2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Ctor : MethodBase {
-
- private bool preferred;
- private string name;
- private bool needs_chaining = false;
-
- public Ctor (XmlElement elem, ClassBase implementor) : base (elem, implementor)
- {
- if (elem.HasAttribute ("preferred"))
- preferred = true;
- if (implementor is ObjectGen)
- needs_chaining = true;
- name = implementor.Name;
- }
-
- public bool Preferred {
- get { return preferred; }
- set { preferred = value; }
- }
-
- public string StaticName {
- get {
- if (!IsStatic)
- return String.Empty;
-
- string[] toks = CName.Substring(CName.IndexOf("new")).Split ('_');
- string result = String.Empty;
-
- foreach (string tok in toks)
- result += tok.Substring(0,1).ToUpper() + tok.Substring(1);
- return result;
- }
- }
-
- void GenerateImport (StreamWriter sw)
- {
- sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
- sw.WriteLine("\t\tstatic extern " + Safety + "IntPtr " + CName + "(" + Parameters.ImportSignature + ");");
- sw.WriteLine();
- }
-
- void GenerateStatic (GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.Writer;
+// GtkSharp.Generation.Ctor.cs - The Constructor Generation Class.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Ctor : MethodBase {
+
+ private bool preferred;
+ private string name;
+ private bool needs_chaining = false;
+
+ public Ctor (XmlElement elem, ClassBase implementor) : base (elem, implementor)
+ {
+ if (elem.HasAttribute ("preferred"))
+ preferred = true;
+ if (implementor is ObjectGen)
+ needs_chaining = true;
+ name = implementor.Name;
+ }
+
+ public bool Preferred {
+ get { return preferred; }
+ set { preferred = value; }
+ }
+
+ public string StaticName {
+ get {
+ if (!IsStatic)
+ return String.Empty;
+
+ string[] toks = CName.Substring(CName.IndexOf("new")).Split ('_');
+ string result = String.Empty;
+
+ foreach (string tok in toks)
+ result += tok.Substring(0,1).ToUpper() + tok.Substring(1);
+ return result;
+ }
+ }
+
+ void GenerateImport (StreamWriter sw)
+ {
+ sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
+ sw.WriteLine("\t\tstatic extern " + Safety + "IntPtr " + CName + "(" + Parameters.ImportSignature + ");");
+ sw.WriteLine();
+ }
+
+ void GenerateStatic (GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.Writer;
sw.WriteLine("\t\t" + Protection + " static " + Safety + Modifiers + name + " " + StaticName + "(" + Signature + ")");
- sw.WriteLine("\t\t{");
-
- Body.Initialize(gen_info, false, false, "");
-
- sw.Write("\t\t\t" + name + " result = ");
- if (container_type is StructBase)
- sw.Write ("{0}.New (", name);
- else
- sw.Write ("new {0} (", name);
- sw.WriteLine (CName + "(" + Body.GetCallString (false) + "));");
- Body.Finish (sw, "");
- Body.HandleException (sw, "");
- sw.WriteLine ("\t\t\treturn result;");
- }
-
- public void Generate (GenerationInfo gen_info)
- {
- if (!Validate ())
- return;
-
- StreamWriter sw = gen_info.Writer;
- gen_info.CurrentMember = CName;
-
- GenerateImport (sw);
-
- if (IsStatic)
- GenerateStatic (gen_info);
- else {
+ sw.WriteLine("\t\t{");
+
+ Body.Initialize(gen_info, false, false, "");
+
+ sw.Write("\t\t\t" + name + " result = ");
+ if (container_type is StructBase)
+ sw.Write ("{0}.New (", name);
+ else
+ sw.Write ("new {0} (", name);
+ sw.WriteLine (CName + "(" + Body.GetCallString (false) + "));");
+ Body.Finish (sw, "");
+ Body.HandleException (sw, "");
+ sw.WriteLine ("\t\t\treturn result;");
+ }
+
+ public void Generate (GenerationInfo gen_info)
+ {
+ if (!Validate ())
+ return;
+
+ StreamWriter sw = gen_info.Writer;
+ gen_info.CurrentMember = CName;
+
+ GenerateImport (sw);
+
+ if (IsStatic)
+ GenerateStatic (gen_info);
+ else {
sw.WriteLine("\t\t{0} {1}{2} ({3}) {4}", Protection, Safety, name, Signature.ToString(), needs_chaining ? ": base (IntPtr.Zero)" : "");
- sw.WriteLine("\t\t{");
-
- if (needs_chaining) {
- sw.WriteLine ("\t\t\tif (GetType () != typeof (" + name + ")) {");
-
- if (Parameters.Count == 0) {
- sw.WriteLine ("\t\t\t\tCreateNativeObject (new string [0], new GLib.Value[0]);");
- sw.WriteLine ("\t\t\t\treturn;");
- } else {
- ArrayList names = new ArrayList ();
- ArrayList values = new ArrayList ();
- for (int i = 0; i < Parameters.Count; i++) {
- Parameter p = Parameters[i];
- if (container_type.GetPropertyRecursively (p.StudlyName) != null) {
- names.Add (p.Name);
- values.Add (p.Name);
- } else if (p.PropertyName != String.Empty) {
- names.Add (p.PropertyName);
- values.Add (p.Name);
- }
- }
-
- if (names.Count == Parameters.Count) {
- sw.WriteLine ("\t\t\t\tArrayList vals = new ArrayList();");
- sw.WriteLine ("\t\t\t\tArrayList names = new ArrayList();");
- for (int i = 0; i < names.Count; i++) {
- Parameter p = Parameters [i];
- string indent = "\t\t\t\t";
- if (p.Generatable is ClassBase && !(p.Generatable is StructBase)) {
- sw.WriteLine (indent + "if (" + p.Name + " != null) {");
- indent += "\t";
- }
- sw.WriteLine (indent + "names.Add (\"" + names [i] + "\");");
- sw.WriteLine (indent + "vals.Add (new GLib.Value (" + values[i] + "));");
-
- if (p.Generatable is ClassBase && !(p.Generatable is StructBase))
- sw.WriteLine ("\t\t\t\t}");
- }
-
- sw.WriteLine ("\t\t\t\tCreateNativeObject ((string[])names.ToArray (typeof (string)), (GLib.Value[])vals.ToArray (typeof (GLib.Value)));");
- sw.WriteLine ("\t\t\t\treturn;");
- } else
- sw.WriteLine ("\t\t\t\tthrow new InvalidOperationException (\"Can't override this constructor.\");");
- }
-
- sw.WriteLine ("\t\t\t}");
- }
-
- Body.Initialize(gen_info, false, false, "");
- sw.WriteLine("\t\t\t{0} = {1}({2});", container_type.AssignToName, CName, Body.GetCallString (false));
- Body.Finish (sw, "");
- Body.HandleException (sw, "");
- }
-
- sw.WriteLine("\t\t}");
- sw.WriteLine();
-
- Statistics.CtorCount++;
- }
- }
-}
-
+ sw.WriteLine("\t\t{");
+
+ if (needs_chaining) {
+ sw.WriteLine ("\t\t\tif (GetType () != typeof (" + name + ")) {");
+
+ if (Parameters.Count == 0) {
+ sw.WriteLine ("\t\t\t\tCreateNativeObject (new string [0], new GLib.Value[0]);");
+ sw.WriteLine ("\t\t\t\treturn;");
+ } else {
+ ArrayList names = new ArrayList ();
+ ArrayList values = new ArrayList ();
+ for (int i = 0; i < Parameters.Count; i++) {
+ Parameter p = Parameters[i];
+ if (container_type.GetPropertyRecursively (p.StudlyName) != null) {
+ names.Add (p.Name);
+ values.Add (p.Name);
+ } else if (p.PropertyName != String.Empty) {
+ names.Add (p.PropertyName);
+ values.Add (p.Name);
+ }
+ }
+
+ if (names.Count == Parameters.Count) {
+ sw.WriteLine ("\t\t\t\tArrayList vals = new ArrayList();");
+ sw.WriteLine ("\t\t\t\tArrayList names = new ArrayList();");
+ for (int i = 0; i < names.Count; i++) {
+ Parameter p = Parameters [i];
+ string indent = "\t\t\t\t";
+ if (p.Generatable is ClassBase && !(p.Generatable is StructBase)) {
+ sw.WriteLine (indent + "if (" + p.Name + " != null) {");
+ indent += "\t";
+ }
+ sw.WriteLine (indent + "names.Add (\"" + names [i] + "\");");
+ sw.WriteLine (indent + "vals.Add (new GLib.Value (" + values[i] + "));");
+
+ if (p.Generatable is ClassBase && !(p.Generatable is StructBase))
+ sw.WriteLine ("\t\t\t\t}");
+ }
+
+ sw.WriteLine ("\t\t\t\tCreateNativeObject ((string[])names.ToArray (typeof (string)), (GLib.Value[])vals.ToArray (typeof (GLib.Value)));");
+ sw.WriteLine ("\t\t\t\treturn;");
+ } else
+ sw.WriteLine ("\t\t\t\tthrow new InvalidOperationException (\"Can't override this constructor.\");");
+ }
+
+ sw.WriteLine ("\t\t\t}");
+ }
+
+ Body.Initialize(gen_info, false, false, "");
+ sw.WriteLine("\t\t\t{0} = {1}({2});", container_type.AssignToName, CName, Body.GetCallString (false));
+ Body.Finish (sw, "");
+ Body.HandleException (sw, "");
+ }
+
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+
+ Statistics.CtorCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/EnumGen.cs b/lib/gio-sharp/generator/EnumGen.cs
index fa66af5..82091f6 100644
--- a/lib/gio-sharp/generator/EnumGen.cs
+++ b/lib/gio-sharp/generator/EnumGen.cs
@@ -1,127 +1,127 @@
-// GtkSharp.Generation.EnumGen.cs - The Enumeration Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class EnumGen : GenBase {
-
- string enum_type = String.Empty;
- ArrayList members = new ArrayList ();
-
- public EnumGen (XmlElement ns, XmlElement elem) : base (ns, elem)
- {
- foreach (XmlElement member in elem.ChildNodes) {
- if (member.Name != "member")
- continue;
-
- string result = "\t\t" + member.GetAttribute("name");
- if (member.HasAttribute("value")) {
- string value = member.GetAttribute("value");
- if (value.EndsWith("U")) {
- enum_type = " : uint";
- value = value.TrimEnd('U');
- }
- result += " = " + value;
- }
- members.Add (result + ",");
- }
- }
-
- public override bool Validate ()
- {
- return true;
- }
-
- public override string DefaultValue {
- get {
- return "(" + QualifiedName + ") 0";
- }
- }
-
- public override string MarshalType {
- get {
- return "int";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "(int) " + var_name;
- }
-
- public override string FromNative(string var)
- {
- return "(" + QualifiedName + ") " + var;
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- sw.WriteLine ("#region Autogenerated code");
-
- if (Elem.GetAttribute("type") == "flags")
- sw.WriteLine ("\t[Flags]");
- if (Elem.HasAttribute("gtype"))
- sw.WriteLine ("\t[GLib.GType (typeof (" + NS + "." + Name + "GType))]");
-
- string access = IsInternal ? "internal" : "public";
- sw.WriteLine ("\t" + access + " enum " + Name + enum_type + " {");
- sw.WriteLine ();
-
- foreach (string member in members)
- sw.WriteLine (member);
-
- sw.WriteLine ("\t}");
-
- if (Elem.HasAttribute ("gtype")) {
- sw.WriteLine ();
- sw.WriteLine ("\tinternal class " + Name + "GType {");
- sw.WriteLine ("\t\t[DllImport (\"" + LibraryName + "\")]");
- sw.WriteLine ("\t\tstatic extern IntPtr " + Elem.GetAttribute ("gtype") + " ();");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static GLib.GType GType {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn new GLib.GType (" + Elem.GetAttribute ("gtype") + " ());");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("\t}");
- }
-
- sw.WriteLine ("#endregion");
- sw.WriteLine ("}");
- sw.Close ();
- Statistics.EnumCount++;
- }
- }
-}
-
+// GtkSharp.Generation.EnumGen.cs - The Enumeration Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class EnumGen : GenBase {
+
+ string enum_type = String.Empty;
+ ArrayList members = new ArrayList ();
+
+ public EnumGen (XmlElement ns, XmlElement elem) : base (ns, elem)
+ {
+ foreach (XmlElement member in elem.ChildNodes) {
+ if (member.Name != "member")
+ continue;
+
+ string result = "\t\t" + member.GetAttribute("name");
+ if (member.HasAttribute("value")) {
+ string value = member.GetAttribute("value");
+ if (value.EndsWith("U")) {
+ enum_type = " : uint";
+ value = value.TrimEnd('U');
+ }
+ result += " = " + value;
+ }
+ members.Add (result + ",");
+ }
+ }
+
+ public override bool Validate ()
+ {
+ return true;
+ }
+
+ public override string DefaultValue {
+ get {
+ return "(" + QualifiedName + ") 0";
+ }
+ }
+
+ public override string MarshalType {
+ get {
+ return "int";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "(int) " + var_name;
+ }
+
+ public override string FromNative(string var)
+ {
+ return "(" + QualifiedName + ") " + var;
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ sw.WriteLine ("#region Autogenerated code");
+
+ if (Elem.GetAttribute("type") == "flags")
+ sw.WriteLine ("\t[Flags]");
+ if (Elem.HasAttribute("gtype"))
+ sw.WriteLine ("\t[GLib.GType (typeof (" + NS + "." + Name + "GType))]");
+
+ string access = IsInternal ? "internal" : "public";
+ sw.WriteLine ("\t" + access + " enum " + Name + enum_type + " {");
+ sw.WriteLine ();
+
+ foreach (string member in members)
+ sw.WriteLine (member);
+
+ sw.WriteLine ("\t}");
+
+ if (Elem.HasAttribute ("gtype")) {
+ sw.WriteLine ();
+ sw.WriteLine ("\tinternal class " + Name + "GType {");
+ sw.WriteLine ("\t\t[DllImport (\"" + LibraryName + "\")]");
+ sw.WriteLine ("\t\tstatic extern IntPtr " + Elem.GetAttribute ("gtype") + " ();");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static GLib.GType GType {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn new GLib.GType (" + Elem.GetAttribute ("gtype") + " ());");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("\t}");
+ }
+
+ sw.WriteLine ("#endregion");
+ sw.WriteLine ("}");
+ sw.Close ();
+ Statistics.EnumCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/GenBase.cs b/lib/gio-sharp/generator/GenBase.cs
index db0a004..5b9219a 100644
--- a/lib/gio-sharp/generator/GenBase.cs
+++ b/lib/gio-sharp/generator/GenBase.cs
@@ -1,54 +1,54 @@
-// GtkSharp.Generation.GenBase.cs - The Generatable base class.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001-2002 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
- using System.Xml;
-
- public abstract class GenBase : IGeneratable {
-
- private XmlElement ns;
- private XmlElement elem;
-
- protected GenBase (XmlElement ns, XmlElement elem)
- {
- this.ns = ns;
- this.elem = elem;
- }
-
- public string CName {
- get {
- return elem.GetAttribute ("cname");
- }
- }
-
- public XmlElement Elem {
- get {
- return elem;
- }
- }
-
+// GtkSharp.Generation.GenBase.cs - The Generatable base class.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001-2002 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+ using System.Xml;
+
+ public abstract class GenBase : IGeneratable {
+
+ private XmlElement ns;
+ private XmlElement elem;
+
+ protected GenBase (XmlElement ns, XmlElement elem)
+ {
+ this.ns = ns;
+ this.elem = elem;
+ }
+
+ public string CName {
+ get {
+ return elem.GetAttribute ("cname");
+ }
+ }
+
+ public XmlElement Elem {
+ get {
+ return elem;
+ }
+ }
+
public bool IsInternal {
get {
if (elem.HasAttribute ("internal")) {
@@ -59,84 +59,84 @@ namespace GtkSharp.Generation {
}
}
- public string LibraryName {
- get {
- return ns.GetAttribute ("library");
- }
- }
-
- public virtual string MarshalReturnType {
- get {
- return MarshalType;
- }
- }
-
- public abstract string MarshalType { get; }
-
- public string Name {
- get {
- return elem.GetAttribute ("name");
- }
- }
-
- public string NS {
- get {
- return ns.GetAttribute ("name");
- }
- }
-
- public abstract string DefaultValue { get; }
-
- public string QualifiedName {
- get {
- return NS + "." + Name;
- }
- }
-
- public virtual string ToNativeReturnType {
- get {
- return MarshalType;
- }
- }
-
- protected void AppendCustom (StreamWriter sw, string custom_dir)
- {
- char sep = Path.DirectorySeparatorChar;
- string custom = custom_dir + sep + Name + ".custom";
- if (File.Exists(custom)) {
- sw.WriteLine ("#region Customized extensions");
- sw.WriteLine ("#line 1 \"" + Name + ".custom\"");
- FileStream custstream = new FileStream(custom, FileMode.Open, FileAccess.Read);
- StreamReader sr = new StreamReader(custstream);
- sw.WriteLine (sr.ReadToEnd ());
- sw.WriteLine ("#endregion");
- sr.Close ();
- }
- }
-
- public abstract string CallByName (string var);
-
- public abstract string FromNative (string var);
-
- public virtual string FromNativeReturn (string var)
- {
- return FromNative (var);
- }
-
- public virtual string ToNativeReturn (string var)
- {
- return CallByName (var);
- }
-
- public abstract bool Validate ();
-
- public void Generate ()
- {
- GenerationInfo geninfo = new GenerationInfo (ns);
- Generate (geninfo);
- }
-
- public abstract void Generate (GenerationInfo geninfo);
- }
-}
-
+ public string LibraryName {
+ get {
+ return ns.GetAttribute ("library");
+ }
+ }
+
+ public virtual string MarshalReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ public abstract string MarshalType { get; }
+
+ public string Name {
+ get {
+ return elem.GetAttribute ("name");
+ }
+ }
+
+ public string NS {
+ get {
+ return ns.GetAttribute ("name");
+ }
+ }
+
+ public abstract string DefaultValue { get; }
+
+ public string QualifiedName {
+ get {
+ return NS + "." + Name;
+ }
+ }
+
+ public virtual string ToNativeReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ protected void AppendCustom (StreamWriter sw, string custom_dir)
+ {
+ char sep = Path.DirectorySeparatorChar;
+ string custom = custom_dir + sep + Name + ".custom";
+ if (File.Exists(custom)) {
+ sw.WriteLine ("#region Customized extensions");
+ sw.WriteLine ("#line 1 \"" + Name + ".custom\"");
+ FileStream custstream = new FileStream(custom, FileMode.Open, FileAccess.Read);
+ StreamReader sr = new StreamReader(custstream);
+ sw.WriteLine (sr.ReadToEnd ());
+ sw.WriteLine ("#endregion");
+ sr.Close ();
+ }
+ }
+
+ public abstract string CallByName (string var);
+
+ public abstract string FromNative (string var);
+
+ public virtual string FromNativeReturn (string var)
+ {
+ return FromNative (var);
+ }
+
+ public virtual string ToNativeReturn (string var)
+ {
+ return CallByName (var);
+ }
+
+ public abstract bool Validate ();
+
+ public void Generate ()
+ {
+ GenerationInfo geninfo = new GenerationInfo (ns);
+ Generate (geninfo);
+ }
+
+ public abstract void Generate (GenerationInfo geninfo);
+ }
+}
+
diff --git a/lib/gio-sharp/generator/GenerationInfo.cs b/lib/gio-sharp/generator/GenerationInfo.cs
index 7b7619a..3031c7c 100644
--- a/lib/gio-sharp/generator/GenerationInfo.cs
+++ b/lib/gio-sharp/generator/GenerationInfo.cs
@@ -1,188 +1,188 @@
-// GtkSharp.Generation.GenerationInfo.cs - Generation information class.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2003-2008 Novell Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class GenerationInfo {
-
- string dir;
- string custom_dir;
- string assembly_name;
- string gluelib_name;
- bool glue_enabled;
- StreamWriter sw;
- StreamWriter glue_sw;
-
- public GenerationInfo (XmlElement ns)
- {
- string ns_name = ns.GetAttribute ("name");
- char sep = Path.DirectorySeparatorChar;
- dir = ".." + sep + ns_name.ToLower () + sep + "generated";
- custom_dir = ".." + sep + ns_name.ToLower ();
- assembly_name = ns_name.ToLower () + "-sharp";
- }
-
- public GenerationInfo (string dir, string assembly_name) : this (dir, dir, assembly_name, "", "", "") {}
-
- public GenerationInfo (string dir, string custom_dir, string assembly_name, string glue_filename, string glue_includes, string gluelib_name)
- {
- this.dir = dir;
- this.custom_dir = custom_dir;
- this.assembly_name = assembly_name;
- this.gluelib_name = gluelib_name;
- InitializeGlue (glue_filename, glue_includes, gluelib_name);
- }
-
- void InitializeGlue (string glue_filename, string glue_includes, string gluelib_name)
- {
- if (gluelib_name != String.Empty && glue_filename != String.Empty) {
- FileStream stream;
- try {
- stream = new FileStream (glue_filename, FileMode.Create, FileAccess.Write);
- } catch (Exception) {
- Console.Error.WriteLine ("Unable to create specified glue file. Glue will not be generated.");
- return;
- }
-
- glue_sw = new StreamWriter (stream);
-
- glue_sw.WriteLine ("// This file was generated by the Gtk# code generator.");
- glue_sw.WriteLine ("// Any changes made will be lost if regenerated.");
- glue_sw.WriteLine ();
-
- if (glue_includes != "") {
- foreach (string header in glue_includes.Split (new char[] {',', ' '})) {
- if (header != "")
- glue_sw.WriteLine ("#include <{0}>", header);
- }
- glue_sw.WriteLine ("");
- }
- glue_sw.WriteLine ("const gchar *__prefix = \"__gtksharp_\";\n");
- glue_sw.WriteLine ("#define HAS_PREFIX(a) (*((guint64 *)(a)) == *((guint64 *) __prefix))\n");
- glue_sw.WriteLine ("static GObjectClass *");
- glue_sw.WriteLine ("get_threshold_class (GObject *obj)");
- glue_sw.WriteLine ("{");
- glue_sw.WriteLine ("\tGType gtype = G_TYPE_FROM_INSTANCE (obj);");
- glue_sw.WriteLine ("\twhile (HAS_PREFIX (g_type_name (gtype)))");
- glue_sw.WriteLine ("\t\tgtype = g_type_parent (gtype);");
- glue_sw.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
- glue_sw.WriteLine ("\tif (klass == NULL) klass = g_type_class_ref (gtype);");
- glue_sw.WriteLine ("\treturn klass;");
- glue_sw.WriteLine ("}\n");
- glue_enabled = true;
- }
- }
-
- public string AssemblyName {
- get {
- return assembly_name;
- }
- }
-
- public string CustomDir {
- get {
- return custom_dir;
- }
- }
-
- public string Dir {
- get {
- return dir;
- }
- }
-
- public string GluelibName {
- get {
- return gluelib_name;
- }
- }
-
- public bool GlueEnabled {
- get {
- return glue_enabled;
- }
- }
-
- public StreamWriter GlueWriter {
- get {
- return glue_sw;
- }
- }
-
- public StreamWriter Writer {
- get {
- return sw;
- }
- set {
- sw = value;
- }
- }
-
- public void CloseGlueWriter ()
- {
- if (glue_sw != null)
- glue_sw.Close ();
- }
-
- string member;
- public string CurrentMember {
- get {
- return typename + "." + member;
- }
- set {
- member = value;
- }
- }
-
- string typename;
- public string CurrentType {
- get {
- return typename;
- }
- set {
- typename = value;
- }
- }
-
- public StreamWriter OpenStream (string name)
- {
- char sep = Path.DirectorySeparatorChar;
- if (!Directory.Exists(dir))
- Directory.CreateDirectory(dir);
- string filename = dir + sep + name + ".cs";
-
- FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
- StreamWriter sw = new StreamWriter (stream);
-
- sw.WriteLine ("// This file was generated by the Gtk# code generator.");
- sw.WriteLine ("// Any changes made will be lost if regenerated.");
- sw.WriteLine ();
-
- return sw;
- }
- }
-}
-
+// GtkSharp.Generation.GenerationInfo.cs - Generation information class.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2003-2008 Novell Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class GenerationInfo {
+
+ string dir;
+ string custom_dir;
+ string assembly_name;
+ string gluelib_name;
+ bool glue_enabled;
+ StreamWriter sw;
+ StreamWriter glue_sw;
+
+ public GenerationInfo (XmlElement ns)
+ {
+ string ns_name = ns.GetAttribute ("name");
+ char sep = Path.DirectorySeparatorChar;
+ dir = ".." + sep + ns_name.ToLower () + sep + "generated";
+ custom_dir = ".." + sep + ns_name.ToLower ();
+ assembly_name = ns_name.ToLower () + "-sharp";
+ }
+
+ public GenerationInfo (string dir, string assembly_name) : this (dir, dir, assembly_name, "", "", "") {}
+
+ public GenerationInfo (string dir, string custom_dir, string assembly_name, string glue_filename, string glue_includes, string gluelib_name)
+ {
+ this.dir = dir;
+ this.custom_dir = custom_dir;
+ this.assembly_name = assembly_name;
+ this.gluelib_name = gluelib_name;
+ InitializeGlue (glue_filename, glue_includes, gluelib_name);
+ }
+
+ void InitializeGlue (string glue_filename, string glue_includes, string gluelib_name)
+ {
+ if (gluelib_name != String.Empty && glue_filename != String.Empty) {
+ FileStream stream;
+ try {
+ stream = new FileStream (glue_filename, FileMode.Create, FileAccess.Write);
+ } catch (Exception) {
+ Console.Error.WriteLine ("Unable to create specified glue file. Glue will not be generated.");
+ return;
+ }
+
+ glue_sw = new StreamWriter (stream);
+
+ glue_sw.WriteLine ("// This file was generated by the Gtk# code generator.");
+ glue_sw.WriteLine ("// Any changes made will be lost if regenerated.");
+ glue_sw.WriteLine ();
+
+ if (glue_includes != "") {
+ foreach (string header in glue_includes.Split (new char[] {',', ' '})) {
+ if (header != "")
+ glue_sw.WriteLine ("#include <{0}>", header);
+ }
+ glue_sw.WriteLine ("");
+ }
+ glue_sw.WriteLine ("const gchar *__prefix = \"__gtksharp_\";\n");
+ glue_sw.WriteLine ("#define HAS_PREFIX(a) (*((guint64 *)(a)) == *((guint64 *) __prefix))\n");
+ glue_sw.WriteLine ("static GObjectClass *");
+ glue_sw.WriteLine ("get_threshold_class (GObject *obj)");
+ glue_sw.WriteLine ("{");
+ glue_sw.WriteLine ("\tGType gtype = G_TYPE_FROM_INSTANCE (obj);");
+ glue_sw.WriteLine ("\twhile (HAS_PREFIX (g_type_name (gtype)))");
+ glue_sw.WriteLine ("\t\tgtype = g_type_parent (gtype);");
+ glue_sw.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
+ glue_sw.WriteLine ("\tif (klass == NULL) klass = g_type_class_ref (gtype);");
+ glue_sw.WriteLine ("\treturn klass;");
+ glue_sw.WriteLine ("}\n");
+ glue_enabled = true;
+ }
+ }
+
+ public string AssemblyName {
+ get {
+ return assembly_name;
+ }
+ }
+
+ public string CustomDir {
+ get {
+ return custom_dir;
+ }
+ }
+
+ public string Dir {
+ get {
+ return dir;
+ }
+ }
+
+ public string GluelibName {
+ get {
+ return gluelib_name;
+ }
+ }
+
+ public bool GlueEnabled {
+ get {
+ return glue_enabled;
+ }
+ }
+
+ public StreamWriter GlueWriter {
+ get {
+ return glue_sw;
+ }
+ }
+
+ public StreamWriter Writer {
+ get {
+ return sw;
+ }
+ set {
+ sw = value;
+ }
+ }
+
+ public void CloseGlueWriter ()
+ {
+ if (glue_sw != null)
+ glue_sw.Close ();
+ }
+
+ string member;
+ public string CurrentMember {
+ get {
+ return typename + "." + member;
+ }
+ set {
+ member = value;
+ }
+ }
+
+ string typename;
+ public string CurrentType {
+ get {
+ return typename;
+ }
+ set {
+ typename = value;
+ }
+ }
+
+ public StreamWriter OpenStream (string name)
+ {
+ char sep = Path.DirectorySeparatorChar;
+ if (!Directory.Exists(dir))
+ Directory.CreateDirectory(dir);
+ string filename = dir + sep + name + ".cs";
+
+ FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
+ StreamWriter sw = new StreamWriter (stream);
+
+ sw.WriteLine ("// This file was generated by the Gtk# code generator.");
+ sw.WriteLine ("// Any changes made will be lost if regenerated.");
+ sw.WriteLine ();
+
+ return sw;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/IGeneratable.cs b/lib/gio-sharp/generator/IGeneratable.cs
index 1608fd7..effb558 100644
--- a/lib/gio-sharp/generator/IGeneratable.cs
+++ b/lib/gio-sharp/generator/IGeneratable.cs
@@ -1,71 +1,71 @@
-// GtkSharp.Generation.IGeneratable.cs - Interface to generate code for a type.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001 Mike Kestner
-// Copyright (c) 2007 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- public interface IGeneratable {
-
- // The C name of the generatable
- string CName {get;}
-
- // The (short) C# name of the generatable
- string Name {get;}
-
- // The fully-qualified C# name of the generatable
- string QualifiedName {get;}
-
- // The type (possibly including "ref" or "out") to use in the import
- // signature when passing this generatable to unmanaged code
- string MarshalType {get;}
-
- // The type to use as the return type in an import signature when
- // receiving this generatable back from unmanaged code
- string MarshalReturnType {get;}
-
- // The type to use in a managed callback signature when returning this
- // generatable to unmanaged code
- string ToNativeReturnType {get;}
-
- // The value returned by callbacks that are interrupted prematurely
- // by managed exceptions or other conditions where an appropriate
- // value can't be otherwise obtained.
- string DefaultValue {get;}
-
- // Generates an expression to convert var_name to MarshalType
- string CallByName (string var_name);
-
- // Generates an expression to convert var from MarshalType
- string FromNative (string var);
-
- // Generates an expression to convert var from MarshalReturnType
- string FromNativeReturn (string var);
-
- // Generates an expression to convert var to ToNativeReturnType
- string ToNativeReturn (string var);
-
- bool Validate ();
-
- void Generate ();
-
- void Generate (GenerationInfo gen_info);
- }
-}
+// GtkSharp.Generation.IGeneratable.cs - Interface to generate code for a type.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001 Mike Kestner
+// Copyright (c) 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ public interface IGeneratable {
+
+ // The C name of the generatable
+ string CName {get;}
+
+ // The (short) C# name of the generatable
+ string Name {get;}
+
+ // The fully-qualified C# name of the generatable
+ string QualifiedName {get;}
+
+ // The type (possibly including "ref" or "out") to use in the import
+ // signature when passing this generatable to unmanaged code
+ string MarshalType {get;}
+
+ // The type to use as the return type in an import signature when
+ // receiving this generatable back from unmanaged code
+ string MarshalReturnType {get;}
+
+ // The type to use in a managed callback signature when returning this
+ // generatable to unmanaged code
+ string ToNativeReturnType {get;}
+
+ // The value returned by callbacks that are interrupted prematurely
+ // by managed exceptions or other conditions where an appropriate
+ // value can't be otherwise obtained.
+ string DefaultValue {get;}
+
+ // Generates an expression to convert var_name to MarshalType
+ string CallByName (string var_name);
+
+ // Generates an expression to convert var from MarshalType
+ string FromNative (string var);
+
+ // Generates an expression to convert var from MarshalReturnType
+ string FromNativeReturn (string var);
+
+ // Generates an expression to convert var to ToNativeReturnType
+ string ToNativeReturn (string var);
+
+ bool Validate ();
+
+ void Generate ();
+
+ void Generate (GenerationInfo gen_info);
+ }
+}
diff --git a/lib/gio-sharp/generator/IManualMarshaler.cs b/lib/gio-sharp/generator/IManualMarshaler.cs
index e9e7eaf..25633c5 100644
--- a/lib/gio-sharp/generator/IManualMarshaler.cs
+++ b/lib/gio-sharp/generator/IManualMarshaler.cs
@@ -1,32 +1,32 @@
-// GtkSharp.Generation.IManualMarshaler.cs - Interface for manual marshaling.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- public interface IManualMarshaler {
-
- string AllocNative (string managed_var);
-
- string ReleaseNative (string native_var);
-
- }
-}
-
+// GtkSharp.Generation.IManualMarshaler.cs - Interface for manual marshaling.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ public interface IManualMarshaler {
+
+ string AllocNative (string managed_var);
+
+ string ReleaseNative (string native_var);
+
+ }
+}
+
diff --git a/lib/gio-sharp/generator/InterfaceGen.cs b/lib/gio-sharp/generator/InterfaceGen.cs
index 85b93fa..d59c1a1 100644
--- a/lib/gio-sharp/generator/InterfaceGen.cs
+++ b/lib/gio-sharp/generator/InterfaceGen.cs
@@ -1,384 +1,384 @@
-// GtkSharp.Generation.InterfaceGen.cs - The Interface Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004, 2007 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class InterfaceGen : ObjectBase {
-
- bool consume_only;
- ArrayList vms = new ArrayList ();
- ArrayList members = new ArrayList ();
-
- public InterfaceGen (XmlElement ns, XmlElement elem) : base (ns, elem)
- {
- consume_only = elem.HasAttribute ("consume_only");
- foreach (XmlNode node in elem.ChildNodes) {
- switch (node.Name) {
- case "virtual_method":
- VirtualMethod vm = new VirtualMethod (node as XmlElement, this);
- vms.Add (vm);
- members.Add (vm);
- break;
- case "signal":
- object sig = sigs [(node as XmlElement).GetAttribute ("name")];
- if (sig == null)
- sig = new Signal (node as XmlElement, this);
- members.Add (sig);
- break;
- default:
- if (!IsNodeNameHandled (node.Name))
- Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
- break;
- }
- }
- }
-
- public bool IsConsumeOnly {
- get {
- return consume_only;
- }
- }
-
- public override string FromNative (string var, bool owned)
- {
- return QualifiedName + "Adapter.GetObject (" + var + ", " + (owned ? "true" : "false") + ")";
- }
-
- public override bool ValidateForSubclass ()
- {
- ArrayList invalids = new ArrayList ();
-
- foreach (Method method in methods.Values) {
- if (!method.Validate ()) {
- Console.WriteLine ("in type " + QualifiedName);
- invalids.Add (method);
- }
- }
- foreach (Method method in invalids)
- methods.Remove (method.Name);
- invalids.Clear ();
-
- return base.ValidateForSubclass ();
- }
-
- string IfaceName {
- get {
- return Name + "Iface";
- }
- }
-
- void GenerateIfaceStruct (StreamWriter sw)
- {
- sw.WriteLine ("\t\tstatic " + IfaceName + " iface;");
- sw.WriteLine ();
- sw.WriteLine ("\t\tstruct " + IfaceName + " {");
- sw.WriteLine ("\t\t\tpublic IntPtr gtype;");
- sw.WriteLine ("\t\t\tpublic IntPtr itype;");
- sw.WriteLine ();
-
- foreach (object member in members) {
- if (member is Signal) {
- Signal sig = member as Signal;
- sw.WriteLine ("\t\t\tpublic IntPtr {0};", sig.CName.Replace ("\"", "").Replace ("-", "_"));
- } else if (member is VirtualMethod) {
- VirtualMethod vm = member as VirtualMethod;
- bool has_target = methods [vm.Name] != null;
- if (!has_target)
- Console.WriteLine ("Interface " + QualifiedName + " virtual method " + vm.Name + " has no matching method to invoke.");
- string type = has_target && vm.IsValid ? vm.Name + "Delegate" : "IntPtr";
- sw.WriteLine ("\t\t\tpublic " + type + " " + vm.CName + ";");
- }
- }
-
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateStaticCtor (StreamWriter sw)
- {
- sw.WriteLine ("\t\tstatic " + Name + "Adapter ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGLib.GType.Register (_gtype, typeof({0}Adapter));", Name);
- foreach (VirtualMethod vm in vms) {
- bool has_target = methods [vm.Name] != null;
- if (has_target && vm.IsValid)
- sw.WriteLine ("\t\t\tiface.{0} = new {1}Delegate ({1}Callback);", vm.CName, vm.Name);
- }
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateInitialize (StreamWriter sw)
- {
- sw.WriteLine ("\t\tstatic void Initialize (IntPtr ifaceptr, IntPtr data)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\t" + IfaceName + " native_iface = (" + IfaceName + ") Marshal.PtrToStructure (ifaceptr, typeof (" + IfaceName + "));");
- foreach (VirtualMethod vm in vms)
- sw.WriteLine ("\t\t\tnative_iface." + vm.CName + " = iface." + vm.CName + ";");
- sw.WriteLine ("\t\t\tMarshal.StructureToPtr (native_iface, ifaceptr, false);");
- sw.WriteLine ("\t\t\tGCHandle gch = (GCHandle) data;");
- sw.WriteLine ("\t\t\tgch.Free ();");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateCallbacks (StreamWriter sw)
- {
- foreach (VirtualMethod vm in vms) {
- if (methods [vm.Name] != null) {
- sw.WriteLine ();
- vm.GenerateCallback (sw);
- }
- }
- }
-
- void GenerateCtors (StreamWriter sw)
- {
- if (!IsConsumeOnly) {
- sw.WriteLine ("\t\tpublic " + Name + "Adapter ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tInitHandler = new GLib.GInterfaceInitHandler (Initialize);");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\t{0}Implementor implementor;", Name);
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic {0}Adapter ({0}Implementor implementor)", Name);
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (implementor == null)");
- sw.WriteLine ("\t\t\t\tthrow new ArgumentNullException (\"implementor\");");
- sw.WriteLine ("\t\t\tthis.implementor = implementor;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
- sw.WriteLine ("\t\tpublic " + Name + "Adapter (IntPtr handle)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tthis.handle = handle;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateGType (StreamWriter sw)
- {
- Method m = GetMethod ("GetType");
- m.GenerateImport (sw);
- sw.WriteLine ("\t\tprivate static GLib.GType _gtype = new GLib.GType ({0} ());", m.CName);
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic override GLib.GType GType {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn _gtype;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateHandleProp (StreamWriter sw)
- {
- sw.WriteLine ("\t\tIntPtr handle;");
- sw.WriteLine ("\t\tpublic override IntPtr Handle {");
- sw.WriteLine ("\t\t\tget {");
- if (IsConsumeOnly) {
- sw.WriteLine ("\t\t\t\treturn handle;");
- } else {
- sw.WriteLine ("\t\t\t\tif (handle != IntPtr.Zero)");
- sw.WriteLine ("\t\t\t\t\treturn handle;");
- sw.WriteLine ("\t\t\t\treturn implementor == null ? IntPtr.Zero : implementor.Handle;");
- }
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateGetObject (StreamWriter sw)
- {
- sw.WriteLine ("\t\tpublic static " + Name + " GetObject (IntPtr handle, bool owned)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGLib.Object obj = GLib.Object.GetObject (handle, owned);");
- sw.WriteLine ("\t\t\treturn GetObject (obj);");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static " + Name + " GetObject (GLib.Object obj)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (obj == null)");
- sw.WriteLine ("\t\t\t\treturn null;");
- if (!IsConsumeOnly) {
- sw.WriteLine ("\t\t\telse if (obj is " + Name + "Implementor)");
- sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj as {0}Implementor);", Name);
- }
- sw.WriteLine ("\t\t\telse if (obj as " + Name + " == null)");
- sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj.Handle);", Name);
- sw.WriteLine ("\t\t\telse");
- sw.WriteLine ("\t\t\t\treturn obj as {0};", Name);
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateImplementorProp (StreamWriter sw)
- {
- sw.WriteLine ("\t\tpublic " + Name + "Implementor Implementor {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn implementor;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateAdapter (GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name + "Adapter");
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
- sw.WriteLine ("#region Autogenerated code");
- sw.WriteLine ("\tpublic class " + Name + "Adapter : GLib.GInterfaceAdapter, " + QualifiedName + " {");
- sw.WriteLine ();
-
- if (!IsConsumeOnly) {
- GenerateIfaceStruct (sw);
- GenerateStaticCtor (sw);
- GenerateCallbacks (sw);
- GenerateInitialize (sw);
- }
- GenerateCtors (sw);
- GenerateGType (sw);
- GenerateHandleProp (sw);
- GenerateGetObject (sw);
- if (!IsConsumeOnly)
- GenerateImplementorProp (sw);
-
- GenProperties (gen_info, null);
-
- foreach (Signal sig in sigs.Values)
- sig.GenEvent (sw, null, "GLib.Object.GetObject (Handle)");
-
- Method temp = methods ["GetType"] as Method;
- if (temp != null)
- methods.Remove ("GetType");
- GenMethods (gen_info, new Hashtable (), this);
- if (temp != null)
- methods ["GetType"] = temp;
-
- sw.WriteLine ("#endregion");
-
- string custom = Path.Combine (gen_info.CustomDir, Name + "Adapter.custom");
- if (File.Exists (custom)) {
- sw.WriteLine ("#region Customized extensions");
- sw.WriteLine ("#line 1 \"" + Name + "Adapter.custom\"");
- using (StreamReader sr = new StreamReader(new FileStream (custom, FileMode.Open, FileAccess.Read)))
- sw.WriteLine (sr.ReadToEnd ());
-
- sw.WriteLine ("#endregion");
- }
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- }
-
- void GenerateImplementorIface (StreamWriter sw)
- {
- if (IsConsumeOnly)
- return;
-
- sw.WriteLine ();
- sw.WriteLine ("\t[GLib.GInterface (typeof (" + Name + "Adapter))]");
- string access = IsInternal ? "internal" : "public";
- sw.WriteLine ("\t" + access + " interface " + Name + "Implementor : GLib.IWrapper {");
- sw.WriteLine ();
- Hashtable vm_table = new Hashtable ();
- foreach (VirtualMethod vm in vms)
- vm_table [vm.Name] = vm;
- foreach (VirtualMethod vm in vms) {
- if (vm_table [vm.Name] == null)
- continue;
- else if (!vm.IsValid) {
- vm_table.Remove (vm.Name);
- continue;
- } else if (vm.IsGetter || vm.IsSetter) {
- string cmp_name = (vm.IsGetter ? "Set" : "Get") + vm.Name.Substring (3);
- VirtualMethod cmp = vm_table [cmp_name] as VirtualMethod;
- if (cmp != null && (cmp.IsGetter || cmp.IsSetter)) {
- if (vm.IsSetter)
- cmp.GenerateDeclaration (sw, vm);
- else
- vm.GenerateDeclaration (sw, cmp);
- vm_table.Remove (cmp.Name);
- } else
- vm.GenerateDeclaration (sw, null);
- vm_table.Remove (vm.Name);
- } else {
- vm.GenerateDeclaration (sw, null);
- vm_table.Remove (vm.Name);
- }
- }
- sw.WriteLine ("\t}");
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- GenerateAdapter (gen_info);
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ();
- sw.WriteLine ("#region Autogenerated code");
- string access = IsInternal ? "internal" : "public";
- sw.WriteLine ("\t" + access + " interface " + Name + " : GLib.IWrapper {");
- sw.WriteLine ();
-
- foreach (Signal sig in sigs.Values) {
- sig.GenerateDecl (sw);
- sig.GenEventHandler (gen_info);
- }
-
- foreach (Method method in methods.Values) {
- if (IgnoreMethod (method, this))
- continue;
+// GtkSharp.Generation.InterfaceGen.cs - The Interface Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004, 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class InterfaceGen : ObjectBase {
+
+ bool consume_only;
+ ArrayList vms = new ArrayList ();
+ ArrayList members = new ArrayList ();
+
+ public InterfaceGen (XmlElement ns, XmlElement elem) : base (ns, elem)
+ {
+ consume_only = elem.HasAttribute ("consume_only");
+ foreach (XmlNode node in elem.ChildNodes) {
+ switch (node.Name) {
+ case "virtual_method":
+ VirtualMethod vm = new VirtualMethod (node as XmlElement, this);
+ vms.Add (vm);
+ members.Add (vm);
+ break;
+ case "signal":
+ object sig = sigs [(node as XmlElement).GetAttribute ("name")];
+ if (sig == null)
+ sig = new Signal (node as XmlElement, this);
+ members.Add (sig);
+ break;
+ default:
+ if (!IsNodeNameHandled (node.Name))
+ Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
+ break;
+ }
+ }
+ }
+
+ public bool IsConsumeOnly {
+ get {
+ return consume_only;
+ }
+ }
+
+ public override string FromNative (string var, bool owned)
+ {
+ return QualifiedName + "Adapter.GetObject (" + var + ", " + (owned ? "true" : "false") + ")";
+ }
+
+ public override bool ValidateForSubclass ()
+ {
+ ArrayList invalids = new ArrayList ();
+
+ foreach (Method method in methods.Values) {
+ if (!method.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (method);
+ }
+ }
+ foreach (Method method in invalids)
+ methods.Remove (method.Name);
+ invalids.Clear ();
+
+ return base.ValidateForSubclass ();
+ }
+
+ string IfaceName {
+ get {
+ return Name + "Iface";
+ }
+ }
+
+ void GenerateIfaceStruct (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tstatic " + IfaceName + " iface;");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstruct " + IfaceName + " {");
+ sw.WriteLine ("\t\t\tpublic IntPtr gtype;");
+ sw.WriteLine ("\t\t\tpublic IntPtr itype;");
+ sw.WriteLine ();
+
+ foreach (object member in members) {
+ if (member is Signal) {
+ Signal sig = member as Signal;
+ sw.WriteLine ("\t\t\tpublic IntPtr {0};", sig.CName.Replace ("\"", "").Replace ("-", "_"));
+ } else if (member is VirtualMethod) {
+ VirtualMethod vm = member as VirtualMethod;
+ bool has_target = methods [vm.Name] != null;
+ if (!has_target)
+ Console.WriteLine ("Interface " + QualifiedName + " virtual method " + vm.Name + " has no matching method to invoke.");
+ string type = has_target && vm.IsValid ? vm.Name + "Delegate" : "IntPtr";
+ sw.WriteLine ("\t\t\tpublic " + type + " " + vm.CName + ";");
+ }
+ }
+
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateStaticCtor (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tstatic " + Name + "Adapter ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGLib.GType.Register (_gtype, typeof({0}Adapter));", Name);
+ foreach (VirtualMethod vm in vms) {
+ bool has_target = methods [vm.Name] != null;
+ if (has_target && vm.IsValid)
+ sw.WriteLine ("\t\t\tiface.{0} = new {1}Delegate ({1}Callback);", vm.CName, vm.Name);
+ }
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateInitialize (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tstatic void Initialize (IntPtr ifaceptr, IntPtr data)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\t" + IfaceName + " native_iface = (" + IfaceName + ") Marshal.PtrToStructure (ifaceptr, typeof (" + IfaceName + "));");
+ foreach (VirtualMethod vm in vms)
+ sw.WriteLine ("\t\t\tnative_iface." + vm.CName + " = iface." + vm.CName + ";");
+ sw.WriteLine ("\t\t\tMarshal.StructureToPtr (native_iface, ifaceptr, false);");
+ sw.WriteLine ("\t\t\tGCHandle gch = (GCHandle) data;");
+ sw.WriteLine ("\t\t\tgch.Free ();");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateCallbacks (StreamWriter sw)
+ {
+ foreach (VirtualMethod vm in vms) {
+ if (methods [vm.Name] != null) {
+ sw.WriteLine ();
+ vm.GenerateCallback (sw);
+ }
+ }
+ }
+
+ void GenerateCtors (StreamWriter sw)
+ {
+ if (!IsConsumeOnly) {
+ sw.WriteLine ("\t\tpublic " + Name + "Adapter ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tInitHandler = new GLib.GInterfaceInitHandler (Initialize);");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t{0}Implementor implementor;", Name);
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic {0}Adapter ({0}Implementor implementor)", Name);
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (implementor == null)");
+ sw.WriteLine ("\t\t\t\tthrow new ArgumentNullException (\"implementor\");");
+ sw.WriteLine ("\t\t\tthis.implementor = implementor;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+ sw.WriteLine ("\t\tpublic " + Name + "Adapter (IntPtr handle)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tthis.handle = handle;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateGType (StreamWriter sw)
+ {
+ Method m = GetMethod ("GetType");
+ m.GenerateImport (sw);
+ sw.WriteLine ("\t\tprivate static GLib.GType _gtype = new GLib.GType ({0} ());", m.CName);
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic override GLib.GType GType {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn _gtype;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateHandleProp (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tIntPtr handle;");
+ sw.WriteLine ("\t\tpublic override IntPtr Handle {");
+ sw.WriteLine ("\t\t\tget {");
+ if (IsConsumeOnly) {
+ sw.WriteLine ("\t\t\t\treturn handle;");
+ } else {
+ sw.WriteLine ("\t\t\t\tif (handle != IntPtr.Zero)");
+ sw.WriteLine ("\t\t\t\t\treturn handle;");
+ sw.WriteLine ("\t\t\t\treturn implementor == null ? IntPtr.Zero : implementor.Handle;");
+ }
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateGetObject (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tpublic static " + Name + " GetObject (IntPtr handle, bool owned)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGLib.Object obj = GLib.Object.GetObject (handle, owned);");
+ sw.WriteLine ("\t\t\treturn GetObject (obj);");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static " + Name + " GetObject (GLib.Object obj)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (obj == null)");
+ sw.WriteLine ("\t\t\t\treturn null;");
+ if (!IsConsumeOnly) {
+ sw.WriteLine ("\t\t\telse if (obj is " + Name + "Implementor)");
+ sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj as {0}Implementor);", Name);
+ }
+ sw.WriteLine ("\t\t\telse if (obj as " + Name + " == null)");
+ sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj.Handle);", Name);
+ sw.WriteLine ("\t\t\telse");
+ sw.WriteLine ("\t\t\t\treturn obj as {0};", Name);
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateImplementorProp (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tpublic " + Name + "Implementor Implementor {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn implementor;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateAdapter (GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name + "Adapter");
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+ sw.WriteLine ("#region Autogenerated code");
+ sw.WriteLine ("\tpublic class " + Name + "Adapter : GLib.GInterfaceAdapter, " + QualifiedName + " {");
+ sw.WriteLine ();
+
+ if (!IsConsumeOnly) {
+ GenerateIfaceStruct (sw);
+ GenerateStaticCtor (sw);
+ GenerateCallbacks (sw);
+ GenerateInitialize (sw);
+ }
+ GenerateCtors (sw);
+ GenerateGType (sw);
+ GenerateHandleProp (sw);
+ GenerateGetObject (sw);
+ if (!IsConsumeOnly)
+ GenerateImplementorProp (sw);
+
+ GenProperties (gen_info, null);
+
+ foreach (Signal sig in sigs.Values)
+ sig.GenEvent (sw, null, "GLib.Object.GetObject (Handle)");
+
+ Method temp = methods ["GetType"] as Method;
+ if (temp != null)
+ methods.Remove ("GetType");
+ GenMethods (gen_info, new Hashtable (), this);
+ if (temp != null)
+ methods ["GetType"] = temp;
+
+ sw.WriteLine ("#endregion");
+
+ string custom = Path.Combine (gen_info.CustomDir, Name + "Adapter.custom");
+ if (File.Exists (custom)) {
+ sw.WriteLine ("#region Customized extensions");
+ sw.WriteLine ("#line 1 \"" + Name + "Adapter.custom\"");
+ using (StreamReader sr = new StreamReader(new FileStream (custom, FileMode.Open, FileAccess.Read)))
+ sw.WriteLine (sr.ReadToEnd ());
+
+ sw.WriteLine ("#endregion");
+ }
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ }
+
+ void GenerateImplementorIface (StreamWriter sw)
+ {
+ if (IsConsumeOnly)
+ return;
+
+ sw.WriteLine ();
+ sw.WriteLine ("\t[GLib.GInterface (typeof (" + Name + "Adapter))]");
+ string access = IsInternal ? "internal" : "public";
+ sw.WriteLine ("\t" + access + " interface " + Name + "Implementor : GLib.IWrapper {");
+ sw.WriteLine ();
+ Hashtable vm_table = new Hashtable ();
+ foreach (VirtualMethod vm in vms)
+ vm_table [vm.Name] = vm;
+ foreach (VirtualMethod vm in vms) {
+ if (vm_table [vm.Name] == null)
+ continue;
+ else if (!vm.IsValid) {
+ vm_table.Remove (vm.Name);
+ continue;
+ } else if (vm.IsGetter || vm.IsSetter) {
+ string cmp_name = (vm.IsGetter ? "Set" : "Get") + vm.Name.Substring (3);
+ VirtualMethod cmp = vm_table [cmp_name] as VirtualMethod;
+ if (cmp != null && (cmp.IsGetter || cmp.IsSetter)) {
+ if (vm.IsSetter)
+ cmp.GenerateDeclaration (sw, vm);
+ else
+ vm.GenerateDeclaration (sw, cmp);
+ vm_table.Remove (cmp.Name);
+ } else
+ vm.GenerateDeclaration (sw, null);
+ vm_table.Remove (vm.Name);
+ } else {
+ vm.GenerateDeclaration (sw, null);
+ vm_table.Remove (vm.Name);
+ }
+ }
+ sw.WriteLine ("\t}");
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ GenerateAdapter (gen_info);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ();
+ sw.WriteLine ("#region Autogenerated code");
+ string access = IsInternal ? "internal" : "public";
+ sw.WriteLine ("\t" + access + " interface " + Name + " : GLib.IWrapper {");
+ sw.WriteLine ();
+
+ foreach (Signal sig in sigs.Values) {
+ sig.GenerateDecl (sw);
+ sig.GenEventHandler (gen_info);
+ }
+
+ foreach (Method method in methods.Values) {
+ if (IgnoreMethod (method, this))
+ continue;
method.GenerateDecl (sw, true);
- }
-
- foreach (Property prop in props.Values)
- prop.GenerateDecl (sw, "\t\t");
-
- AppendCustom (sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- GenerateImplementorIface (sw);
- sw.WriteLine ("#endregion");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- Statistics.IFaceCount++;
- }
- }
-}
-
+ }
+
+ foreach (Property prop in props.Values)
+ prop.GenerateDecl (sw, "\t\t");
+
+ AppendCustom (sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ GenerateImplementorIface (sw);
+ sw.WriteLine ("#endregion");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.IFaceCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/LPGen.cs b/lib/gio-sharp/generator/LPGen.cs
index 3fb774e..84940b5 100644
--- a/lib/gio-sharp/generator/LPGen.cs
+++ b/lib/gio-sharp/generator/LPGen.cs
@@ -1,58 +1,58 @@
-// GtkSharp.Generation.LPGen.cs - long/pointer Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
-
- public class LPGen : SimpleGen, IAccessor {
-
- public LPGen (string ctype) : base (ctype, "long", "0L") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "new IntPtr (" + var_name + ")";
- }
-
- public override string FromNative(string var)
- {
- return "(long) " + var;
- }
-
- public void WriteAccessors (StreamWriter sw, string indent, string var)
- {
- sw.WriteLine (indent + "get {");
- sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
- sw.WriteLine (indent + "}");
- sw.WriteLine (indent + "set {");
- sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
- sw.WriteLine (indent + "}");
- }
- }
-}
-
+// GtkSharp.Generation.LPGen.cs - long/pointer Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+
+ public class LPGen : SimpleGen, IAccessor {
+
+ public LPGen (string ctype) : base (ctype, "long", "0L") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "new IntPtr (" + var_name + ")";
+ }
+
+ public override string FromNative(string var)
+ {
+ return "(long) " + var;
+ }
+
+ public void WriteAccessors (StreamWriter sw, string indent, string var)
+ {
+ sw.WriteLine (indent + "get {");
+ sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
+ sw.WriteLine (indent + "}");
+ sw.WriteLine (indent + "set {");
+ sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
+ sw.WriteLine (indent + "}");
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/LPUGen.cs b/lib/gio-sharp/generator/LPUGen.cs
index 331b25f..f84cdd8 100644
--- a/lib/gio-sharp/generator/LPUGen.cs
+++ b/lib/gio-sharp/generator/LPUGen.cs
@@ -1,58 +1,58 @@
-// GtkSharp.Generation.LPUGen.cs - unsugned long/pointer generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
-
- public class LPUGen : SimpleGen, IAccessor {
-
- public LPUGen (string ctype) : base (ctype, "ulong", "0") {}
-
- public override string MarshalType {
- get {
- return "UIntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "new UIntPtr (" + var_name + ")";
- }
-
- public override string FromNative(string var)
- {
- return "(ulong) " + var;
- }
-
- public void WriteAccessors (StreamWriter sw, string indent, string var)
- {
- sw.WriteLine (indent + "get {");
- sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
- sw.WriteLine (indent + "}");
- sw.WriteLine (indent + "set {");
- sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
- sw.WriteLine (indent + "}");
- }
- }
-}
-
+// GtkSharp.Generation.LPUGen.cs - unsugned long/pointer generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+
+ public class LPUGen : SimpleGen, IAccessor {
+
+ public LPUGen (string ctype) : base (ctype, "ulong", "0") {}
+
+ public override string MarshalType {
+ get {
+ return "UIntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "new UIntPtr (" + var_name + ")";
+ }
+
+ public override string FromNative(string var)
+ {
+ return "(ulong) " + var;
+ }
+
+ public void WriteAccessors (StreamWriter sw, string indent, string var)
+ {
+ sw.WriteLine (indent + "get {");
+ sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
+ sw.WriteLine (indent + "}");
+ sw.WriteLine (indent + "set {");
+ sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
+ sw.WriteLine (indent + "}");
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/ManualGen.cs b/lib/gio-sharp/generator/ManualGen.cs
index 1d94916..8041905 100644
--- a/lib/gio-sharp/generator/ManualGen.cs
+++ b/lib/gio-sharp/generator/ManualGen.cs
@@ -1,58 +1,58 @@
-// GtkSharp.Generation.ManualGen.cs - Ungenerated handle type Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ManualGen : SimpleBase {
-
- string from_fmt;
-
- public ManualGen (string ctype, string type) : base (ctype, type, "null")
- {
- from_fmt = "new " + QualifiedName + "({0})";
- }
-
- public ManualGen (string ctype, string type, string from_fmt) : base (ctype, type, "null")
- {
- this.from_fmt = from_fmt;
- }
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return var_name + " == null ? IntPtr.Zero : " + var_name + ".Handle";
- }
-
- public override string FromNative(string var)
- {
- return String.Format (from_fmt, var);
- }
- }
-}
-
+// GtkSharp.Generation.ManualGen.cs - Ungenerated handle type Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ManualGen : SimpleBase {
+
+ string from_fmt;
+
+ public ManualGen (string ctype, string type) : base (ctype, type, "null")
+ {
+ from_fmt = "new " + QualifiedName + "({0})";
+ }
+
+ public ManualGen (string ctype, string type, string from_fmt) : base (ctype, type, "null")
+ {
+ this.from_fmt = from_fmt;
+ }
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return var_name + " == null ? IntPtr.Zero : " + var_name + ".Handle";
+ }
+
+ public override string FromNative(string var)
+ {
+ return String.Format (from_fmt, var);
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Method.cs b/lib/gio-sharp/generator/Method.cs
index 3ecf077..e1fd683 100644
--- a/lib/gio-sharp/generator/Method.cs
+++ b/lib/gio-sharp/generator/Method.cs
@@ -1,314 +1,314 @@
-// GtkSharp.Generation.Method.cs - The Method Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Method : MethodBase {
-
- private ReturnValue retval;
-
- private string call;
- private bool is_get, is_set;
- private bool deprecated = false;
-
- public Method (XmlElement elem, ClassBase container_type) : base (elem, container_type)
- {
- this.retval = new ReturnValue (elem["return-type"]);
-
- if (!container_type.IsDeprecated && elem.HasAttribute ("deprecated")) {
- string attr = elem.GetAttribute ("deprecated");
- deprecated = attr == "1" || attr == "true";
- }
-
- if (Name == "GetType")
- Name = "GetGType";
- }
-
- public bool IsDeprecated {
- get {
- return deprecated;
- }
- }
-
- public bool IsGetter {
- get {
- return is_get;
- }
- }
-
- public bool IsSetter {
- get {
- return is_set;
- }
- }
-
- public string ReturnType {
- get {
- return retval.CSType;
- }
- }
-
- public override bool Validate ()
- {
- if (!retval.Validate () || !base.Validate ()) {
- Console.Write(" in method " + Name + " ");
- return false;
- }
-
- Parameters parms = Parameters;
- is_get = ((((parms.IsAccessor && retval.IsVoid) || (parms.Count == 0 && !retval.IsVoid)) || (parms.Count == 0 && !retval.IsVoid)) && HasGetterName);
- is_set = ((parms.IsAccessor || (parms.VisibleCount == 1 && retval.IsVoid)) && HasSetterName);
-
- call = "(" + (IsStatic ? "" : container_type.CallByName () + (parms.Count > 0 ? ", " : "")) + Body.GetCallString (is_set) + ")";
-
- return true;
- }
-
- private Method GetComplement ()
- {
- char complement;
- if (is_get)
- complement = 'S';
- else
- complement = 'G';
-
- return container_type.GetMethod (complement + BaseName.Substring (1));
- }
-
- public string Declaration {
- get {
- return retval.CSType + " " + Name + " (" + (Signature != null ? Signature.ToString() : "") + ");";
- }
- }
-
+// GtkSharp.Generation.Method.cs - The Method Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Method : MethodBase {
+
+ private ReturnValue retval;
+
+ private string call;
+ private bool is_get, is_set;
+ private bool deprecated = false;
+
+ public Method (XmlElement elem, ClassBase container_type) : base (elem, container_type)
+ {
+ this.retval = new ReturnValue (elem["return-type"]);
+
+ if (!container_type.IsDeprecated && elem.HasAttribute ("deprecated")) {
+ string attr = elem.GetAttribute ("deprecated");
+ deprecated = attr == "1" || attr == "true";
+ }
+
+ if (Name == "GetType")
+ Name = "GetGType";
+ }
+
+ public bool IsDeprecated {
+ get {
+ return deprecated;
+ }
+ }
+
+ public bool IsGetter {
+ get {
+ return is_get;
+ }
+ }
+
+ public bool IsSetter {
+ get {
+ return is_set;
+ }
+ }
+
+ public string ReturnType {
+ get {
+ return retval.CSType;
+ }
+ }
+
+ public override bool Validate ()
+ {
+ if (!retval.Validate () || !base.Validate ()) {
+ Console.Write(" in method " + Name + " ");
+ return false;
+ }
+
+ Parameters parms = Parameters;
+ is_get = ((((parms.IsAccessor && retval.IsVoid) || (parms.Count == 0 && !retval.IsVoid)) || (parms.Count == 0 && !retval.IsVoid)) && HasGetterName);
+ is_set = ((parms.IsAccessor || (parms.VisibleCount == 1 && retval.IsVoid)) && HasSetterName);
+
+ call = "(" + (IsStatic ? "" : container_type.CallByName () + (parms.Count > 0 ? ", " : "")) + Body.GetCallString (is_set) + ")";
+
+ return true;
+ }
+
+ private Method GetComplement ()
+ {
+ char complement;
+ if (is_get)
+ complement = 'S';
+ else
+ complement = 'G';
+
+ return container_type.GetMethod (complement + BaseName.Substring (1));
+ }
+
+ public string Declaration {
+ get {
+ return retval.CSType + " " + Name + " (" + (Signature != null ? Signature.ToString() : "") + ");";
+ }
+ }
+
private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor)
{
GenerateDeclCommon (sw, implementor, false);
}
private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor, bool is_interface)
- {
- if (IsStatic)
- sw.Write("static ");
- sw.Write (Safety);
- Method dup = null;
- if (container_type != null)
- dup = container_type.GetMethodRecursively (Name);
- if (implementor != null)
- dup = implementor.GetMethodRecursively (Name);
-
+ {
+ if (IsStatic)
+ sw.Write("static ");
+ sw.Write (Safety);
+ Method dup = null;
+ if (container_type != null)
+ dup = container_type.GetMethodRecursively (Name);
+ if (implementor != null)
+ dup = implementor.GetMethodRecursively (Name);
+
if (Name == "ToString" && Parameters.Count == 0 && !is_interface)
- sw.Write("override ");
- else if (Name == "GetGType" && container_type is ObjectGen)
- sw.Write("new ");
- else if (Modifiers == "new " || (dup != null && ((dup.Signature != null && Signature != null && dup.Signature.ToString() == Signature.ToString()) || (dup.Signature == null && Signature == null))))
- sw.Write("new ");
-
- if (is_get || is_set) {
- if (retval.IsVoid)
- sw.Write (Parameters.AccessorReturnType);
- else
- sw.Write(retval.CSType);
- sw.Write(" ");
- if (Name.StartsWith ("Get") || Name.StartsWith ("Set"))
- sw.Write (Name.Substring (3));
- else {
- int dot = Name.LastIndexOf ('.');
- if (dot != -1 && (Name.Substring (dot + 1, 3) == "Get" || Name.Substring (dot + 1, 3) == "Set"))
- sw.Write (Name.Substring (0, dot + 1) + Name.Substring (dot + 4));
- else
- sw.Write (Name);
- }
- sw.WriteLine(" { ");
- } else if (IsAccessor) {
- sw.Write (Signature.AccessorType + " " + Name + "(" + Signature.AsAccessor + ")");
- } else {
- sw.Write(retval.CSType + " " + Name + "(" + (Signature != null ? Signature.ToString() : "") + ")");
- }
- }
-
+ sw.Write("override ");
+ else if (Name == "GetGType" && container_type is ObjectGen)
+ sw.Write("new ");
+ else if (Modifiers == "new " || (dup != null && ((dup.Signature != null && Signature != null && dup.Signature.ToString() == Signature.ToString()) || (dup.Signature == null && Signature == null))))
+ sw.Write("new ");
+
+ if (is_get || is_set) {
+ if (retval.IsVoid)
+ sw.Write (Parameters.AccessorReturnType);
+ else
+ sw.Write(retval.CSType);
+ sw.Write(" ");
+ if (Name.StartsWith ("Get") || Name.StartsWith ("Set"))
+ sw.Write (Name.Substring (3));
+ else {
+ int dot = Name.LastIndexOf ('.');
+ if (dot != -1 && (Name.Substring (dot + 1, 3) == "Get" || Name.Substring (dot + 1, 3) == "Set"))
+ sw.Write (Name.Substring (0, dot + 1) + Name.Substring (dot + 4));
+ else
+ sw.Write (Name);
+ }
+ sw.WriteLine(" { ");
+ } else if (IsAccessor) {
+ sw.Write (Signature.AccessorType + " " + Name + "(" + Signature.AsAccessor + ")");
+ } else {
+ sw.Write(retval.CSType + " " + Name + "(" + (Signature != null ? Signature.ToString() : "") + ")");
+ }
+ }
+
public void GenerateDecl (StreamWriter sw)
{
GenerateDecl (sw, false);
}
public void GenerateDecl (StreamWriter sw, bool is_interface)
- {
- if (IsStatic)
- return;
-
- if (is_get || is_set)
- {
- Method comp = GetComplement ();
- if (comp != null && is_set)
- return;
-
- sw.Write("\t\t");
- GenerateDeclCommon (sw, null);
-
- sw.Write("\t\t\t");
- sw.Write ((is_get) ? "get;" : "set;");
-
- if (comp != null && comp.is_set)
- sw.WriteLine (" set;");
- else
- sw.WriteLine ();
-
- sw.WriteLine ("\t\t}");
- }
- else
- {
- sw.Write("\t\t");
+ {
+ if (IsStatic)
+ return;
+
+ if (is_get || is_set)
+ {
+ Method comp = GetComplement ();
+ if (comp != null && is_set)
+ return;
+
+ sw.Write("\t\t");
+ GenerateDeclCommon (sw, null);
+
+ sw.Write("\t\t\t");
+ sw.Write ((is_get) ? "get;" : "set;");
+
+ if (comp != null && comp.is_set)
+ sw.WriteLine (" set;");
+ else
+ sw.WriteLine ();
+
+ sw.WriteLine ("\t\t}");
+ }
+ else
+ {
+ sw.Write("\t\t");
GenerateDeclCommon (sw, null, is_interface);
- sw.WriteLine (";");
- }
-
- Statistics.MethodCount++;
- }
-
- public void GenerateImport (StreamWriter sw)
- {
- string import_sig = IsStatic ? "" : container_type.MarshalType + " raw";
- import_sig += !IsStatic && Parameters.Count > 0 ? ", " : "";
- import_sig += Parameters.ImportSignature.ToString();
- sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
- if (retval.MarshalType.StartsWith ("[return:"))
- sw.WriteLine("\t\t" + retval.MarshalType + " static extern " + Safety + retval.CSType + " " + CName + "(" + import_sig + ");");
- else
- sw.WriteLine("\t\tstatic extern " + Safety + retval.MarshalType + " " + CName + "(" + import_sig + ");");
- sw.WriteLine();
- }
-
- public void Generate (GenerationInfo gen_info, ClassBase implementor)
- {
- if (!Validate ())
- return;
-
- Method comp = null;
-
- gen_info.CurrentMember = Name;
-
- /* we are generated by the get Method, if there is one */
- if (is_set || is_get)
- {
- if (Modifiers != "new " && container_type.GetPropertyRecursively (Name.Substring (3)) != null)
- return;
- comp = GetComplement ();
- if (comp != null && is_set) {
- if (Parameters.AccessorReturnType == comp.ReturnType)
- return;
- else {
- is_set = false;
- call = "(Handle, " + Body.GetCallString (false) + ")";
- comp = null;
- }
- }
- /* some setters take more than one arg */
- if (comp != null && !comp.is_set)
- comp = null;
- }
-
- GenerateImport (gen_info.Writer);
- if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
- comp.GenerateImport (gen_info.Writer);
-
- if (IsDeprecated)
- gen_info.Writer.WriteLine("\t\t[Obsolete]");
- gen_info.Writer.Write("\t\t");
+ sw.WriteLine (";");
+ }
+
+ Statistics.MethodCount++;
+ }
+
+ public void GenerateImport (StreamWriter sw)
+ {
+ string import_sig = IsStatic ? "" : container_type.MarshalType + " raw";
+ import_sig += !IsStatic && Parameters.Count > 0 ? ", " : "";
+ import_sig += Parameters.ImportSignature.ToString();
+ sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
+ if (retval.MarshalType.StartsWith ("[return:"))
+ sw.WriteLine("\t\t" + retval.MarshalType + " static extern " + Safety + retval.CSType + " " + CName + "(" + import_sig + ");");
+ else
+ sw.WriteLine("\t\tstatic extern " + Safety + retval.MarshalType + " " + CName + "(" + import_sig + ");");
+ sw.WriteLine();
+ }
+
+ public void Generate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ if (!Validate ())
+ return;
+
+ Method comp = null;
+
+ gen_info.CurrentMember = Name;
+
+ /* we are generated by the get Method, if there is one */
+ if (is_set || is_get)
+ {
+ if (Modifiers != "new " && container_type.GetPropertyRecursively (Name.Substring (3)) != null)
+ return;
+ comp = GetComplement ();
+ if (comp != null && is_set) {
+ if (Parameters.AccessorReturnType == comp.ReturnType)
+ return;
+ else {
+ is_set = false;
+ call = "(Handle, " + Body.GetCallString (false) + ")";
+ comp = null;
+ }
+ }
+ /* some setters take more than one arg */
+ if (comp != null && !comp.is_set)
+ comp = null;
+ }
+
+ GenerateImport (gen_info.Writer);
+ if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
+ comp.GenerateImport (gen_info.Writer);
+
+ if (IsDeprecated)
+ gen_info.Writer.WriteLine("\t\t[Obsolete]");
+ gen_info.Writer.Write("\t\t");
if (Protection != "")
- gen_info.Writer.Write("{0} ", Protection);
- GenerateDeclCommon (gen_info.Writer, implementor);
-
- if (is_get || is_set)
- {
- gen_info.Writer.Write ("\t\t\t");
- gen_info.Writer.Write ((is_get) ? "get" : "set");
- GenerateBody (gen_info, implementor, "\t");
- }
- else
- GenerateBody (gen_info, implementor, "");
-
- if (is_get || is_set)
- {
- if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
- {
- gen_info.Writer.WriteLine ();
- gen_info.Writer.Write ("\t\t\tset");
- comp.GenerateBody (gen_info, implementor, "\t");
- }
- gen_info.Writer.WriteLine ();
- gen_info.Writer.WriteLine ("\t\t}");
- }
- else
- gen_info.Writer.WriteLine();
-
- gen_info.Writer.WriteLine();
-
- Statistics.MethodCount++;
- }
-
- public void GenerateBody (GenerationInfo gen_info, ClassBase implementor, string indent)
- {
- StreamWriter sw = gen_info.Writer;
- sw.WriteLine(" {");
- if (!IsStatic && implementor != null)
- implementor.Prepare (sw, indent + "\t\t\t");
- if (IsAccessor)
- Body.InitAccessor (sw, Signature, indent);
- Body.Initialize(gen_info, is_get, is_set, indent);
-
- sw.Write(indent + "\t\t\t");
- if (retval.IsVoid)
- sw.WriteLine(CName + call + ";");
- else {
- sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
- sw.WriteLine(indent + "\t\t\t" + retval.CSType + " ret = " + retval.FromNative ("raw_ret") + ";");
- }
-
- if (!IsStatic && implementor != null)
- implementor.Finish (sw, indent + "\t\t\t");
- Body.Finish (sw, indent);
- Body.HandleException (sw, indent);
-
- if (is_get && Parameters.Count > 0)
- sw.WriteLine (indent + "\t\t\treturn " + Parameters.AccessorName + ";");
- else if (!retval.IsVoid)
- sw.WriteLine (indent + "\t\t\treturn ret;");
- else if (IsAccessor)
- Body.FinishAccessor (sw, Signature, indent);
-
- sw.Write(indent + "\t\t}");
- }
-
- bool IsAccessor {
- get {
- return retval.IsVoid && Signature.IsAccessor;
- }
- }
- }
-}
-
+ gen_info.Writer.Write("{0} ", Protection);
+ GenerateDeclCommon (gen_info.Writer, implementor);
+
+ if (is_get || is_set)
+ {
+ gen_info.Writer.Write ("\t\t\t");
+ gen_info.Writer.Write ((is_get) ? "get" : "set");
+ GenerateBody (gen_info, implementor, "\t");
+ }
+ else
+ GenerateBody (gen_info, implementor, "");
+
+ if (is_get || is_set)
+ {
+ if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
+ {
+ gen_info.Writer.WriteLine ();
+ gen_info.Writer.Write ("\t\t\tset");
+ comp.GenerateBody (gen_info, implementor, "\t");
+ }
+ gen_info.Writer.WriteLine ();
+ gen_info.Writer.WriteLine ("\t\t}");
+ }
+ else
+ gen_info.Writer.WriteLine();
+
+ gen_info.Writer.WriteLine();
+
+ Statistics.MethodCount++;
+ }
+
+ public void GenerateBody (GenerationInfo gen_info, ClassBase implementor, string indent)
+ {
+ StreamWriter sw = gen_info.Writer;
+ sw.WriteLine(" {");
+ if (!IsStatic && implementor != null)
+ implementor.Prepare (sw, indent + "\t\t\t");
+ if (IsAccessor)
+ Body.InitAccessor (sw, Signature, indent);
+ Body.Initialize(gen_info, is_get, is_set, indent);
+
+ sw.Write(indent + "\t\t\t");
+ if (retval.IsVoid)
+ sw.WriteLine(CName + call + ";");
+ else {
+ sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
+ sw.WriteLine(indent + "\t\t\t" + retval.CSType + " ret = " + retval.FromNative ("raw_ret") + ";");
+ }
+
+ if (!IsStatic && implementor != null)
+ implementor.Finish (sw, indent + "\t\t\t");
+ Body.Finish (sw, indent);
+ Body.HandleException (sw, indent);
+
+ if (is_get && Parameters.Count > 0)
+ sw.WriteLine (indent + "\t\t\treturn " + Parameters.AccessorName + ";");
+ else if (!retval.IsVoid)
+ sw.WriteLine (indent + "\t\t\treturn ret;");
+ else if (IsAccessor)
+ Body.FinishAccessor (sw, Signature, indent);
+
+ sw.Write(indent + "\t\t}");
+ }
+
+ bool IsAccessor {
+ get {
+ return retval.IsVoid && Signature.IsAccessor;
+ }
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/MethodBody.cs b/lib/gio-sharp/generator/MethodBody.cs
index cee7079..2f614d0 100644
--- a/lib/gio-sharp/generator/MethodBody.cs
+++ b/lib/gio-sharp/generator/MethodBody.cs
@@ -1,177 +1,177 @@
-// GtkSharp.Generation.MethodBody.cs - The MethodBody Generation Class.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
-
- public class MethodBody {
-
- Parameters parameters;
-
- public MethodBody (Parameters parms)
- {
- parameters = parms;
- }
-
- private string CastFromInt (string type)
- {
- return type != "int" ? "(" + type + ") " : "";
- }
-
- public string GetCallString (bool is_set)
- {
- if (parameters.Count == 0)
- return String.Empty;
-
- string[] result = new string [parameters.Count];
- for (int i = 0; i < parameters.Count; i++) {
- Parameter p = parameters [i];
- IGeneratable igen = p.Generatable;
-
- bool is_prop = is_set && i == 0;
-
- if (i > 0 && parameters [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
- string string_name = (i == 1 && is_set) ? "value" : parameters [i - 1].Name;
- result[i] = igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
- continue;
- }
-
- if (is_prop)
- p.CallName = "value";
- else
- p.CallName = p.Name;
- string call_parm = p.CallString;
-
- if (p.IsUserData && parameters.IsHidden (p) && !parameters.HideData &&
- (i == 0 || parameters [i - 1].Scope != "notified")) {
- call_parm = "IntPtr.Zero";
- }
-
- result [i] += call_parm;
- }
-
- return String.Join (", ", result);
- }
-
- public void Initialize (GenerationInfo gen_info)
- {
- Initialize (gen_info, false, false, String.Empty);
- }
-
- public void Initialize (GenerationInfo gen_info, bool is_get, bool is_set, string indent)
- {
- if (parameters.Count == 0)
- return;
-
- StreamWriter sw = gen_info.Writer;
- for (int i = 0; i < parameters.Count; i++) {
- Parameter p = parameters [i];
-
- IGeneratable gen = p.Generatable;
- string name = p.Name;
- if (is_set)
- name = "value";
-
- p.CallName = name;
- foreach (string prep in p.Prepare)
- sw.WriteLine (indent + "\t\t\t" + prep);
-
- if (gen is CallbackGen) {
- CallbackGen cbgen = gen as CallbackGen;
- string wrapper = cbgen.GenWrapper(gen_info);
- switch (p.Scope) {
- case "notified":
- sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
- sw.WriteLine (indent + "\t\t\tIntPtr {0};", parameters [i + 1].Name);
- sw.WriteLine (indent + "\t\t\t{0} {1};", parameters [i + 2].CSType, parameters [i + 2].Name);
- sw.WriteLine (indent + "\t\t\tif ({0} == null) {{", name);
- sw.WriteLine (indent + "\t\t\t\t{0} = IntPtr.Zero;", parameters [i + 1].Name);
- sw.WriteLine (indent + "\t\t\t\t{0} = null;", parameters [i + 2].Name);
- sw.WriteLine (indent + "\t\t\t} else {");
- sw.WriteLine (indent + "\t\t\t\t{0} = (IntPtr) GCHandle.Alloc ({1}_wrapper);", parameters [i + 1].Name, name);
- sw.WriteLine (indent + "\t\t\t\t{0} = GLib.DestroyHelper.NotifyHandler;", parameters [i + 2].Name, parameters [i + 2].CSType);
- sw.WriteLine (indent + "\t\t\t}");
- break;
-
- case "async":
- sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
- sw.WriteLine (indent + "\t\t\t{0}_wrapper.PersistUntilCalled ();", name);
- break;
- case "call":
- default:
- if (p.Scope == String.Empty)
- Console.WriteLine ("Defaulting " + gen.Name + " param to 'call' scope in method " + gen_info.CurrentMember);
- sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
- break;
- }
- }
- }
-
- if (ThrowsException)
- sw.WriteLine (indent + "\t\t\tIntPtr error = IntPtr.Zero;");
- }
-
- public void InitAccessor (StreamWriter sw, Signature sig, string indent)
- {
- sw.WriteLine (indent + "\t\t\t" + sig.AccessorType + " " + sig.AccessorName + ";");
- }
-
- public void Finish (StreamWriter sw, string indent)
- {
- foreach (Parameter p in parameters)
- foreach (string s in p.Finish)
- sw.WriteLine(indent + "\t\t\t" + s);
- }
-
- public void FinishAccessor (StreamWriter sw, Signature sig, string indent)
- {
- sw.WriteLine (indent + "\t\t\treturn " + sig.AccessorName + ";");
- }
-
- public void HandleException (StreamWriter sw, string indent)
- {
- if (!ThrowsException)
- return;
- sw.WriteLine (indent + "\t\t\tif (error != IntPtr.Zero) throw new GLib.GException (error);");
- }
-
- public bool ThrowsException {
- get {
- int idx = parameters.Count - 1;
-
- while (idx >= 0) {
- if (parameters [idx].IsUserData)
- idx--;
- else if (parameters [idx].CType == "GError**")
- return true;
- else
- break;
- }
- return false;
- }
- }
- }
-}
-
+// GtkSharp.Generation.MethodBody.cs - The MethodBody Generation Class.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+
+ public class MethodBody {
+
+ Parameters parameters;
+
+ public MethodBody (Parameters parms)
+ {
+ parameters = parms;
+ }
+
+ private string CastFromInt (string type)
+ {
+ return type != "int" ? "(" + type + ") " : "";
+ }
+
+ public string GetCallString (bool is_set)
+ {
+ if (parameters.Count == 0)
+ return String.Empty;
+
+ string[] result = new string [parameters.Count];
+ for (int i = 0; i < parameters.Count; i++) {
+ Parameter p = parameters [i];
+ IGeneratable igen = p.Generatable;
+
+ bool is_prop = is_set && i == 0;
+
+ if (i > 0 && parameters [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
+ string string_name = (i == 1 && is_set) ? "value" : parameters [i - 1].Name;
+ result[i] = igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
+ continue;
+ }
+
+ if (is_prop)
+ p.CallName = "value";
+ else
+ p.CallName = p.Name;
+ string call_parm = p.CallString;
+
+ if (p.IsUserData && parameters.IsHidden (p) && !parameters.HideData &&
+ (i == 0 || parameters [i - 1].Scope != "notified")) {
+ call_parm = "IntPtr.Zero";
+ }
+
+ result [i] += call_parm;
+ }
+
+ return String.Join (", ", result);
+ }
+
+ public void Initialize (GenerationInfo gen_info)
+ {
+ Initialize (gen_info, false, false, String.Empty);
+ }
+
+ public void Initialize (GenerationInfo gen_info, bool is_get, bool is_set, string indent)
+ {
+ if (parameters.Count == 0)
+ return;
+
+ StreamWriter sw = gen_info.Writer;
+ for (int i = 0; i < parameters.Count; i++) {
+ Parameter p = parameters [i];
+
+ IGeneratable gen = p.Generatable;
+ string name = p.Name;
+ if (is_set)
+ name = "value";
+
+ p.CallName = name;
+ foreach (string prep in p.Prepare)
+ sw.WriteLine (indent + "\t\t\t" + prep);
+
+ if (gen is CallbackGen) {
+ CallbackGen cbgen = gen as CallbackGen;
+ string wrapper = cbgen.GenWrapper(gen_info);
+ switch (p.Scope) {
+ case "notified":
+ sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
+ sw.WriteLine (indent + "\t\t\tIntPtr {0};", parameters [i + 1].Name);
+ sw.WriteLine (indent + "\t\t\t{0} {1};", parameters [i + 2].CSType, parameters [i + 2].Name);
+ sw.WriteLine (indent + "\t\t\tif ({0} == null) {{", name);
+ sw.WriteLine (indent + "\t\t\t\t{0} = IntPtr.Zero;", parameters [i + 1].Name);
+ sw.WriteLine (indent + "\t\t\t\t{0} = null;", parameters [i + 2].Name);
+ sw.WriteLine (indent + "\t\t\t} else {");
+ sw.WriteLine (indent + "\t\t\t\t{0} = (IntPtr) GCHandle.Alloc ({1}_wrapper);", parameters [i + 1].Name, name);
+ sw.WriteLine (indent + "\t\t\t\t{0} = GLib.DestroyHelper.NotifyHandler;", parameters [i + 2].Name, parameters [i + 2].CSType);
+ sw.WriteLine (indent + "\t\t\t}");
+ break;
+
+ case "async":
+ sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
+ sw.WriteLine (indent + "\t\t\t{0}_wrapper.PersistUntilCalled ();", name);
+ break;
+ case "call":
+ default:
+ if (p.Scope == String.Empty)
+ Console.WriteLine ("Defaulting " + gen.Name + " param to 'call' scope in method " + gen_info.CurrentMember);
+ sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
+ break;
+ }
+ }
+ }
+
+ if (ThrowsException)
+ sw.WriteLine (indent + "\t\t\tIntPtr error = IntPtr.Zero;");
+ }
+
+ public void InitAccessor (StreamWriter sw, Signature sig, string indent)
+ {
+ sw.WriteLine (indent + "\t\t\t" + sig.AccessorType + " " + sig.AccessorName + ";");
+ }
+
+ public void Finish (StreamWriter sw, string indent)
+ {
+ foreach (Parameter p in parameters)
+ foreach (string s in p.Finish)
+ sw.WriteLine(indent + "\t\t\t" + s);
+ }
+
+ public void FinishAccessor (StreamWriter sw, Signature sig, string indent)
+ {
+ sw.WriteLine (indent + "\t\t\treturn " + sig.AccessorName + ";");
+ }
+
+ public void HandleException (StreamWriter sw, string indent)
+ {
+ if (!ThrowsException)
+ return;
+ sw.WriteLine (indent + "\t\t\tif (error != IntPtr.Zero) throw new GLib.GException (error);");
+ }
+
+ public bool ThrowsException {
+ get {
+ int idx = parameters.Count - 1;
+
+ while (idx >= 0) {
+ if (parameters [idx].IsUserData)
+ idx--;
+ else if (parameters [idx].CType == "GError**")
+ return true;
+ else
+ break;
+ }
+ return false;
+ }
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/ObjectGen.cs b/lib/gio-sharp/generator/ObjectGen.cs
index 58d2c17..2235a64 100644
--- a/lib/gio-sharp/generator/ObjectGen.cs
+++ b/lib/gio-sharp/generator/ObjectGen.cs
@@ -1,425 +1,425 @@
-// GtkSharp.Generation.ObjectGen.cs - The Object Generatable.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Text;
- using System.Xml;
-
- public class ObjectGen : ObjectBase {
-
- private ArrayList custom_attrs = new ArrayList();
- private ArrayList strings = new ArrayList();
- private ArrayList vm_nodes = new ArrayList();
- private Hashtable childprops = new Hashtable();
- private static Hashtable dirs = new Hashtable ();
-
- public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem)
- {
- foreach (XmlNode node in elem.ChildNodes) {
- string name;
-
- if (!(node is XmlElement)) continue;
- XmlElement member = (XmlElement) node;
-
- switch (node.Name) {
- case "callback":
- Statistics.IgnoreCount++;
- break;
-
- case "custom-attribute":
- custom_attrs.Add (member.InnerXml);
- break;
-
- case "virtual_method":
- Statistics.IgnoreCount++;
- break;
-
- case "static-string":
- strings.Add (node);
- break;
-
- case "childprop":
- name = member.GetAttribute ("name");
- while (childprops.ContainsKey (name))
- name += "mangled";
- childprops.Add (name, new ChildProperty (member, this));
- break;
-
- default:
- if (!IsNodeNameHandled (node.Name))
- Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
- break;
- }
- }
- }
-
- public override bool Validate ()
- {
- ArrayList invalids = new ArrayList ();
-
- foreach (ChildProperty prop in childprops.Values) {
- if (!prop.Validate ()) {
- Console.WriteLine ("in Object " + QualifiedName);
- invalids.Add (prop);
- }
- }
- foreach (ChildProperty prop in invalids)
- childprops.Remove (prop);
-
- return base.Validate ();
- }
-
- private bool DisableVoidCtor {
- get {
- return Elem.HasAttribute ("disable_void_ctor");
- }
- }
-
- private bool DisableGTypeCtor {
- get {
- return Elem.HasAttribute ("disable_gtype_ctor");
- }
- }
-
- private class DirectoryInfo {
- public string assembly_name;
- public Hashtable objects;
-
- public DirectoryInfo (string assembly_name) {
- this.assembly_name = assembly_name;
- objects = new Hashtable ();
- }
- }
-
- private static DirectoryInfo GetDirectoryInfo (string dir, string assembly_name)
- {
- DirectoryInfo result;
-
- if (dirs.ContainsKey (dir)) {
- result = dirs [dir] as DirectoryInfo;
- if (result.assembly_name != assembly_name) {
- Console.WriteLine ("Can't put multiple assemblies in one directory.");
- return null;
- }
-
- return result;
- }
-
- result = new DirectoryInfo (assembly_name);
- dirs.Add (dir, result);
-
- return result;
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- string asm_name = gen_info.AssemblyName.Length == 0 ? NS.ToLower () + "-sharp" : gen_info.AssemblyName;
- DirectoryInfo di = GetDirectoryInfo (gen_info.Dir, asm_name);
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Collections;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- SymbolTable table = SymbolTable.Table;
-
- sw.WriteLine ("#region Autogenerated code");
- if (IsDeprecated)
- sw.WriteLine ("\t[Obsolete]");
- foreach (string attr in custom_attrs)
- sw.WriteLine ("\t" + attr);
- sw.Write ("\t{0} {1}class " + Name, IsInternal ? "internal" : "public", IsAbstract ? "abstract " : "");
- string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
- if (cs_parent != "") {
- di.objects.Add (CName, QualifiedName);
- sw.Write (" : " + cs_parent);
- }
- foreach (string iface in interfaces) {
- if (Parent != null && Parent.Implements (iface))
- continue;
- sw.Write (", " + table.GetCSType (iface));
- }
- foreach (string iface in managed_interfaces) {
- if (Parent != null && Parent.Implements (iface))
- continue;
- sw.Write (", " + iface);
- }
- sw.WriteLine (" {");
- sw.WriteLine ();
-
- GenCtors (gen_info);
- GenProperties (gen_info, null);
- GenFields (gen_info);
- GenChildProperties (gen_info);
-
- bool has_sigs = (sigs != null && sigs.Count > 0);
- if (!has_sigs) {
- foreach (string iface in interfaces) {
- ClassBase igen = table.GetClassGen (iface);
- if (igen != null && igen.Signals != null) {
- has_sigs = true;
- break;
- }
- }
- }
-
- if (has_sigs && Elem.HasAttribute("parent")) {
- GenSignals (gen_info, null);
- }
-
- if (vm_nodes.Count > 0) {
- if (gen_info.GlueEnabled) {
- GenVirtualMethods (gen_info);
- } else {
- Statistics.VMIgnored = true;
- Statistics.ThrottledCount += vm_nodes.Count;
- }
- }
-
- GenMethods (gen_info, null, null);
-
- if (interfaces.Count != 0) {
- Hashtable all_methods = new Hashtable ();
- foreach (Method m in Methods.Values)
- all_methods[m.Name] = m;
- Hashtable collisions = new Hashtable ();
- foreach (string iface in interfaces) {
- ClassBase igen = table.GetClassGen (iface);
- foreach (Method m in igen.Methods.Values) {
- Method collision = all_methods[m.Name] as Method;
- if (collision != null && collision.Signature.Types == m.Signature.Types)
- collisions[m.Name] = true;
- else
- all_methods[m.Name] = m;
- }
- }
-
- foreach (string iface in interfaces) {
- if (Parent != null && Parent.Implements (iface))
- continue;
- ClassBase igen = table.GetClassGen (iface);
- igen.GenMethods (gen_info, collisions, this);
- igen.GenProperties (gen_info, this);
- igen.GenSignals (gen_info, this);
- }
- }
-
- foreach (XmlElement str in strings) {
- sw.Write ("\t\tpublic static string " + str.GetAttribute ("name"));
- sw.WriteLine (" {\n\t\t\t get { return \"" + str.GetAttribute ("value") + "\"; }\n\t\t}");
- }
-
- if (cs_parent != String.Empty && GetExpected (CName) != QualifiedName) {
- sw.WriteLine ();
- sw.WriteLine ("\t\tstatic " + Name + " ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGtkSharp." + Studlify (asm_name) + ".ObjectManager.Initialize ();");
- sw.WriteLine ("\t\t}");
- }
-
- sw.WriteLine ("#endregion");
- AppendCustom (sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
-
- sw.Close ();
- gen_info.Writer = null;
- Statistics.ObjectCount++;
- }
-
- protected override void GenCtors (GenerationInfo gen_info)
- {
- if (!Elem.HasAttribute("parent"))
- return;
-
- if (!DisableGTypeCtor) {
- gen_info.Writer.WriteLine("\t\t[Obsolete]");
- gen_info.Writer.WriteLine("\t\tprotected " + Name + "(GLib.GType gtype) : base(gtype) {}");
- }
- gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
- if (ctors.Count == 0 && !DisableVoidCtor) {
- gen_info.Writer.WriteLine();
- gen_info.Writer.WriteLine("\t\tprotected " + Name + "() : base(IntPtr.Zero)");
- gen_info.Writer.WriteLine("\t\t{");
- gen_info.Writer.WriteLine("\t\t\tCreateNativeObject (new string [0], new GLib.Value [0]);");
- gen_info.Writer.WriteLine("\t\t}");
- }
- gen_info.Writer.WriteLine();
-
- base.GenCtors (gen_info);
- }
-
- protected void GenChildProperties (GenerationInfo gen_info)
- {
- if (childprops.Count == 0)
- return;
-
- StreamWriter sw = gen_info.Writer;
-
- ObjectGen child_ancestor = Parent as ObjectGen;
- while (child_ancestor.CName != "GtkContainer" &&
- child_ancestor.childprops.Count == 0)
- child_ancestor = child_ancestor.Parent as ObjectGen;
-
- sw.WriteLine ("\t\tpublic class " + Name + "Child : " + child_ancestor.NS + "." + child_ancestor.Name + "." + child_ancestor.Name + "Child {");
- sw.WriteLine ("\t\t\tprotected internal " + Name + "Child (Gtk.Container parent, Gtk.Widget child) : base (parent, child) {}");
- sw.WriteLine ("");
-
- foreach (ChildProperty prop in childprops.Values)
- prop.Generate (gen_info, "\t\t\t", null);
-
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("");
-
- sw.WriteLine ("\t\tpublic override Gtk.Container.ContainerChild this [Gtk.Widget child] {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn new " + Name + "Child (this, child);");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("");
-
- }
-
- private void GenVMGlue (GenerationInfo gen_info, XmlElement elem)
- {
- StreamWriter sw = gen_info.GlueWriter;
-
- string vm_name = elem.GetAttribute ("cname");
- string method = gen_info.GluelibName + "_" + NS + Name + "_override_" + vm_name;
- sw.WriteLine ();
- sw.WriteLine ("void " + method + " (GType type, gpointer cb);");
- sw.WriteLine ();
- sw.WriteLine ("void");
- sw.WriteLine (method + " (GType type, gpointer cb)");
- sw.WriteLine ("{");
- sw.WriteLine ("\t{0} *klass = ({0} *) g_type_class_peek (type);", NS + Name + "Class");
- sw.WriteLine ("\tklass->" + vm_name + " = cb;");
- sw.WriteLine ("}");
- }
-
- static bool vmhdrs_needed = true;
-
- private void GenVirtualMethods (GenerationInfo gen_info)
- {
- if (vmhdrs_needed) {
- gen_info.GlueWriter.WriteLine ("#include <glib-object.h>");
- gen_info.GlueWriter.WriteLine ("#include \"vmglueheaders.h\"");
- gen_info.GlueWriter.WriteLine ();
- vmhdrs_needed = false;
- }
-
- foreach (XmlElement elem in vm_nodes) {
- GenVMGlue (gen_info, elem);
- }
- }
-
- /* Keep this in sync with the one in glib/GType.cs */
- private static string GetExpected (string cname)
- {
- for (int i = 1; i < cname.Length; i++) {
- if (Char.IsUpper (cname[i])) {
- if (i == 1 && cname[0] == 'G')
- return "GLib." + cname.Substring (1);
- else
- return cname.Substring (0, i) + "." + cname.Substring (i);
- }
- }
-
- throw new ArgumentException ("cname doesn't follow the NamespaceType capitalization style: " + cname);
- }
-
- private static bool NeedsMap (Hashtable objs, string assembly_name)
- {
- foreach (string key in objs.Keys)
- if (GetExpected (key) != ((string) objs[key]))
- return true;
-
- return false;
- }
-
- private static string Studlify (string name)
- {
- string result = "";
-
- string[] subs = name.Split ('-');
- foreach (string sub in subs)
- result += Char.ToUpper (sub[0]) + sub.Substring (1);
-
- return result;
- }
-
- public static void GenerateMappers ()
- {
- foreach (string dir in dirs.Keys) {
-
- DirectoryInfo di = dirs[dir] as DirectoryInfo;
-
- if (!NeedsMap (di.objects, di.assembly_name))
- continue;
-
- GenerationInfo gen_info = new GenerationInfo (dir, di.assembly_name);
-
- GenerateMapper (di, gen_info);
- }
- }
-
- private static void GenerateMapper (DirectoryInfo dir_info, GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.OpenStream ("ObjectManager");
-
- sw.WriteLine ("namespace GtkSharp." + Studlify (dir_info.assembly_name) + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tpublic class ObjectManager {");
- sw.WriteLine ();
- sw.WriteLine ("\t\tstatic bool initialized = false;");
- sw.WriteLine ("\t\t// Call this method from the appropriate module init function.");
- sw.WriteLine ("\t\tpublic static void Initialize ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (initialized)");
- sw.WriteLine ("\t\t\t\treturn;");
- sw.WriteLine ("");
- sw.WriteLine ("\t\t\tinitialized = true;");
-
- foreach (string key in dir_info.objects.Keys) {
- if (GetExpected(key) != ((string) dir_info.objects[key]))
- sw.WriteLine ("\t\t\tGLib.GType.Register ({0}.GType, typeof ({0}));", dir_info.objects [key]);
- }
-
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- }
- }
-}
-
+// GtkSharp.Generation.ObjectGen.cs - The Object Generatable.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Text;
+ using System.Xml;
+
+ public class ObjectGen : ObjectBase {
+
+ private ArrayList custom_attrs = new ArrayList();
+ private ArrayList strings = new ArrayList();
+ private ArrayList vm_nodes = new ArrayList();
+ private Hashtable childprops = new Hashtable();
+ private static Hashtable dirs = new Hashtable ();
+
+ public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem)
+ {
+ foreach (XmlNode node in elem.ChildNodes) {
+ string name;
+
+ if (!(node is XmlElement)) continue;
+ XmlElement member = (XmlElement) node;
+
+ switch (node.Name) {
+ case "callback":
+ Statistics.IgnoreCount++;
+ break;
+
+ case "custom-attribute":
+ custom_attrs.Add (member.InnerXml);
+ break;
+
+ case "virtual_method":
+ Statistics.IgnoreCount++;
+ break;
+
+ case "static-string":
+ strings.Add (node);
+ break;
+
+ case "childprop":
+ name = member.GetAttribute ("name");
+ while (childprops.ContainsKey (name))
+ name += "mangled";
+ childprops.Add (name, new ChildProperty (member, this));
+ break;
+
+ default:
+ if (!IsNodeNameHandled (node.Name))
+ Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
+ break;
+ }
+ }
+ }
+
+ public override bool Validate ()
+ {
+ ArrayList invalids = new ArrayList ();
+
+ foreach (ChildProperty prop in childprops.Values) {
+ if (!prop.Validate ()) {
+ Console.WriteLine ("in Object " + QualifiedName);
+ invalids.Add (prop);
+ }
+ }
+ foreach (ChildProperty prop in invalids)
+ childprops.Remove (prop);
+
+ return base.Validate ();
+ }
+
+ private bool DisableVoidCtor {
+ get {
+ return Elem.HasAttribute ("disable_void_ctor");
+ }
+ }
+
+ private bool DisableGTypeCtor {
+ get {
+ return Elem.HasAttribute ("disable_gtype_ctor");
+ }
+ }
+
+ private class DirectoryInfo {
+ public string assembly_name;
+ public Hashtable objects;
+
+ public DirectoryInfo (string assembly_name) {
+ this.assembly_name = assembly_name;
+ objects = new Hashtable ();
+ }
+ }
+
+ private static DirectoryInfo GetDirectoryInfo (string dir, string assembly_name)
+ {
+ DirectoryInfo result;
+
+ if (dirs.ContainsKey (dir)) {
+ result = dirs [dir] as DirectoryInfo;
+ if (result.assembly_name != assembly_name) {
+ Console.WriteLine ("Can't put multiple assemblies in one directory.");
+ return null;
+ }
+
+ return result;
+ }
+
+ result = new DirectoryInfo (assembly_name);
+ dirs.Add (dir, result);
+
+ return result;
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ string asm_name = gen_info.AssemblyName.Length == 0 ? NS.ToLower () + "-sharp" : gen_info.AssemblyName;
+ DirectoryInfo di = GetDirectoryInfo (gen_info.Dir, asm_name);
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Collections;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ SymbolTable table = SymbolTable.Table;
+
+ sw.WriteLine ("#region Autogenerated code");
+ if (IsDeprecated)
+ sw.WriteLine ("\t[Obsolete]");
+ foreach (string attr in custom_attrs)
+ sw.WriteLine ("\t" + attr);
+ sw.Write ("\t{0} {1}class " + Name, IsInternal ? "internal" : "public", IsAbstract ? "abstract " : "");
+ string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
+ if (cs_parent != "") {
+ di.objects.Add (CName, QualifiedName);
+ sw.Write (" : " + cs_parent);
+ }
+ foreach (string iface in interfaces) {
+ if (Parent != null && Parent.Implements (iface))
+ continue;
+ sw.Write (", " + table.GetCSType (iface));
+ }
+ foreach (string iface in managed_interfaces) {
+ if (Parent != null && Parent.Implements (iface))
+ continue;
+ sw.Write (", " + iface);
+ }
+ sw.WriteLine (" {");
+ sw.WriteLine ();
+
+ GenCtors (gen_info);
+ GenProperties (gen_info, null);
+ GenFields (gen_info);
+ GenChildProperties (gen_info);
+
+ bool has_sigs = (sigs != null && sigs.Count > 0);
+ if (!has_sigs) {
+ foreach (string iface in interfaces) {
+ ClassBase igen = table.GetClassGen (iface);
+ if (igen != null && igen.Signals != null) {
+ has_sigs = true;
+ break;
+ }
+ }
+ }
+
+ if (has_sigs && Elem.HasAttribute("parent")) {
+ GenSignals (gen_info, null);
+ }
+
+ if (vm_nodes.Count > 0) {
+ if (gen_info.GlueEnabled) {
+ GenVirtualMethods (gen_info);
+ } else {
+ Statistics.VMIgnored = true;
+ Statistics.ThrottledCount += vm_nodes.Count;
+ }
+ }
+
+ GenMethods (gen_info, null, null);
+
+ if (interfaces.Count != 0) {
+ Hashtable all_methods = new Hashtable ();
+ foreach (Method m in Methods.Values)
+ all_methods[m.Name] = m;
+ Hashtable collisions = new Hashtable ();
+ foreach (string iface in interfaces) {
+ ClassBase igen = table.GetClassGen (iface);
+ foreach (Method m in igen.Methods.Values) {
+ Method collision = all_methods[m.Name] as Method;
+ if (collision != null && collision.Signature.Types == m.Signature.Types)
+ collisions[m.Name] = true;
+ else
+ all_methods[m.Name] = m;
+ }
+ }
+
+ foreach (string iface in interfaces) {
+ if (Parent != null && Parent.Implements (iface))
+ continue;
+ ClassBase igen = table.GetClassGen (iface);
+ igen.GenMethods (gen_info, collisions, this);
+ igen.GenProperties (gen_info, this);
+ igen.GenSignals (gen_info, this);
+ }
+ }
+
+ foreach (XmlElement str in strings) {
+ sw.Write ("\t\tpublic static string " + str.GetAttribute ("name"));
+ sw.WriteLine (" {\n\t\t\t get { return \"" + str.GetAttribute ("value") + "\"; }\n\t\t}");
+ }
+
+ if (cs_parent != String.Empty && GetExpected (CName) != QualifiedName) {
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstatic " + Name + " ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGtkSharp." + Studlify (asm_name) + ".ObjectManager.Initialize ();");
+ sw.WriteLine ("\t\t}");
+ }
+
+ sw.WriteLine ("#endregion");
+ AppendCustom (sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.ObjectCount++;
+ }
+
+ protected override void GenCtors (GenerationInfo gen_info)
+ {
+ if (!Elem.HasAttribute("parent"))
+ return;
+
+ if (!DisableGTypeCtor) {
+ gen_info.Writer.WriteLine("\t\t[Obsolete]");
+ gen_info.Writer.WriteLine("\t\tprotected " + Name + "(GLib.GType gtype) : base(gtype) {}");
+ }
+ gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
+ if (ctors.Count == 0 && !DisableVoidCtor) {
+ gen_info.Writer.WriteLine();
+ gen_info.Writer.WriteLine("\t\tprotected " + Name + "() : base(IntPtr.Zero)");
+ gen_info.Writer.WriteLine("\t\t{");
+ gen_info.Writer.WriteLine("\t\t\tCreateNativeObject (new string [0], new GLib.Value [0]);");
+ gen_info.Writer.WriteLine("\t\t}");
+ }
+ gen_info.Writer.WriteLine();
+
+ base.GenCtors (gen_info);
+ }
+
+ protected void GenChildProperties (GenerationInfo gen_info)
+ {
+ if (childprops.Count == 0)
+ return;
+
+ StreamWriter sw = gen_info.Writer;
+
+ ObjectGen child_ancestor = Parent as ObjectGen;
+ while (child_ancestor.CName != "GtkContainer" &&
+ child_ancestor.childprops.Count == 0)
+ child_ancestor = child_ancestor.Parent as ObjectGen;
+
+ sw.WriteLine ("\t\tpublic class " + Name + "Child : " + child_ancestor.NS + "." + child_ancestor.Name + "." + child_ancestor.Name + "Child {");
+ sw.WriteLine ("\t\t\tprotected internal " + Name + "Child (Gtk.Container parent, Gtk.Widget child) : base (parent, child) {}");
+ sw.WriteLine ("");
+
+ foreach (ChildProperty prop in childprops.Values)
+ prop.Generate (gen_info, "\t\t\t", null);
+
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("");
+
+ sw.WriteLine ("\t\tpublic override Gtk.Container.ContainerChild this [Gtk.Widget child] {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn new " + Name + "Child (this, child);");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("");
+
+ }
+
+ private void GenVMGlue (GenerationInfo gen_info, XmlElement elem)
+ {
+ StreamWriter sw = gen_info.GlueWriter;
+
+ string vm_name = elem.GetAttribute ("cname");
+ string method = gen_info.GluelibName + "_" + NS + Name + "_override_" + vm_name;
+ sw.WriteLine ();
+ sw.WriteLine ("void " + method + " (GType type, gpointer cb);");
+ sw.WriteLine ();
+ sw.WriteLine ("void");
+ sw.WriteLine (method + " (GType type, gpointer cb)");
+ sw.WriteLine ("{");
+ sw.WriteLine ("\t{0} *klass = ({0} *) g_type_class_peek (type);", NS + Name + "Class");
+ sw.WriteLine ("\tklass->" + vm_name + " = cb;");
+ sw.WriteLine ("}");
+ }
+
+ static bool vmhdrs_needed = true;
+
+ private void GenVirtualMethods (GenerationInfo gen_info)
+ {
+ if (vmhdrs_needed) {
+ gen_info.GlueWriter.WriteLine ("#include <glib-object.h>");
+ gen_info.GlueWriter.WriteLine ("#include \"vmglueheaders.h\"");
+ gen_info.GlueWriter.WriteLine ();
+ vmhdrs_needed = false;
+ }
+
+ foreach (XmlElement elem in vm_nodes) {
+ GenVMGlue (gen_info, elem);
+ }
+ }
+
+ /* Keep this in sync with the one in glib/GType.cs */
+ private static string GetExpected (string cname)
+ {
+ for (int i = 1; i < cname.Length; i++) {
+ if (Char.IsUpper (cname[i])) {
+ if (i == 1 && cname[0] == 'G')
+ return "GLib." + cname.Substring (1);
+ else
+ return cname.Substring (0, i) + "." + cname.Substring (i);
+ }
+ }
+
+ throw new ArgumentException ("cname doesn't follow the NamespaceType capitalization style: " + cname);
+ }
+
+ private static bool NeedsMap (Hashtable objs, string assembly_name)
+ {
+ foreach (string key in objs.Keys)
+ if (GetExpected (key) != ((string) objs[key]))
+ return true;
+
+ return false;
+ }
+
+ private static string Studlify (string name)
+ {
+ string result = "";
+
+ string[] subs = name.Split ('-');
+ foreach (string sub in subs)
+ result += Char.ToUpper (sub[0]) + sub.Substring (1);
+
+ return result;
+ }
+
+ public static void GenerateMappers ()
+ {
+ foreach (string dir in dirs.Keys) {
+
+ DirectoryInfo di = dirs[dir] as DirectoryInfo;
+
+ if (!NeedsMap (di.objects, di.assembly_name))
+ continue;
+
+ GenerationInfo gen_info = new GenerationInfo (dir, di.assembly_name);
+
+ GenerateMapper (di, gen_info);
+ }
+ }
+
+ private static void GenerateMapper (DirectoryInfo dir_info, GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.OpenStream ("ObjectManager");
+
+ sw.WriteLine ("namespace GtkSharp." + Studlify (dir_info.assembly_name) + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic class ObjectManager {");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstatic bool initialized = false;");
+ sw.WriteLine ("\t\t// Call this method from the appropriate module init function.");
+ sw.WriteLine ("\t\tpublic static void Initialize ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (initialized)");
+ sw.WriteLine ("\t\t\t\treturn;");
+ sw.WriteLine ("");
+ sw.WriteLine ("\t\t\tinitialized = true;");
+
+ foreach (string key in dir_info.objects.Keys) {
+ if (GetExpected(key) != ((string) dir_info.objects[key]))
+ sw.WriteLine ("\t\t\tGLib.GType.Register ({0}.GType, typeof ({0}));", dir_info.objects [key]);
+ }
+
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/OpaqueGen.cs b/lib/gio-sharp/generator/OpaqueGen.cs
index ca5bf86..8f7a3c1 100644
--- a/lib/gio-sharp/generator/OpaqueGen.cs
+++ b/lib/gio-sharp/generator/OpaqueGen.cs
@@ -1,230 +1,230 @@
-// GtkSharp.Generation.OpaqueGen.cs - The Opaque Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class OpaqueGen : HandleBase {
-
- public OpaqueGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override string FromNative(string var, bool owned)
- {
- return var + " == IntPtr.Zero ? null : (" + QualifiedName + ") GLib.Opaque.GetOpaque (" + var + ", typeof (" + QualifiedName + "), " + (owned ? "true" : "false") + ")";
- }
-
- private bool DisableRawCtor {
- get {
- return Elem.HasAttribute ("disable_raw_ctor");
- }
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Collections;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- sw.WriteLine ("#region Autogenerated code");
-
- SymbolTable table = SymbolTable.Table;
-
- Method ref_, unref, dispose;
- GetSpecialMethods (out ref_, out unref, out dispose);
-
- if (IsDeprecated)
- sw.WriteLine ("\t[Obsolete]");
- sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
- string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
- if (cs_parent != "")
- sw.Write (" : " + cs_parent);
- else
- sw.Write (" : GLib.Opaque");
- sw.WriteLine (" {");
- sw.WriteLine ();
-
- GenFields (gen_info);
- GenMethods (gen_info, null, null);
- GenCtors (gen_info);
-
- if (ref_ != null) {
- ref_.GenerateImport (sw);
- sw.WriteLine ("\t\tprotected override void Ref (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (!Owned) {");
- sw.WriteLine ("\t\t\t\t" + ref_.CName + " (raw);");
- sw.WriteLine ("\t\t\t\tOwned = true;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
-
- if (ref_.IsDeprecated) {
- sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
- if (ref_.ReturnType == "void")
- sw.WriteLine ("\t\tpublic void Ref () {}");
- else
- sw.WriteLine ("\t\tpublic " + Name + " Ref () { return this; }");
- sw.WriteLine ();
- }
- }
-
- bool finalizer_needed = false;
-
- if (unref != null) {
- unref.GenerateImport (sw);
- sw.WriteLine ("\t\tprotected override void Unref (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (Owned) {");
- sw.WriteLine ("\t\t\t\t" + unref.CName + " (raw);");
- sw.WriteLine ("\t\t\t\tOwned = false;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
-
- if (unref.IsDeprecated) {
- sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
- sw.WriteLine ("\t\tpublic void Unref () {}");
- sw.WriteLine ();
- }
- finalizer_needed = true;
- }
-
- if (dispose != null) {
- dispose.GenerateImport (sw);
- sw.WriteLine ("\t\tprotected override void Free (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\t" + dispose.CName + " (raw);");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
-
- if (dispose.IsDeprecated) {
- sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now freed automatically\")]");
- sw.WriteLine ("\t\tpublic void " + dispose.Name + " () {}");
- sw.WriteLine ();
- }
- finalizer_needed = true;
- }
-
- if (finalizer_needed) {
- sw.WriteLine ("\t\tclass FinalizerInfo {");
- sw.WriteLine ("\t\t\tIntPtr handle;");
- sw.WriteLine ();
- sw.WriteLine ("\t\t\tpublic FinalizerInfo (IntPtr handle)");
- sw.WriteLine ("\t\t\t{");
- sw.WriteLine ("\t\t\t\tthis.handle = handle;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\t\tpublic bool Handler ()");
- sw.WriteLine ("\t\t\t{");
- if (dispose != null)
- sw.WriteLine ("\t\t\t\t{0} (handle);", dispose.CName);
- else if (unref != null)
- sw.WriteLine ("\t\t\t\t{0} (handle);", unref.CName);
- sw.WriteLine ("\t\t\t\treturn false;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\t~{0} ()", Name);
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (!Owned)");
- sw.WriteLine ("\t\t\t\treturn;");
- sw.WriteLine ("\t\t\tFinalizerInfo info = new FinalizerInfo (Handle);");
- sw.WriteLine ("\t\t\tGLib.Timeout.Add (50, new GLib.TimeoutHandler (info.Handler));");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
-#if false
- Method copy = Methods ["Copy"] as Method;
- if (copy != null && copy.Parameters.Count == 0) {
- sw.WriteLine ("\t\tprotected override GLib.Opaque Copy (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGLib.Opaque result = new " + QualifiedName + " (" + copy.CName + " (raw));");
- sw.WriteLine ("\t\t\tresult.Owned = true;");
- sw.WriteLine ("\t\t\treturn result;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-#endif
- sw.WriteLine ("#endregion");
-
- AppendCustom(sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
-
- sw.Close ();
- gen_info.Writer = null;
- Statistics.OpaqueCount++;
- }
-
- void GetSpecialMethods (out Method ref_, out Method unref, out Method dispose)
- {
- ref_ = CheckSpecialMethod (GetMethod ("Ref"));
- unref = CheckSpecialMethod (GetMethod ("Unref"));
-
- dispose = GetMethod ("Free");
- if (dispose == null) {
- dispose = GetMethod ("Destroy");
- if (dispose == null)
- dispose = GetMethod ("Dispose");
- }
- dispose = CheckSpecialMethod (dispose);
- }
-
- Method CheckSpecialMethod (Method method)
- {
- if (method == null)
- return null;
- if (method.ReturnType != "void" &&
- method.ReturnType != QualifiedName)
- return null;
- if (method.Signature.ToString () != "")
- return null;
-
- methods.Remove (method.Name);
- return method;
- }
-
- protected override void GenCtors (GenerationInfo gen_info)
- {
- if (!DisableRawCtor) {
- gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
- gen_info.Writer.WriteLine();
- }
-
- base.GenCtors (gen_info);
- }
-
- }
-}
-
+// GtkSharp.Generation.OpaqueGen.cs - The Opaque Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class OpaqueGen : HandleBase {
+
+ public OpaqueGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override string FromNative(string var, bool owned)
+ {
+ return var + " == IntPtr.Zero ? null : (" + QualifiedName + ") GLib.Opaque.GetOpaque (" + var + ", typeof (" + QualifiedName + "), " + (owned ? "true" : "false") + ")";
+ }
+
+ private bool DisableRawCtor {
+ get {
+ return Elem.HasAttribute ("disable_raw_ctor");
+ }
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Collections;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ sw.WriteLine ("#region Autogenerated code");
+
+ SymbolTable table = SymbolTable.Table;
+
+ Method ref_, unref, dispose;
+ GetSpecialMethods (out ref_, out unref, out dispose);
+
+ if (IsDeprecated)
+ sw.WriteLine ("\t[Obsolete]");
+ sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
+ string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
+ if (cs_parent != "")
+ sw.Write (" : " + cs_parent);
+ else
+ sw.Write (" : GLib.Opaque");
+ sw.WriteLine (" {");
+ sw.WriteLine ();
+
+ GenFields (gen_info);
+ GenMethods (gen_info, null, null);
+ GenCtors (gen_info);
+
+ if (ref_ != null) {
+ ref_.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Ref (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (!Owned) {");
+ sw.WriteLine ("\t\t\t\t" + ref_.CName + " (raw);");
+ sw.WriteLine ("\t\t\t\tOwned = true;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (ref_.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
+ if (ref_.ReturnType == "void")
+ sw.WriteLine ("\t\tpublic void Ref () {}");
+ else
+ sw.WriteLine ("\t\tpublic " + Name + " Ref () { return this; }");
+ sw.WriteLine ();
+ }
+ }
+
+ bool finalizer_needed = false;
+
+ if (unref != null) {
+ unref.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Unref (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (Owned) {");
+ sw.WriteLine ("\t\t\t\t" + unref.CName + " (raw);");
+ sw.WriteLine ("\t\t\t\tOwned = false;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (unref.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
+ sw.WriteLine ("\t\tpublic void Unref () {}");
+ sw.WriteLine ();
+ }
+ finalizer_needed = true;
+ }
+
+ if (dispose != null) {
+ dispose.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Free (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\t" + dispose.CName + " (raw);");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (dispose.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now freed automatically\")]");
+ sw.WriteLine ("\t\tpublic void " + dispose.Name + " () {}");
+ sw.WriteLine ();
+ }
+ finalizer_needed = true;
+ }
+
+ if (finalizer_needed) {
+ sw.WriteLine ("\t\tclass FinalizerInfo {");
+ sw.WriteLine ("\t\t\tIntPtr handle;");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t\tpublic FinalizerInfo (IntPtr handle)");
+ sw.WriteLine ("\t\t\t{");
+ sw.WriteLine ("\t\t\t\tthis.handle = handle;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t\tpublic bool Handler ()");
+ sw.WriteLine ("\t\t\t{");
+ if (dispose != null)
+ sw.WriteLine ("\t\t\t\t{0} (handle);", dispose.CName);
+ else if (unref != null)
+ sw.WriteLine ("\t\t\t\t{0} (handle);", unref.CName);
+ sw.WriteLine ("\t\t\t\treturn false;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t~{0} ()", Name);
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (!Owned)");
+ sw.WriteLine ("\t\t\t\treturn;");
+ sw.WriteLine ("\t\t\tFinalizerInfo info = new FinalizerInfo (Handle);");
+ sw.WriteLine ("\t\t\tGLib.Timeout.Add (50, new GLib.TimeoutHandler (info.Handler));");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+#if false
+ Method copy = Methods ["Copy"] as Method;
+ if (copy != null && copy.Parameters.Count == 0) {
+ sw.WriteLine ("\t\tprotected override GLib.Opaque Copy (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGLib.Opaque result = new " + QualifiedName + " (" + copy.CName + " (raw));");
+ sw.WriteLine ("\t\t\tresult.Owned = true;");
+ sw.WriteLine ("\t\t\treturn result;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+#endif
+ sw.WriteLine ("#endregion");
+
+ AppendCustom(sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.OpaqueCount++;
+ }
+
+ void GetSpecialMethods (out Method ref_, out Method unref, out Method dispose)
+ {
+ ref_ = CheckSpecialMethod (GetMethod ("Ref"));
+ unref = CheckSpecialMethod (GetMethod ("Unref"));
+
+ dispose = GetMethod ("Free");
+ if (dispose == null) {
+ dispose = GetMethod ("Destroy");
+ if (dispose == null)
+ dispose = GetMethod ("Dispose");
+ }
+ dispose = CheckSpecialMethod (dispose);
+ }
+
+ Method CheckSpecialMethod (Method method)
+ {
+ if (method == null)
+ return null;
+ if (method.ReturnType != "void" &&
+ method.ReturnType != QualifiedName)
+ return null;
+ if (method.Signature.ToString () != "")
+ return null;
+
+ methods.Remove (method.Name);
+ return method;
+ }
+
+ protected override void GenCtors (GenerationInfo gen_info)
+ {
+ if (!DisableRawCtor) {
+ gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
+ gen_info.Writer.WriteLine();
+ }
+
+ base.GenCtors (gen_info);
+ }
+
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Parameters.cs b/lib/gio-sharp/generator/Parameters.cs
index 75dd68f..c399c6e 100644
--- a/lib/gio-sharp/generator/Parameters.cs
+++ b/lib/gio-sharp/generator/Parameters.cs
@@ -1,728 +1,728 @@
-// GtkSharp.Generation.Parameters.cs - The Parameters Generation Class.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Parameter {
-
- private XmlElement elem;
-
- public Parameter (XmlElement e)
- {
- elem = e;
- }
-
- string call_name;
- public string CallName {
- get {
- if (call_name == null)
- return Name;
- else
- return call_name;
- }
- set {
- call_name = value;
- }
- }
-
- public string CType {
- get {
- string type = elem.GetAttribute("type");
- if (type == "void*")
- type = "gpointer";
- return type;
- }
- }
-
- public string CSType {
- get {
- string cstype = SymbolTable.Table.GetCSType( elem.GetAttribute("type"));
- if (cstype == "void")
- cstype = "System.IntPtr";
- if (IsArray) {
- if (IsParams)
- cstype = "params " + cstype;
- cstype += "[]";
- cstype = cstype.Replace ("ref ", "");
- }
- return cstype;
- }
- }
-
- public IGeneratable Generatable {
- get {
- return SymbolTable.Table[CType];
- }
- }
-
- public bool IsArray {
- get {
- return elem.HasAttribute("array") || elem.HasAttribute("null_term_array");
- }
- }
-
- public bool IsEllipsis {
- get {
- return elem.HasAttribute("ellipsis");
- }
- }
-
- public bool IsCount {
- get {
-
- if (Name.StartsWith("n_"))
- switch (CSType) {
- case "int":
- case "uint":
- case "long":
- case "ulong":
- case "short":
- case "ushort":
- return true;
- default:
- return false;
- }
- else
- return false;
- }
- }
-
- public bool IsDestroyNotify {
- get {
- return CType == "GDestroyNotify";
- }
- }
-
- public bool IsLength {
- get {
-
- if (Name.EndsWith("len") || Name.EndsWith("length"))
- switch (CSType) {
- case "int":
- case "uint":
- case "long":
- case "ulong":
- case "short":
- case "ushort":
- return true;
- default:
- return false;
- }
- else
- return false;
- }
- }
-
- public bool IsParams {
- get {
- return elem.HasAttribute("params");
- }
- }
-
- public bool IsString {
- get {
- return (CSType == "string");
- }
- }
-
- public bool IsUserData {
- get {
- return CSType == "IntPtr" && (Name.EndsWith ("data") || Name.EndsWith ("data_or_owner"));
- }
- }
-
- public virtual string MarshalType {
- get {
- string type = SymbolTable.Table.GetMarshalType( elem.GetAttribute("type"));
- if (type == "void" || Generatable is IManualMarshaler)
- type = "IntPtr";
- if (IsArray) {
- type += "[]";
- type = type.Replace ("ref ", "");
- }
- return type;
- }
- }
-
- public string Name {
- get {
- return SymbolTable.Table.MangleName (elem.GetAttribute("name"));
- }
- }
-
- public bool Owned {
- get {
- return elem.GetAttribute ("owned") == "true";
- }
- }
-
- public virtual string NativeSignature {
- get {
- string sig = MarshalType + " " + Name;
- if (PassAs != String.Empty)
- sig = PassAs + " " + sig;
- return sig;
- }
- }
-
- public string PropertyName {
- get {
- return elem.GetAttribute("property_name");
- }
- }
-
- string pass_as;
-
- public string PassAs {
- get {
- if (pass_as != null)
- return pass_as;
-
- if (elem.HasAttribute ("pass_as"))
- return elem.GetAttribute ("pass_as");
-
- if (IsArray || CSType.EndsWith ("IntPtr"))
- return "";
-
- if (CType.EndsWith ("*") && (Generatable is SimpleGen || Generatable is EnumGen))
- return "out";
-
- return "";
- }
- set {
- pass_as = value;
- }
- }
-
- string scope;
- public string Scope {
- get {
- if (scope == null)
- scope = elem.GetAttribute ("scope");
- return scope;
- }
- set {
- scope = value;
- }
- }
-
- public virtual string[] Prepare {
- get {
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler) {
- string result = "IntPtr native_" + CallName;
- if (PassAs != "out")
- result += " = " + (gen as IManualMarshaler).AllocNative (CallName);
- return new string [] { result + ";" };
- } else if (PassAs == "out" && CSType != MarshalType)
- return new string [] { gen.MarshalType + " native_" + CallName + ";" };
-
- return new string [0];
- }
- }
-
- public virtual string CallString {
- get {
- string call_parm;
-
- IGeneratable gen = Generatable;
- if (gen is CallbackGen)
- return SymbolTable.Table.CallByName (CType, CallName + "_wrapper");
- else if (PassAs != String.Empty) {
- call_parm = PassAs + " ";
- if (CSType != MarshalType)
- call_parm += "native_";
- call_parm += CallName;
- } else if (gen is IManualMarshaler)
- call_parm = "native_" + CallName;
- else
- call_parm = SymbolTable.Table.CallByName(CType, CallName);
-
- return call_parm;
- }
- }
-
- public virtual string[] Finish {
- get {
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler) {
- string[] result = new string [PassAs == "ref" ? 2 : 1];
- int i = 0;
- if (PassAs != String.Empty)
- result [i++] = CallName + " = " + Generatable.FromNative ("native_" + CallName) + ";";
- if (PassAs != "out")
- result [i] = (gen as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
- return result;
- } else if (PassAs != String.Empty && MarshalType != CSType)
- return new string [] { CallName + " = " + gen.FromNative ("native_" + CallName) + ";" };
- return new string [0];
- }
- }
-
- public string FromNative (string var)
- {
- if (Generatable == null)
- return String.Empty;
- else if (Generatable is HandleBase)
- return ((HandleBase)Generatable).FromNative (var, Owned);
- else
- return Generatable.FromNative (var);
- }
-
- public string StudlyName {
- get {
- string name = elem.GetAttribute("name");
- string[] segs = name.Split('_');
- string studly = "";
- foreach (string s in segs) {
- if (s.Trim () == "")
- continue;
- studly += (s.Substring(0,1).ToUpper() + s.Substring(1));
- }
- return studly;
-
- }
- }
- }
-
- public class ArrayParameter : Parameter {
-
- bool null_terminated;
-
- public ArrayParameter (XmlElement elem) : base (elem)
- {
- null_terminated = elem.HasAttribute ("null_term_array");
- }
-
- public override string MarshalType {
- get {
- if (Generatable is StructBase)
- return CSType;
- else
- return base.MarshalType;
- }
- }
-
- bool NullTerminated {
- get {
- return null_terminated;
- }
- }
-
- public override string[] Prepare {
- get {
- if (CSType == MarshalType)
- return new string [0];
-
- ArrayList result = new ArrayList ();
- result.Add (String.Format ("int cnt_{0} = {0} == null ? 0 : {0}.Length;", CallName));
- result.Add (String.Format ("{0}[] native_{1} = new {0} [cnt_{1}" + (NullTerminated ? " + 1" : "") + "];", MarshalType.TrimEnd('[', ']'), CallName));
- result.Add (String.Format ("for (int i = 0; i < cnt_{0}; i++)", CallName));
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler)
- result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, (gen as IManualMarshaler).AllocNative (CallName + "[i]")));
- else
- result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, gen.CallByName (CallName + "[i]")));
-
- if (NullTerminated)
- result.Add (String.Format ("native_{0} [cnt_{0}] = IntPtr.Zero;", CallName));
- return (string[]) result.ToArray (typeof (string));
- }
- }
-
- public override string CallString {
- get {
- if (CSType != MarshalType)
- return "native_" + CallName;
- else
- return CallName;
- }
- }
-
- public override string[] Finish {
- get {
- if (CSType == MarshalType)
- return new string [0];
-
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler) {
- string [] result = new string [4];
- result [0] = "for (int i = 0; i < native_" + CallName + ".Length" + (NullTerminated ? " - 1" : "") + "; i++) {";
- result [1] = "\t" + CallName + " [i] = " + Generatable.FromNative ("native_" + CallName + "[i]") + ";";
- result [2] = "\t" + (gen as IManualMarshaler).ReleaseNative ("native_" + CallName + "[i]") + ";";
- result [3] = "}";
- return result;
- }
-
- return new string [0];
- }
- }
- }
-
- public class ArrayCountPair : ArrayParameter {
-
- XmlElement count_elem;
- bool invert;
-
- public ArrayCountPair (XmlElement array_elem, XmlElement count_elem, bool invert) : base (array_elem)
- {
- this.count_elem = count_elem;
- this.invert = invert;
- }
-
- string CountNativeType {
- get {
- return SymbolTable.Table.GetMarshalType(count_elem.GetAttribute("type"));
- }
- }
-
- string CountType {
- get {
- return SymbolTable.Table.GetCSType(count_elem.GetAttribute("type"));
- }
- }
-
- string CountCast {
- get {
- if (CountType == "int")
- return String.Empty;
- else
- return "(" + CountType + ") ";
- }
- }
-
- string CountName {
- get {
- return SymbolTable.Table.MangleName (count_elem.GetAttribute("name"));
- }
- }
-
- string CallCount (string name)
- {
- string result = CountCast + "(" + name + " == null ? 0 : " + name + ".Length)";
- IGeneratable gen = SymbolTable.Table[count_elem.GetAttribute("type")];
- return gen.CallByName (result);
- }
-
- public override string CallString {
- get {
- if (invert)
- return CallCount (CallName) + ", " + base.CallString;
- else
- return base.CallString + ", " + CallCount (CallName);
- }
- }
-
- public override string NativeSignature {
- get {
- if (invert)
- return CountNativeType + " " + CountName + ", " + MarshalType + " " + Name;
- else
- return MarshalType + " " + Name + ", " + CountNativeType + " " + CountName;
- }
- }
- }
-
- public class ErrorParameter : Parameter {
-
- public ErrorParameter (XmlElement elem) : base (elem)
- {
- PassAs = "out";
- }
-
- public override string CallString {
- get {
- return "out error";
- }
- }
- }
-
- public class StructParameter : Parameter {
-
- public StructParameter (XmlElement elem) : base (elem) {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string[] Prepare {
- get {
- if (PassAs == "out")
- return new string [] { "IntPtr native_" + CallName + " = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + Generatable.QualifiedName + ")));"};
- else
- return new string [] { "IntPtr native_" + CallName + " = " + (Generatable as IManualMarshaler).AllocNative (CallName) + ";"};
- }
- }
-
- public override string CallString {
- get {
- return "native_" + CallName;
- }
- }
-
- public override string[] Finish {
- get {
- string[] result = new string [2];
- result [0] = CallName + " = " + FromNative ("native_" + CallName) + ";";
- result [1] = (Generatable as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
- return result;
- }
- }
-
- public override string NativeSignature {
- get {
- return "IntPtr " + CallName;
- }
- }
- }
-
- public class Parameters : IEnumerable {
-
- ArrayList param_list = new ArrayList ();
- XmlElement elem;
-
- public Parameters (XmlElement elem)
- {
- if (elem == null)
- valid = true;
- this.elem = elem;
- }
-
- public int Count {
- get {
- return param_list.Count;
- }
- }
-
- public int VisibleCount {
- get {
- int visible = 0;
- foreach (Parameter p in this) {
- if (!IsHidden (p))
- visible++;
- }
- return visible;
- }
- }
-
- public Parameter this [int idx] {
- get {
- return param_list [idx] as Parameter;
- }
- }
-
- public bool IsHidden (Parameter p)
- {
- int idx = param_list.IndexOf (p);
-
- if (idx > 0 && p.IsLength && p.PassAs == String.Empty && this [idx - 1].IsString)
- return true;
-
- if (p.IsCount && ((idx > 0 && this [idx - 1].IsArray) ||
- (idx < Count - 1 && this [idx + 1].IsArray)))
- return true;
-
- if (p.CType == "GError**")
- return true;
-
- if (HasCB || HideData) {
- if (p.IsUserData && (idx == Count - 1))
- return true;
- if (p.IsUserData && (idx == Count - 2) && this [Count - 1] is ErrorParameter)
- return true;
- if (p.IsUserData && idx > 0 &&
- this [idx - 1].Generatable is CallbackGen)
- return true;
- if (p.IsDestroyNotify && (idx == Count - 1) &&
- this [idx - 1].IsUserData)
- return true;
- }
-
- return false;
- }
-
- bool has_cb;
- public bool HasCB {
- get { return has_cb; }
- set { has_cb = value; }
- }
-
- public bool HasOutParam {
- get {
- foreach (Parameter p in this)
- if (p.PassAs == "out")
- return true;
- return false;
- }
- }
-
- bool hide_data;
- public bool HideData {
- get { return hide_data; }
- set { hide_data = value; }
- }
-
- bool is_static;
- public bool Static {
- get { return is_static; }
- set { is_static = value; }
- }
-
- void Clear ()
- {
- elem = null;
- param_list.Clear ();
- param_list = null;
- }
-
- public IEnumerator GetEnumerator ()
- {
- return param_list.GetEnumerator ();
- }
-
- bool valid = false;
-
- public bool Validate ()
- {
- if (valid)
- return true;
-
- if (elem == null)
- return false;
-
- for (int i = 0; i < elem.ChildNodes.Count; i++) {
- XmlElement parm = elem.ChildNodes [i] as XmlElement;
- if (parm == null || parm.Name != "parameter")
- continue;
- Parameter p = new Parameter (parm);
-
- if (p.IsEllipsis) {
- Console.Write("Ellipsis parameter ");
- Clear ();
- return false;
- }
-
- if ((p.CSType == "") || (p.Name == "") ||
- (p.MarshalType == "") || (SymbolTable.Table.CallByName(p.CType, p.Name) == "")) {
- Console.Write("Name: " + p.Name + " Type: " + p.CType + " ");
- Clear ();
- return false;
- }
-
- IGeneratable gen = p.Generatable;
-
- if (p.IsArray) {
- p = new ArrayParameter (parm);
- if (i < elem.ChildNodes.Count - 1) {
- XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
- if (next != null || next.Name == "parameter") {
- Parameter c = new Parameter (next);
- if (c.IsCount) {
- p = new ArrayCountPair (parm, next, false);
- i++;
- }
- }
- }
- } else if (p.IsCount && i < elem.ChildNodes.Count - 1) {
- XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
- if (next != null || next.Name == "parameter") {
- Parameter a = new Parameter (next);
- if (a.IsArray) {
- p = new ArrayCountPair (next, parm, true);
- i++;
- }
- }
- } else if (p.CType == "GError**")
- p = new ErrorParameter (parm);
- else if (gen is StructBase || gen is ByRefGen) {
- p = new StructParameter (parm);
- } else if (gen is CallbackGen) {
- has_cb = true;
- }
- param_list.Add (p);
- }
-
- if (has_cb && Count > 2 && this [Count - 3].Generatable is CallbackGen && this [Count - 2].IsUserData && this [Count - 1].IsDestroyNotify)
- this [Count - 3].Scope = "notified";
-
- valid = true;
- return true;
- }
-
- public bool IsAccessor {
- get {
- return VisibleCount == 1 && AccessorParam.PassAs == "out";
- }
- }
-
- public Parameter AccessorParam {
- get {
- foreach (Parameter p in this) {
- if (!IsHidden (p))
- return p;
- }
- return null;
- }
- }
-
- public string AccessorReturnType {
- get {
- Parameter p = AccessorParam;
- if (p != null)
- return p.CSType;
- else
- return null;
- }
- }
-
- public string AccessorName {
- get {
- Parameter p = AccessorParam;
- if (p != null)
- return p.Name;
- else
- return null;
- }
- }
-
- public string ImportSignature {
- get {
- if (Count == 0)
- return String.Empty;
-
- string[] result = new string [Count];
- for (int i = 0; i < Count; i++)
- result [i] = this [i].NativeSignature;
-
- return String.Join (", ", result);
- }
- }
- }
-}
-
+// GtkSharp.Generation.Parameters.cs - The Parameters Generation Class.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Parameter {
+
+ private XmlElement elem;
+
+ public Parameter (XmlElement e)
+ {
+ elem = e;
+ }
+
+ string call_name;
+ public string CallName {
+ get {
+ if (call_name == null)
+ return Name;
+ else
+ return call_name;
+ }
+ set {
+ call_name = value;
+ }
+ }
+
+ public string CType {
+ get {
+ string type = elem.GetAttribute("type");
+ if (type == "void*")
+ type = "gpointer";
+ return type;
+ }
+ }
+
+ public string CSType {
+ get {
+ string cstype = SymbolTable.Table.GetCSType( elem.GetAttribute("type"));
+ if (cstype == "void")
+ cstype = "System.IntPtr";
+ if (IsArray) {
+ if (IsParams)
+ cstype = "params " + cstype;
+ cstype += "[]";
+ cstype = cstype.Replace ("ref ", "");
+ }
+ return cstype;
+ }
+ }
+
+ public IGeneratable Generatable {
+ get {
+ return SymbolTable.Table[CType];
+ }
+ }
+
+ public bool IsArray {
+ get {
+ return elem.HasAttribute("array") || elem.HasAttribute("null_term_array");
+ }
+ }
+
+ public bool IsEllipsis {
+ get {
+ return elem.HasAttribute("ellipsis");
+ }
+ }
+
+ public bool IsCount {
+ get {
+
+ if (Name.StartsWith("n_"))
+ switch (CSType) {
+ case "int":
+ case "uint":
+ case "long":
+ case "ulong":
+ case "short":
+ case "ushort":
+ return true;
+ default:
+ return false;
+ }
+ else
+ return false;
+ }
+ }
+
+ public bool IsDestroyNotify {
+ get {
+ return CType == "GDestroyNotify";
+ }
+ }
+
+ public bool IsLength {
+ get {
+
+ if (Name.EndsWith("len") || Name.EndsWith("length"))
+ switch (CSType) {
+ case "int":
+ case "uint":
+ case "long":
+ case "ulong":
+ case "short":
+ case "ushort":
+ return true;
+ default:
+ return false;
+ }
+ else
+ return false;
+ }
+ }
+
+ public bool IsParams {
+ get {
+ return elem.HasAttribute("params");
+ }
+ }
+
+ public bool IsString {
+ get {
+ return (CSType == "string");
+ }
+ }
+
+ public bool IsUserData {
+ get {
+ return CSType == "IntPtr" && (Name.EndsWith ("data") || Name.EndsWith ("data_or_owner"));
+ }
+ }
+
+ public virtual string MarshalType {
+ get {
+ string type = SymbolTable.Table.GetMarshalType( elem.GetAttribute("type"));
+ if (type == "void" || Generatable is IManualMarshaler)
+ type = "IntPtr";
+ if (IsArray) {
+ type += "[]";
+ type = type.Replace ("ref ", "");
+ }
+ return type;
+ }
+ }
+
+ public string Name {
+ get {
+ return SymbolTable.Table.MangleName (elem.GetAttribute("name"));
+ }
+ }
+
+ public bool Owned {
+ get {
+ return elem.GetAttribute ("owned") == "true";
+ }
+ }
+
+ public virtual string NativeSignature {
+ get {
+ string sig = MarshalType + " " + Name;
+ if (PassAs != String.Empty)
+ sig = PassAs + " " + sig;
+ return sig;
+ }
+ }
+
+ public string PropertyName {
+ get {
+ return elem.GetAttribute("property_name");
+ }
+ }
+
+ string pass_as;
+
+ public string PassAs {
+ get {
+ if (pass_as != null)
+ return pass_as;
+
+ if (elem.HasAttribute ("pass_as"))
+ return elem.GetAttribute ("pass_as");
+
+ if (IsArray || CSType.EndsWith ("IntPtr"))
+ return "";
+
+ if (CType.EndsWith ("*") && (Generatable is SimpleGen || Generatable is EnumGen))
+ return "out";
+
+ return "";
+ }
+ set {
+ pass_as = value;
+ }
+ }
+
+ string scope;
+ public string Scope {
+ get {
+ if (scope == null)
+ scope = elem.GetAttribute ("scope");
+ return scope;
+ }
+ set {
+ scope = value;
+ }
+ }
+
+ public virtual string[] Prepare {
+ get {
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler) {
+ string result = "IntPtr native_" + CallName;
+ if (PassAs != "out")
+ result += " = " + (gen as IManualMarshaler).AllocNative (CallName);
+ return new string [] { result + ";" };
+ } else if (PassAs == "out" && CSType != MarshalType)
+ return new string [] { gen.MarshalType + " native_" + CallName + ";" };
+
+ return new string [0];
+ }
+ }
+
+ public virtual string CallString {
+ get {
+ string call_parm;
+
+ IGeneratable gen = Generatable;
+ if (gen is CallbackGen)
+ return SymbolTable.Table.CallByName (CType, CallName + "_wrapper");
+ else if (PassAs != String.Empty) {
+ call_parm = PassAs + " ";
+ if (CSType != MarshalType)
+ call_parm += "native_";
+ call_parm += CallName;
+ } else if (gen is IManualMarshaler)
+ call_parm = "native_" + CallName;
+ else
+ call_parm = SymbolTable.Table.CallByName(CType, CallName);
+
+ return call_parm;
+ }
+ }
+
+ public virtual string[] Finish {
+ get {
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler) {
+ string[] result = new string [PassAs == "ref" ? 2 : 1];
+ int i = 0;
+ if (PassAs != String.Empty)
+ result [i++] = CallName + " = " + Generatable.FromNative ("native_" + CallName) + ";";
+ if (PassAs != "out")
+ result [i] = (gen as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
+ return result;
+ } else if (PassAs != String.Empty && MarshalType != CSType)
+ return new string [] { CallName + " = " + gen.FromNative ("native_" + CallName) + ";" };
+ return new string [0];
+ }
+ }
+
+ public string FromNative (string var)
+ {
+ if (Generatable == null)
+ return String.Empty;
+ else if (Generatable is HandleBase)
+ return ((HandleBase)Generatable).FromNative (var, Owned);
+ else
+ return Generatable.FromNative (var);
+ }
+
+ public string StudlyName {
+ get {
+ string name = elem.GetAttribute("name");
+ string[] segs = name.Split('_');
+ string studly = "";
+ foreach (string s in segs) {
+ if (s.Trim () == "")
+ continue;
+ studly += (s.Substring(0,1).ToUpper() + s.Substring(1));
+ }
+ return studly;
+
+ }
+ }
+ }
+
+ public class ArrayParameter : Parameter {
+
+ bool null_terminated;
+
+ public ArrayParameter (XmlElement elem) : base (elem)
+ {
+ null_terminated = elem.HasAttribute ("null_term_array");
+ }
+
+ public override string MarshalType {
+ get {
+ if (Generatable is StructBase)
+ return CSType;
+ else
+ return base.MarshalType;
+ }
+ }
+
+ bool NullTerminated {
+ get {
+ return null_terminated;
+ }
+ }
+
+ public override string[] Prepare {
+ get {
+ if (CSType == MarshalType)
+ return new string [0];
+
+ ArrayList result = new ArrayList ();
+ result.Add (String.Format ("int cnt_{0} = {0} == null ? 0 : {0}.Length;", CallName));
+ result.Add (String.Format ("{0}[] native_{1} = new {0} [cnt_{1}" + (NullTerminated ? " + 1" : "") + "];", MarshalType.TrimEnd('[', ']'), CallName));
+ result.Add (String.Format ("for (int i = 0; i < cnt_{0}; i++)", CallName));
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler)
+ result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, (gen as IManualMarshaler).AllocNative (CallName + "[i]")));
+ else
+ result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, gen.CallByName (CallName + "[i]")));
+
+ if (NullTerminated)
+ result.Add (String.Format ("native_{0} [cnt_{0}] = IntPtr.Zero;", CallName));
+ return (string[]) result.ToArray (typeof (string));
+ }
+ }
+
+ public override string CallString {
+ get {
+ if (CSType != MarshalType)
+ return "native_" + CallName;
+ else
+ return CallName;
+ }
+ }
+
+ public override string[] Finish {
+ get {
+ if (CSType == MarshalType)
+ return new string [0];
+
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler) {
+ string [] result = new string [4];
+ result [0] = "for (int i = 0; i < native_" + CallName + ".Length" + (NullTerminated ? " - 1" : "") + "; i++) {";
+ result [1] = "\t" + CallName + " [i] = " + Generatable.FromNative ("native_" + CallName + "[i]") + ";";
+ result [2] = "\t" + (gen as IManualMarshaler).ReleaseNative ("native_" + CallName + "[i]") + ";";
+ result [3] = "}";
+ return result;
+ }
+
+ return new string [0];
+ }
+ }
+ }
+
+ public class ArrayCountPair : ArrayParameter {
+
+ XmlElement count_elem;
+ bool invert;
+
+ public ArrayCountPair (XmlElement array_elem, XmlElement count_elem, bool invert) : base (array_elem)
+ {
+ this.count_elem = count_elem;
+ this.invert = invert;
+ }
+
+ string CountNativeType {
+ get {
+ return SymbolTable.Table.GetMarshalType(count_elem.GetAttribute("type"));
+ }
+ }
+
+ string CountType {
+ get {
+ return SymbolTable.Table.GetCSType(count_elem.GetAttribute("type"));
+ }
+ }
+
+ string CountCast {
+ get {
+ if (CountType == "int")
+ return String.Empty;
+ else
+ return "(" + CountType + ") ";
+ }
+ }
+
+ string CountName {
+ get {
+ return SymbolTable.Table.MangleName (count_elem.GetAttribute("name"));
+ }
+ }
+
+ string CallCount (string name)
+ {
+ string result = CountCast + "(" + name + " == null ? 0 : " + name + ".Length)";
+ IGeneratable gen = SymbolTable.Table[count_elem.GetAttribute("type")];
+ return gen.CallByName (result);
+ }
+
+ public override string CallString {
+ get {
+ if (invert)
+ return CallCount (CallName) + ", " + base.CallString;
+ else
+ return base.CallString + ", " + CallCount (CallName);
+ }
+ }
+
+ public override string NativeSignature {
+ get {
+ if (invert)
+ return CountNativeType + " " + CountName + ", " + MarshalType + " " + Name;
+ else
+ return MarshalType + " " + Name + ", " + CountNativeType + " " + CountName;
+ }
+ }
+ }
+
+ public class ErrorParameter : Parameter {
+
+ public ErrorParameter (XmlElement elem) : base (elem)
+ {
+ PassAs = "out";
+ }
+
+ public override string CallString {
+ get {
+ return "out error";
+ }
+ }
+ }
+
+ public class StructParameter : Parameter {
+
+ public StructParameter (XmlElement elem) : base (elem) {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string[] Prepare {
+ get {
+ if (PassAs == "out")
+ return new string [] { "IntPtr native_" + CallName + " = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + Generatable.QualifiedName + ")));"};
+ else
+ return new string [] { "IntPtr native_" + CallName + " = " + (Generatable as IManualMarshaler).AllocNative (CallName) + ";"};
+ }
+ }
+
+ public override string CallString {
+ get {
+ return "native_" + CallName;
+ }
+ }
+
+ public override string[] Finish {
+ get {
+ string[] result = new string [2];
+ result [0] = CallName + " = " + FromNative ("native_" + CallName) + ";";
+ result [1] = (Generatable as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
+ return result;
+ }
+ }
+
+ public override string NativeSignature {
+ get {
+ return "IntPtr " + CallName;
+ }
+ }
+ }
+
+ public class Parameters : IEnumerable {
+
+ ArrayList param_list = new ArrayList ();
+ XmlElement elem;
+
+ public Parameters (XmlElement elem)
+ {
+ if (elem == null)
+ valid = true;
+ this.elem = elem;
+ }
+
+ public int Count {
+ get {
+ return param_list.Count;
+ }
+ }
+
+ public int VisibleCount {
+ get {
+ int visible = 0;
+ foreach (Parameter p in this) {
+ if (!IsHidden (p))
+ visible++;
+ }
+ return visible;
+ }
+ }
+
+ public Parameter this [int idx] {
+ get {
+ return param_list [idx] as Parameter;
+ }
+ }
+
+ public bool IsHidden (Parameter p)
+ {
+ int idx = param_list.IndexOf (p);
+
+ if (idx > 0 && p.IsLength && p.PassAs == String.Empty && this [idx - 1].IsString)
+ return true;
+
+ if (p.IsCount && ((idx > 0 && this [idx - 1].IsArray) ||
+ (idx < Count - 1 && this [idx + 1].IsArray)))
+ return true;
+
+ if (p.CType == "GError**")
+ return true;
+
+ if (HasCB || HideData) {
+ if (p.IsUserData && (idx == Count - 1))
+ return true;
+ if (p.IsUserData && (idx == Count - 2) && this [Count - 1] is ErrorParameter)
+ return true;
+ if (p.IsUserData && idx > 0 &&
+ this [idx - 1].Generatable is CallbackGen)
+ return true;
+ if (p.IsDestroyNotify && (idx == Count - 1) &&
+ this [idx - 1].IsUserData)
+ return true;
+ }
+
+ return false;
+ }
+
+ bool has_cb;
+ public bool HasCB {
+ get { return has_cb; }
+ set { has_cb = value; }
+ }
+
+ public bool HasOutParam {
+ get {
+ foreach (Parameter p in this)
+ if (p.PassAs == "out")
+ return true;
+ return false;
+ }
+ }
+
+ bool hide_data;
+ public bool HideData {
+ get { return hide_data; }
+ set { hide_data = value; }
+ }
+
+ bool is_static;
+ public bool Static {
+ get { return is_static; }
+ set { is_static = value; }
+ }
+
+ void Clear ()
+ {
+ elem = null;
+ param_list.Clear ();
+ param_list = null;
+ }
+
+ public IEnumerator GetEnumerator ()
+ {
+ return param_list.GetEnumerator ();
+ }
+
+ bool valid = false;
+
+ public bool Validate ()
+ {
+ if (valid)
+ return true;
+
+ if (elem == null)
+ return false;
+
+ for (int i = 0; i < elem.ChildNodes.Count; i++) {
+ XmlElement parm = elem.ChildNodes [i] as XmlElement;
+ if (parm == null || parm.Name != "parameter")
+ continue;
+ Parameter p = new Parameter (parm);
+
+ if (p.IsEllipsis) {
+ Console.Write("Ellipsis parameter ");
+ Clear ();
+ return false;
+ }
+
+ if ((p.CSType == "") || (p.Name == "") ||
+ (p.MarshalType == "") || (SymbolTable.Table.CallByName(p.CType, p.Name) == "")) {
+ Console.Write("Name: " + p.Name + " Type: " + p.CType + " ");
+ Clear ();
+ return false;
+ }
+
+ IGeneratable gen = p.Generatable;
+
+ if (p.IsArray) {
+ p = new ArrayParameter (parm);
+ if (i < elem.ChildNodes.Count - 1) {
+ XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
+ if (next != null || next.Name == "parameter") {
+ Parameter c = new Parameter (next);
+ if (c.IsCount) {
+ p = new ArrayCountPair (parm, next, false);
+ i++;
+ }
+ }
+ }
+ } else if (p.IsCount && i < elem.ChildNodes.Count - 1) {
+ XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
+ if (next != null || next.Name == "parameter") {
+ Parameter a = new Parameter (next);
+ if (a.IsArray) {
+ p = new ArrayCountPair (next, parm, true);
+ i++;
+ }
+ }
+ } else if (p.CType == "GError**")
+ p = new ErrorParameter (parm);
+ else if (gen is StructBase || gen is ByRefGen) {
+ p = new StructParameter (parm);
+ } else if (gen is CallbackGen) {
+ has_cb = true;
+ }
+ param_list.Add (p);
+ }
+
+ if (has_cb && Count > 2 && this [Count - 3].Generatable is CallbackGen && this [Count - 2].IsUserData && this [Count - 1].IsDestroyNotify)
+ this [Count - 3].Scope = "notified";
+
+ valid = true;
+ return true;
+ }
+
+ public bool IsAccessor {
+ get {
+ return VisibleCount == 1 && AccessorParam.PassAs == "out";
+ }
+ }
+
+ public Parameter AccessorParam {
+ get {
+ foreach (Parameter p in this) {
+ if (!IsHidden (p))
+ return p;
+ }
+ return null;
+ }
+ }
+
+ public string AccessorReturnType {
+ get {
+ Parameter p = AccessorParam;
+ if (p != null)
+ return p.CSType;
+ else
+ return null;
+ }
+ }
+
+ public string AccessorName {
+ get {
+ Parameter p = AccessorParam;
+ if (p != null)
+ return p.Name;
+ else
+ return null;
+ }
+ }
+
+ public string ImportSignature {
+ get {
+ if (Count == 0)
+ return String.Empty;
+
+ string[] result = new string [Count];
+ for (int i = 0; i < Count; i++)
+ result [i] = this [i].NativeSignature;
+
+ return String.Join (", ", result);
+ }
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Parser.cs b/lib/gio-sharp/generator/Parser.cs
index 61e3714..5d65890 100644
--- a/lib/gio-sharp/generator/Parser.cs
+++ b/lib/gio-sharp/generator/Parser.cs
@@ -1,170 +1,170 @@
-// GtkSharp.Generation.Parser.cs - The XML Parsing engine.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003 Ximian Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Parser {
-
- private XmlDocument Load (string filename)
- {
- XmlDocument doc = new XmlDocument ();
-
- try {
- Stream stream = File.OpenRead (filename);
- doc.Load (stream);
- stream.Close ();
- } catch (XmlException e) {
- Console.WriteLine ("Invalid XML file.");
- Console.WriteLine (e);
- doc = null;
- }
-
- return doc;
- }
-
- public IGeneratable[] Parse (string filename)
- {
- XmlDocument doc = Load (filename);
- if (doc == null)
- return null;
-
- XmlElement root = doc.DocumentElement;
-
- if ((root == null) || !root.HasChildNodes) {
- Console.WriteLine ("No Namespaces found.");
- return null;
- }
-
- ArrayList gens = new ArrayList ();
-
- foreach (XmlNode child in root.ChildNodes) {
- XmlElement elem = child as XmlElement;
- if (elem == null)
- continue;
-
- switch (child.Name) {
- case "namespace":
- gens.AddRange (ParseNamespace (elem));
- break;
- case "symbol":
- gens.Add (ParseSymbol (elem));
- break;
- default:
- Console.WriteLine ("Parser::Parse - Unexpected child node: " + child.Name);
- break;
- }
- }
-
- return (IGeneratable[]) gens.ToArray (typeof (IGeneratable));
- }
-
- private ArrayList ParseNamespace (XmlElement ns)
- {
- ArrayList result = new ArrayList ();
-
- foreach (XmlNode def in ns.ChildNodes) {
-
- XmlElement elem = def as XmlElement;
- if (elem == null)
- continue;
-
- if (elem.HasAttribute("hidden"))
- continue;
-
- bool is_opaque = false;
- if (elem.GetAttribute ("opaque") == "true" ||
- elem.GetAttribute ("opaque") == "1")
- is_opaque = true;
-
- switch (def.Name) {
- case "alias":
- string aname = elem.GetAttribute("cname");
- string atype = elem.GetAttribute("type");
- if ((aname == "") || (atype == ""))
- continue;
- result.Add (new AliasGen (aname, atype));
- break;
- case "boxed":
- result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new BoxedGen (ns, elem) as object);
- break;
- case "callback":
- result.Add (new CallbackGen (ns, elem));
- break;
- case "enum":
- result.Add (new EnumGen (ns, elem));
- break;
- case "interface":
- result.Add (new InterfaceGen (ns, elem));
- break;
- case "object":
- result.Add (new ObjectGen (ns, elem));
- break;
- case "class":
- result.Add (new ClassGen (ns, elem));
- break;
- case "struct":
- result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new StructGen (ns, elem) as object);
- break;
- default:
- Console.WriteLine ("Parser::ParseNamespace - Unexpected node: " + def.Name);
- break;
- }
- }
-
- return result;
- }
-
- private IGeneratable ParseSymbol (XmlElement symbol)
- {
- string type = symbol.GetAttribute ("type");
- string cname = symbol.GetAttribute ("cname");
- string name = symbol.GetAttribute ("name");
- IGeneratable result = null;
-
- if (type == "simple") {
- if (symbol.HasAttribute ("default_value"))
- result = new SimpleGen (cname, name, symbol.GetAttribute ("default_value"));
- else {
- Console.WriteLine ("Simple type element " + cname + " has no specified default value");
- result = new SimpleGen (cname, name, String.Empty);
- }
- } else if (type == "manual")
- result = new ManualGen (cname, name);
- else if (type == "alias")
- result = new AliasGen (cname, name);
- else if (type == "marshal") {
- string mtype = symbol.GetAttribute ("marshal_type");
- string call = symbol.GetAttribute ("call_fmt");
- string from = symbol.GetAttribute ("from_fmt");
- result = new MarshalGen (cname, name, mtype, call, from);
- } else
- Console.WriteLine ("Parser::ParseSymbol - Unexpected symbol type " + type);
-
- return result;
- }
- }
-}
+// GtkSharp.Generation.Parser.cs - The XML Parsing engine.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003 Ximian Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Parser {
+
+ private XmlDocument Load (string filename)
+ {
+ XmlDocument doc = new XmlDocument ();
+
+ try {
+ Stream stream = File.OpenRead (filename);
+ doc.Load (stream);
+ stream.Close ();
+ } catch (XmlException e) {
+ Console.WriteLine ("Invalid XML file.");
+ Console.WriteLine (e);
+ doc = null;
+ }
+
+ return doc;
+ }
+
+ public IGeneratable[] Parse (string filename)
+ {
+ XmlDocument doc = Load (filename);
+ if (doc == null)
+ return null;
+
+ XmlElement root = doc.DocumentElement;
+
+ if ((root == null) || !root.HasChildNodes) {
+ Console.WriteLine ("No Namespaces found.");
+ return null;
+ }
+
+ ArrayList gens = new ArrayList ();
+
+ foreach (XmlNode child in root.ChildNodes) {
+ XmlElement elem = child as XmlElement;
+ if (elem == null)
+ continue;
+
+ switch (child.Name) {
+ case "namespace":
+ gens.AddRange (ParseNamespace (elem));
+ break;
+ case "symbol":
+ gens.Add (ParseSymbol (elem));
+ break;
+ default:
+ Console.WriteLine ("Parser::Parse - Unexpected child node: " + child.Name);
+ break;
+ }
+ }
+
+ return (IGeneratable[]) gens.ToArray (typeof (IGeneratable));
+ }
+
+ private ArrayList ParseNamespace (XmlElement ns)
+ {
+ ArrayList result = new ArrayList ();
+
+ foreach (XmlNode def in ns.ChildNodes) {
+
+ XmlElement elem = def as XmlElement;
+ if (elem == null)
+ continue;
+
+ if (elem.HasAttribute("hidden"))
+ continue;
+
+ bool is_opaque = false;
+ if (elem.GetAttribute ("opaque") == "true" ||
+ elem.GetAttribute ("opaque") == "1")
+ is_opaque = true;
+
+ switch (def.Name) {
+ case "alias":
+ string aname = elem.GetAttribute("cname");
+ string atype = elem.GetAttribute("type");
+ if ((aname == "") || (atype == ""))
+ continue;
+ result.Add (new AliasGen (aname, atype));
+ break;
+ case "boxed":
+ result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new BoxedGen (ns, elem) as object);
+ break;
+ case "callback":
+ result.Add (new CallbackGen (ns, elem));
+ break;
+ case "enum":
+ result.Add (new EnumGen (ns, elem));
+ break;
+ case "interface":
+ result.Add (new InterfaceGen (ns, elem));
+ break;
+ case "object":
+ result.Add (new ObjectGen (ns, elem));
+ break;
+ case "class":
+ result.Add (new ClassGen (ns, elem));
+ break;
+ case "struct":
+ result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new StructGen (ns, elem) as object);
+ break;
+ default:
+ Console.WriteLine ("Parser::ParseNamespace - Unexpected node: " + def.Name);
+ break;
+ }
+ }
+
+ return result;
+ }
+
+ private IGeneratable ParseSymbol (XmlElement symbol)
+ {
+ string type = symbol.GetAttribute ("type");
+ string cname = symbol.GetAttribute ("cname");
+ string name = symbol.GetAttribute ("name");
+ IGeneratable result = null;
+
+ if (type == "simple") {
+ if (symbol.HasAttribute ("default_value"))
+ result = new SimpleGen (cname, name, symbol.GetAttribute ("default_value"));
+ else {
+ Console.WriteLine ("Simple type element " + cname + " has no specified default value");
+ result = new SimpleGen (cname, name, String.Empty);
+ }
+ } else if (type == "manual")
+ result = new ManualGen (cname, name);
+ else if (type == "alias")
+ result = new AliasGen (cname, name);
+ else if (type == "marshal") {
+ string mtype = symbol.GetAttribute ("marshal_type");
+ string call = symbol.GetAttribute ("call_fmt");
+ string from = symbol.GetAttribute ("from_fmt");
+ result = new MarshalGen (cname, name, mtype, call, from);
+ } else
+ Console.WriteLine ("Parser::ParseSymbol - Unexpected symbol type " + type);
+
+ return result;
+ }
+ }
+}
diff --git a/lib/gio-sharp/generator/Property.cs b/lib/gio-sharp/generator/Property.cs
index fbf940b..6920e3c 100644
--- a/lib/gio-sharp/generator/Property.cs
+++ b/lib/gio-sharp/generator/Property.cs
@@ -1,193 +1,193 @@
-// GtkSharp.Generation.Property.cs - The Property Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Property : PropertyBase {
-
- public Property (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
-
- public bool Validate ()
- {
- if (CSType == "" && !Hidden) {
- Console.Write("Property has unknown Type {0} ", CType);
- Statistics.ThrottledCount++;
- return false;
- }
-
- return true;
- }
-
- bool Readable {
- get {
- return elem.GetAttribute ("readable") == "true";
- }
- }
-
- bool Writable {
- get {
- return elem.GetAttribute ("writeable") == "true" &&
- !elem.HasAttribute ("construct-only");
- }
- }
-
- bool IsDeprecated {
- get {
- return !container_type.IsDeprecated &&
- (elem.GetAttribute ("deprecated") == "1" ||
- elem.GetAttribute ("deprecated") == "true");
- }
- }
-
- protected virtual string PropertyAttribute (string qpname) {
- return "[GLib.Property (" + qpname + ")]";
- }
-
- protected virtual string RawGetter (string qpname) {
- return "GetProperty (" + qpname + ")";
- }
-
- protected virtual string RawSetter (string qpname) {
- return "SetProperty(" + qpname + ", val)";
- }
-
- public void GenerateDecl (StreamWriter sw, string indent)
- {
- if (Hidden || (!Readable && !Writable))
- return;
-
- string name = Name;
- if (name == container_type.Name)
- name += "Prop";
-
- sw.WriteLine (indent + CSType + " " + name + " {");
- sw.Write (indent + "\t");
- if (Readable || Getter != null)
- sw.Write ("get; ");
- if (Writable || Setter != null)
- sw.Write ("set;");
- sw.WriteLine ();
- sw.WriteLine (indent + "}");
- }
-
- public void Generate (GenerationInfo gen_info, string indent, ClassBase implementor)
- {
- SymbolTable table = SymbolTable.Table;
- StreamWriter sw = gen_info.Writer;
-
- if (Hidden || (!Readable && !Writable))
- return;
-
- string modifiers = "";
-
- if (IsNew || (container_type.Parent != null && container_type.Parent.GetPropertyRecursively (Name) != null))
- modifiers = "new ";
- else if (implementor != null && implementor.Parent != null && implementor.Parent.GetPropertyRecursively (Name) != null)
- modifiers = "new ";
-
- string name = Name;
- if (name == container_type.Name) {
- name += "Prop";
- }
- string qpname = "\"" + CName + "\"";
-
- string v_type = "";
- if (table.IsInterface (CType)) {
- v_type = "(GLib.Object)";
- } else if (table.IsOpaque (CType)) {
- v_type = "(GLib.Opaque)";
- } else if (table.IsEnum (CType)) {
- v_type = "(Enum)";
- }
-
- GenerateImports (gen_info, indent);
-
- if (IsDeprecated ||
- (Getter != null && Getter.IsDeprecated) ||
- (Setter != null && Setter.IsDeprecated))
- sw.WriteLine (indent + "[Obsolete]");
- sw.WriteLine (indent + PropertyAttribute (qpname));
- sw.WriteLine (indent + "public " + modifiers + CSType + " " + name + " {");
- indent += "\t";
-
- if (Getter != null) {
- sw.Write(indent + "get ");
- Getter.GenerateBody(gen_info, implementor, "\t");
- sw.WriteLine();
- } else if (Readable) {
- sw.WriteLine(indent + "get {");
- sw.WriteLine(indent + "\tGLib.Value val = " + RawGetter (qpname) + ";");
- if (table.IsOpaque (CType) || table.IsBoxed (CType)) {
- sw.WriteLine(indent + "\t" + CSType + " ret = (" + CSType + ") val;");
- } else if (table.IsInterface (CType)) {
- // Do we have to dispose the GLib.Object from the GLib.Value?
- sw.WriteLine (indent + "\t{0} ret = {0}Adapter.GetObject ((GLib.Object) val);", CSType);
- } else {
- sw.Write(indent + "\t" + CSType + " ret = ");
- sw.Write ("(" + CSType + ") ");
- if (v_type != "") {
- sw.Write(v_type + " ");
- }
- sw.WriteLine("val;");
- }
-
- sw.WriteLine(indent + "\tval.Dispose ();");
- sw.WriteLine(indent + "\treturn ret;");
- sw.WriteLine(indent + "}");
- }
-
- if (Setter != null) {
- sw.Write(indent + "set ");
- Setter.GenerateBody(gen_info, implementor, "\t");
- sw.WriteLine();
- } else if (Writable) {
- sw.WriteLine(indent + "set {");
- sw.Write(indent + "\tGLib.Value val = ");
- if (table.IsBoxed (CType)) {
- sw.WriteLine("(GLib.Value) value;");
- } else if (table.IsOpaque (CType)) {
- sw.WriteLine("new GLib.Value(value, \"{0}\");", CType);
- } else {
- sw.Write("new GLib.Value(");
- if (v_type != "" && !(table.IsObject (CType) || table.IsInterface (CType) || table.IsOpaque (CType))) {
- sw.Write(v_type + " ");
- }
- sw.WriteLine("value);");
- }
- sw.WriteLine(indent + "\t" + RawSetter (qpname) + ";");
- sw.WriteLine(indent + "\tval.Dispose ();");
- sw.WriteLine(indent + "}");
- }
-
- sw.WriteLine(indent.Substring (1) + "}");
- sw.WriteLine();
-
- Statistics.PropCount++;
- }
- }
-}
-
+// GtkSharp.Generation.Property.cs - The Property Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Property : PropertyBase {
+
+ public Property (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
+
+ public bool Validate ()
+ {
+ if (CSType == "" && !Hidden) {
+ Console.Write("Property has unknown Type {0} ", CType);
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ return true;
+ }
+
+ bool Readable {
+ get {
+ return elem.GetAttribute ("readable") == "true";
+ }
+ }
+
+ bool Writable {
+ get {
+ return elem.GetAttribute ("writeable") == "true" &&
+ !elem.HasAttribute ("construct-only");
+ }
+ }
+
+ bool IsDeprecated {
+ get {
+ return !container_type.IsDeprecated &&
+ (elem.GetAttribute ("deprecated") == "1" ||
+ elem.GetAttribute ("deprecated") == "true");
+ }
+ }
+
+ protected virtual string PropertyAttribute (string qpname) {
+ return "[GLib.Property (" + qpname + ")]";
+ }
+
+ protected virtual string RawGetter (string qpname) {
+ return "GetProperty (" + qpname + ")";
+ }
+
+ protected virtual string RawSetter (string qpname) {
+ return "SetProperty(" + qpname + ", val)";
+ }
+
+ public void GenerateDecl (StreamWriter sw, string indent)
+ {
+ if (Hidden || (!Readable && !Writable))
+ return;
+
+ string name = Name;
+ if (name == container_type.Name)
+ name += "Prop";
+
+ sw.WriteLine (indent + CSType + " " + name + " {");
+ sw.Write (indent + "\t");
+ if (Readable || Getter != null)
+ sw.Write ("get; ");
+ if (Writable || Setter != null)
+ sw.Write ("set;");
+ sw.WriteLine ();
+ sw.WriteLine (indent + "}");
+ }
+
+ public void Generate (GenerationInfo gen_info, string indent, ClassBase implementor)
+ {
+ SymbolTable table = SymbolTable.Table;
+ StreamWriter sw = gen_info.Writer;
+
+ if (Hidden || (!Readable && !Writable))
+ return;
+
+ string modifiers = "";
+
+ if (IsNew || (container_type.Parent != null && container_type.Parent.GetPropertyRecursively (Name) != null))
+ modifiers = "new ";
+ else if (implementor != null && implementor.Parent != null && implementor.Parent.GetPropertyRecursively (Name) != null)
+ modifiers = "new ";
+
+ string name = Name;
+ if (name == container_type.Name) {
+ name += "Prop";
+ }
+ string qpname = "\"" + CName + "\"";
+
+ string v_type = "";
+ if (table.IsInterface (CType)) {
+ v_type = "(GLib.Object)";
+ } else if (table.IsOpaque (CType)) {
+ v_type = "(GLib.Opaque)";
+ } else if (table.IsEnum (CType)) {
+ v_type = "(Enum)";
+ }
+
+ GenerateImports (gen_info, indent);
+
+ if (IsDeprecated ||
+ (Getter != null && Getter.IsDeprecated) ||
+ (Setter != null && Setter.IsDeprecated))
+ sw.WriteLine (indent + "[Obsolete]");
+ sw.WriteLine (indent + PropertyAttribute (qpname));
+ sw.WriteLine (indent + "public " + modifiers + CSType + " " + name + " {");
+ indent += "\t";
+
+ if (Getter != null) {
+ sw.Write(indent + "get ");
+ Getter.GenerateBody(gen_info, implementor, "\t");
+ sw.WriteLine();
+ } else if (Readable) {
+ sw.WriteLine(indent + "get {");
+ sw.WriteLine(indent + "\tGLib.Value val = " + RawGetter (qpname) + ";");
+ if (table.IsOpaque (CType) || table.IsBoxed (CType)) {
+ sw.WriteLine(indent + "\t" + CSType + " ret = (" + CSType + ") val;");
+ } else if (table.IsInterface (CType)) {
+ // Do we have to dispose the GLib.Object from the GLib.Value?
+ sw.WriteLine (indent + "\t{0} ret = {0}Adapter.GetObject ((GLib.Object) val);", CSType);
+ } else {
+ sw.Write(indent + "\t" + CSType + " ret = ");
+ sw.Write ("(" + CSType + ") ");
+ if (v_type != "") {
+ sw.Write(v_type + " ");
+ }
+ sw.WriteLine("val;");
+ }
+
+ sw.WriteLine(indent + "\tval.Dispose ();");
+ sw.WriteLine(indent + "\treturn ret;");
+ sw.WriteLine(indent + "}");
+ }
+
+ if (Setter != null) {
+ sw.Write(indent + "set ");
+ Setter.GenerateBody(gen_info, implementor, "\t");
+ sw.WriteLine();
+ } else if (Writable) {
+ sw.WriteLine(indent + "set {");
+ sw.Write(indent + "\tGLib.Value val = ");
+ if (table.IsBoxed (CType)) {
+ sw.WriteLine("(GLib.Value) value;");
+ } else if (table.IsOpaque (CType)) {
+ sw.WriteLine("new GLib.Value(value, \"{0}\");", CType);
+ } else {
+ sw.Write("new GLib.Value(");
+ if (v_type != "" && !(table.IsObject (CType) || table.IsInterface (CType) || table.IsOpaque (CType))) {
+ sw.Write(v_type + " ");
+ }
+ sw.WriteLine("value);");
+ }
+ sw.WriteLine(indent + "\t" + RawSetter (qpname) + ";");
+ sw.WriteLine(indent + "\tval.Dispose ();");
+ sw.WriteLine(indent + "}");
+ }
+
+ sw.WriteLine(indent.Substring (1) + "}");
+ sw.WriteLine();
+
+ Statistics.PropCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/ReturnValue.cs b/lib/gio-sharp/generator/ReturnValue.cs
index 4ace994..dce6a6c 100644
--- a/lib/gio-sharp/generator/ReturnValue.cs
+++ b/lib/gio-sharp/generator/ReturnValue.cs
@@ -1,170 +1,170 @@
-// GtkSharp.Generation.ReturnValue.cs - The ReturnValue Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004-2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Xml;
-
- public class ReturnValue {
-
-
- bool is_null_term;
- bool is_array;
- bool elements_owned;
- bool owned;
- string ctype = String.Empty;
- string element_ctype = String.Empty;
-
- public ReturnValue (XmlElement elem)
- {
- if (elem != null) {
- is_null_term = elem.HasAttribute ("null_term_array");
- is_array = elem.HasAttribute ("array");
- elements_owned = elem.GetAttribute ("elements_owned") == "true";
- owned = elem.GetAttribute ("owned") == "true";
- ctype = elem.GetAttribute("type");
- element_ctype = elem.GetAttribute ("element_type");
- }
- }
-
- public string CType {
- get {
- return ctype;
- }
- }
-
- public string CSType {
- get {
- if (IGen == null)
- return String.Empty;
-
- if (ElementType != String.Empty)
- return ElementType + "[]";
-
- return IGen.QualifiedName + (is_array || is_null_term ? "[]" : String.Empty);
- }
- }
-
- public string DefaultValue {
- get {
- if (IGen == null)
- return String.Empty;
- return IGen.DefaultValue;
- }
- }
-
- string ElementType {
- get {
- if (element_ctype.Length > 0)
- return SymbolTable.Table.GetCSType (element_ctype);
-
- return String.Empty;
- }
- }
-
- IGeneratable igen;
- IGeneratable IGen {
- get {
- if (igen == null)
- igen = SymbolTable.Table [CType];
- return igen;
- }
- }
-
- public bool IsVoid {
- get {
- return CSType == "void";
- }
- }
-
- public string MarshalType {
- get {
- if (IGen == null)
- return String.Empty;
- else if (is_null_term)
- return "IntPtr";
- return IGen.MarshalReturnType + (is_array ? "[]" : String.Empty);
- }
- }
-
- public string ToNativeType {
- get {
- if (IGen == null)
- return String.Empty;
- else if (is_null_term)
- return "IntPtr"; //FIXME
- return IGen.ToNativeReturnType + (is_array ? "[]" : String.Empty);
- }
- }
-
- public string FromNative (string var)
- {
- if (IGen == null)
- return String.Empty;
-
- if (ElementType != String.Empty) {
- string args = (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
- if (IGen.QualifiedName == "GLib.PtrArray")
- return String.Format ("({0}[]) GLib.Marshaller.PtrArrayToArray ({1}, {2}, typeof({0}))", ElementType, var, args);
- else
- return String.Format ("({0}[]) GLib.Marshaller.ListPtrToArray ({1}, typeof({2}), {3}, typeof({0}))", ElementType, var, IGen.QualifiedName, args);
- } else if (IGen is HandleBase)
- return ((HandleBase)IGen).FromNative (var, owned);
- else if (is_null_term)
- return String.Format ("GLib.Marshaller.NullTermPtrToStringArray ({0}, {1})", var, owned ? "true" : "false");
- else
- return IGen.FromNativeReturn (var);
- }
-
- public string ToNative (string var)
- {
- if (IGen == null)
- return String.Empty;
-
- if (ElementType.Length > 0) {
- string args = ", typeof (" + ElementType + "), " + (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
- var = "new " + IGen.QualifiedName + "(" + var + args + ")";
- } else if (is_null_term)
- return String.Format ("GLib.Marshaller.StringArrayToNullTermPtr ({0})", var);
-
- if (IGen is IManualMarshaler)
- return (IGen as IManualMarshaler).AllocNative (var);
- else if (IGen is ObjectGen && owned)
- return var + " == null ? IntPtr.Zero : " + var + ".OwnedHandle";
- else if (IGen is OpaqueGen && owned)
- return var + " == null ? IntPtr.Zero : " + var + ".OwnedCopy";
- else
- return IGen.ToNativeReturn (var);
- }
-
- public bool Validate ()
- {
- if (MarshalType == "" || CSType == "") {
- Console.Write("rettype: " + CType);
- return false;
- }
-
- return true;
- }
- }
-}
-
+// GtkSharp.Generation.ReturnValue.cs - The ReturnValue Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Xml;
+
+ public class ReturnValue {
+
+
+ bool is_null_term;
+ bool is_array;
+ bool elements_owned;
+ bool owned;
+ string ctype = String.Empty;
+ string element_ctype = String.Empty;
+
+ public ReturnValue (XmlElement elem)
+ {
+ if (elem != null) {
+ is_null_term = elem.HasAttribute ("null_term_array");
+ is_array = elem.HasAttribute ("array");
+ elements_owned = elem.GetAttribute ("elements_owned") == "true";
+ owned = elem.GetAttribute ("owned") == "true";
+ ctype = elem.GetAttribute("type");
+ element_ctype = elem.GetAttribute ("element_type");
+ }
+ }
+
+ public string CType {
+ get {
+ return ctype;
+ }
+ }
+
+ public string CSType {
+ get {
+ if (IGen == null)
+ return String.Empty;
+
+ if (ElementType != String.Empty)
+ return ElementType + "[]";
+
+ return IGen.QualifiedName + (is_array || is_null_term ? "[]" : String.Empty);
+ }
+ }
+
+ public string DefaultValue {
+ get {
+ if (IGen == null)
+ return String.Empty;
+ return IGen.DefaultValue;
+ }
+ }
+
+ string ElementType {
+ get {
+ if (element_ctype.Length > 0)
+ return SymbolTable.Table.GetCSType (element_ctype);
+
+ return String.Empty;
+ }
+ }
+
+ IGeneratable igen;
+ IGeneratable IGen {
+ get {
+ if (igen == null)
+ igen = SymbolTable.Table [CType];
+ return igen;
+ }
+ }
+
+ public bool IsVoid {
+ get {
+ return CSType == "void";
+ }
+ }
+
+ public string MarshalType {
+ get {
+ if (IGen == null)
+ return String.Empty;
+ else if (is_null_term)
+ return "IntPtr";
+ return IGen.MarshalReturnType + (is_array ? "[]" : String.Empty);
+ }
+ }
+
+ public string ToNativeType {
+ get {
+ if (IGen == null)
+ return String.Empty;
+ else if (is_null_term)
+ return "IntPtr"; //FIXME
+ return IGen.ToNativeReturnType + (is_array ? "[]" : String.Empty);
+ }
+ }
+
+ public string FromNative (string var)
+ {
+ if (IGen == null)
+ return String.Empty;
+
+ if (ElementType != String.Empty) {
+ string args = (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
+ if (IGen.QualifiedName == "GLib.PtrArray")
+ return String.Format ("({0}[]) GLib.Marshaller.PtrArrayToArray ({1}, {2}, typeof({0}))", ElementType, var, args);
+ else
+ return String.Format ("({0}[]) GLib.Marshaller.ListPtrToArray ({1}, typeof({2}), {3}, typeof({0}))", ElementType, var, IGen.QualifiedName, args);
+ } else if (IGen is HandleBase)
+ return ((HandleBase)IGen).FromNative (var, owned);
+ else if (is_null_term)
+ return String.Format ("GLib.Marshaller.NullTermPtrToStringArray ({0}, {1})", var, owned ? "true" : "false");
+ else
+ return IGen.FromNativeReturn (var);
+ }
+
+ public string ToNative (string var)
+ {
+ if (IGen == null)
+ return String.Empty;
+
+ if (ElementType.Length > 0) {
+ string args = ", typeof (" + ElementType + "), " + (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
+ var = "new " + IGen.QualifiedName + "(" + var + args + ")";
+ } else if (is_null_term)
+ return String.Format ("GLib.Marshaller.StringArrayToNullTermPtr ({0})", var);
+
+ if (IGen is IManualMarshaler)
+ return (IGen as IManualMarshaler).AllocNative (var);
+ else if (IGen is ObjectGen && owned)
+ return var + " == null ? IntPtr.Zero : " + var + ".OwnedHandle";
+ else if (IGen is OpaqueGen && owned)
+ return var + " == null ? IntPtr.Zero : " + var + ".OwnedCopy";
+ else
+ return IGen.ToNativeReturn (var);
+ }
+
+ public bool Validate ()
+ {
+ if (MarshalType == "" || CSType == "") {
+ Console.Write("rettype: " + CType);
+ return false;
+ }
+
+ return true;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Signal.cs b/lib/gio-sharp/generator/Signal.cs
index c51c109..65c2087 100644
--- a/lib/gio-sharp/generator/Signal.cs
+++ b/lib/gio-sharp/generator/Signal.cs
@@ -1,587 +1,587 @@
-// GtkSharp.Generation.Signal.cs - The Signal Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2005 Novell, Inc.
-// Copyright (c) 2007 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Signal {
-
- bool marshaled;
- string name;
- XmlElement elem;
- ReturnValue retval;
- Parameters parms;
- ClassBase container_type;
-
- public Signal (XmlElement elem, ClassBase container_type)
- {
- this.elem = elem;
- name = elem.GetAttribute ("name");
- marshaled = elem.GetAttribute ("manual") == "true";
- retval = new ReturnValue (elem ["return-type"]);
- parms = new Parameters (elem["parameters"]);
- this.container_type = container_type;
- }
-
- bool Marshaled {
- get { return marshaled; }
- }
-
- public string Name {
- get {
- return name;
- }
- set {
- name = value;
- }
- }
-
- public bool Validate ()
- {
- if (Name == "") {
- Console.Write ("Nameless signal ");
- Statistics.ThrottledCount++;
- return false;
- }
-
- if (!parms.Validate () || !retval.Validate ()) {
- Console.Write (" in signal " + Name + " ");
- Statistics.ThrottledCount++;
- return false;
- }
-
- return true;
- }
-
- public void GenerateDecl (StreamWriter sw)
- {
- if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null))
- sw.Write("new ");
-
- sw.WriteLine ("\t\tevent " + EventHandlerQualifiedName + " " + Name + ";");
- }
-
- public string CName {
- get {
- return "\"" + elem.GetAttribute("cname") + "\"";
- }
- }
-
- string CallbackSig {
- get {
- string result = "";
- for (int i = 0; i < parms.Count; i++) {
- if (i > 0)
- result += ", ";
-
- Parameter p = parms [i];
- if (p.PassAs != "" && !(p.Generatable is StructBase))
- result += p.PassAs + " ";
- result += (p.MarshalType + " arg" + i);
- }
-
- return result;
- }
- }
-
- string CallbackName {
- get { return Name + "SignalCallback"; }
- }
-
- string DelegateName {
- get { return Name + "SignalDelegate"; }
- }
-
- private string EventArgsName {
- get {
- if (IsEventHandler)
- return "EventArgs";
- else
- return Name + "Args";
- }
- }
-
- private string EventArgsQualifiedName {
- get {
- if (IsEventHandler)
- return "System.EventArgs";
- else
- return container_type.NS + "." + Name + "Args";
- }
- }
-
- private string EventHandlerName {
- get {
- if (IsEventHandler)
- return "EventHandler";
- else if (SymbolTable.Table [container_type.NS + Name + "Handler"] != null)
- return Name + "EventHandler";
- else
- return Name + "Handler";
- }
- }
-
- private string EventHandlerQualifiedName {
- get {
- if (IsEventHandler)
- return "System.EventHandler";
- else
- return container_type.NS + "." + EventHandlerName;
- }
- }
-
- string ClassFieldName {
- get {
- return elem.HasAttribute ("field_name") ? elem.GetAttribute("field_name") : String.Empty;
- }
- }
-
- private bool HasOutParams {
- get {
- foreach (Parameter p in parms) {
- if (p.PassAs == "out")
- return true;
- }
- return false;
- }
- }
-
- private bool IsEventHandler {
- get {
- return retval.CSType == "void" && parms.Count == 1 && (parms [0].Generatable is ObjectGen || parms [0].Generatable is InterfaceGen);
- }
- }
-
- private bool IsVoid {
- get {
- return retval.CSType == "void";
- }
- }
-
- private string ReturnGType {
- get {
- IGeneratable igen = SymbolTable.Table [retval.CType];
-
- if (igen is ObjectGen)
- return "GLib.GType.Object";
- if (igen is BoxedGen)
- return retval.CSType + ".GType";
- if (igen is EnumGen)
- return retval.CSType + "GType.GType";
-
- switch (retval.CSType) {
- case "bool":
- return "GLib.GType.Boolean";
- case "string":
- return "GLib.GType.String";
- case "int":
- return "GLib.GType.Int";
- default:
- throw new Exception (retval.CSType);
- }
- }
- }
-
- public string GenArgsInitialization (StreamWriter sw)
- {
- if (parms.Count > 1)
- sw.WriteLine("\t\t\t\targs.Args = new object[" + (parms.Count - 1) + "];");
- string finish = "";
- for (int idx = 1; idx < parms.Count; idx++) {
- Parameter p = parms [idx];
- IGeneratable igen = p.Generatable;
- if (p.PassAs != "out") {
- if (igen is ManualGen) {
- sw.WriteLine("\t\t\t\tif (arg{0} == IntPtr.Zero)", idx);
- sw.WriteLine("\t\t\t\t\targs.Args[{0}] = null;", idx - 1);
- sw.WriteLine("\t\t\t\telse {");
- sw.WriteLine("\t\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
- sw.WriteLine("\t\t\t\t}");
- } else
- sw.WriteLine("\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
- }
- if (igen is StructBase && p.PassAs == "ref")
- finish += "\t\t\t\tif (arg" + idx + " != IntPtr.Zero) System.Runtime.InteropServices.Marshal.StructureToPtr (args.Args[" + (idx-1) + "], arg" + idx + ", false);\n";
- else if (p.PassAs != "")
- finish += "\t\t\t\targ" + idx + " = " + igen.ToNativeReturn ("((" + p.CSType + ")args.Args[" + (idx - 1) + "])") + ";\n";
- }
- return finish;
- }
-
- public void GenArgsCleanup (StreamWriter sw, string finish)
- {
- if (IsVoid && finish.Length == 0)
- return;
-
- sw.WriteLine("\n\t\t\ttry {");
- sw.Write (finish);
- if (!IsVoid) {
- if (retval.CSType == "bool") {
- sw.WriteLine ("\t\t\t\tif (args.RetVal == null)");
- sw.WriteLine ("\t\t\t\t\treturn false;");
- }
- sw.WriteLine("\t\t\t\treturn " + SymbolTable.Table.ToNativeReturn (retval.CType, "((" + retval.CSType + ")args.RetVal)") + ";");
- }
- sw.WriteLine("\t\t\t} catch (Exception) {");
- sw.WriteLine ("\t\t\t\tException ex = new Exception (\"args.RetVal or 'out' property unset or set to incorrect type in " + EventHandlerQualifiedName + " callback\");");
- sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (ex, true);");
-
- sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return.");
- sw.WriteLine ("\t\t\t\tthrow ex;");
- sw.WriteLine("\t\t\t}");
- }
-
- public void GenCallback (StreamWriter sw)
- {
- if (IsEventHandler)
- return;
-
- sw.WriteLine ("\t\t[GLib.CDeclCallback]");
- sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ", IntPtr gch);");
- sw.WriteLine ();
- sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ", IntPtr gch)");
- sw.WriteLine("\t\t{");
- sw.WriteLine("\t\t\t{0} args = new {0} ();", EventArgsQualifiedName);
- sw.WriteLine("\t\t\ttry {");
- sw.WriteLine("\t\t\t\tGLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;");
- sw.WriteLine("\t\t\t\tif (sig == null)");
- sw.WriteLine("\t\t\t\t\tthrow new Exception(\"Unknown signal GC handle received \" + gch);");
- sw.WriteLine();
- string finish = GenArgsInitialization (sw);
- sw.WriteLine("\t\t\t\t{0} handler = ({0}) sig.Handler;", EventHandlerQualifiedName);
- sw.WriteLine("\t\t\t\thandler (GLib.Object.GetObject (arg0), args);");
- sw.WriteLine("\t\t\t} catch (Exception e) {");
- sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, false);");
- sw.WriteLine("\t\t\t}");
- GenArgsCleanup (sw, finish);
- sw.WriteLine("\t\t}");
- sw.WriteLine();
- }
-
- private bool NeedNew (ClassBase implementor)
- {
- return elem.HasAttribute ("new_flag") ||
- (container_type != null && container_type.GetSignalRecursively (Name) != null) ||
- (implementor != null && implementor.GetSignalRecursively (Name) != null);
- }
-
- public void GenEventHandler (GenerationInfo gen_info)
- {
- if (IsEventHandler)
- return;
-
- string ns = container_type.NS;
-
- StreamWriter sw = gen_info.OpenStream (EventHandlerName);
-
- sw.WriteLine ("namespace " + ns + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
-
- sw.WriteLine ();
- sw.WriteLine ("\tpublic delegate void " + EventHandlerName + "(object o, " + EventArgsName + " args);");
- sw.WriteLine ();
- sw.WriteLine ("\tpublic class " + EventArgsName + " : GLib.SignalArgs {");
- for (int i = 1; i < parms.Count; i++) {
- sw.WriteLine ("\t\tpublic " + parms[i].CSType + " " + parms[i].StudlyName + "{");
- if (parms[i].PassAs != "out") {
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn (" + parms[i].CSType + ") Args[" + (i - 1) + "];");
- sw.WriteLine ("\t\t\t}");
- }
- if (parms[i].PassAs != "") {
- sw.WriteLine ("\t\t\tset {");
- sw.WriteLine ("\t\t\t\tArgs[" + (i - 1) + "] = (" + parms[i].CSType + ")value;");
- sw.WriteLine ("\t\t\t}");
- }
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- }
-
- private void GenVMDeclaration (StreamWriter sw, ClassBase implementor)
- {
- VMSignature vmsig = new VMSignature (parms);
- sw.WriteLine ("\t\t[GLib.DefaultSignalHandler(Type=typeof(" + (implementor != null ? implementor.QualifiedName : container_type.QualifiedName) + "), ConnectionMethod=\"Override" + Name +"\")]");
- sw.Write ("\t\tprotected ");
- if (NeedNew (implementor))
- sw.Write ("new ");
- sw.WriteLine ("virtual {0} {1} ({2})", retval.CSType, "On" + Name, vmsig.ToString ());
- }
-
- private string CastFromInt (string type)
- {
- return type != "int" ? "(" + type + ") " : "";
- }
-
- private string GlueCallString {
- get {
- string result = "Handle";
-
- for (int i = 1; i < parms.Count; i++) {
- Parameter p = parms [i];
- IGeneratable igen = p.Generatable;
-
- if (i > 1 && parms [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
- string string_name = parms [i - 1].Name;
- result += ", " + igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
- continue;
- }
-
- p.CallName = p.Name;
- string call_parm = p.CallString;
-
- if (p.IsUserData && parms.IsHidden (p) && !parms.HideData && (i == 1 || parms [i - 1].Scope != "notified")) {
- call_parm = "IntPtr.Zero";
- }
-
- result += ", " + call_parm;
- }
- return result;
- }
- }
-
- private string GlueSignature {
- get {
- string result = String.Empty;
- for (int i = 0; i < parms.Count; i++)
- result += parms[i].CType.Replace ("const-", "const ") + " " + parms[i].Name + (i == parms.Count-1 ? "" : ", ");
- return result;
- }
- }
-
- private string DefaultGlueValue {
- get {
- string val = retval.DefaultValue;
- switch (val) {
- case "null":
- return "NULL";
- case "false":
- return "FALSE";
- case "true":
- return "TRUE";
- default:
- return val;
- }
- }
- }
-
- private void GenGlueVirtualMethod (GenerationInfo gen_info)
- {
- StreamWriter glue = gen_info.GlueWriter;
- string glue_name = String.Format ("{0}sharp_{1}_base_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
- glue.WriteLine ("{0} {1} ({2});\n", retval.CType, glue_name, GlueSignature);
- glue.WriteLine ("{0}\n{1} ({2})", retval.CType, glue_name, GlueSignature);
- glue.WriteLine ("{");
- glue.WriteLine ("\t{0}Class *klass = ({0}Class *) get_threshold_class (G_OBJECT ({1}));", container_type.CName, parms[0].Name);
- glue.Write ("\tif (klass->{0})\n\t\t", ClassFieldName);
- if (!IsVoid)
- glue.Write ("return ");
- glue.Write ("(* klass->{0}) (", ClassFieldName);
- for (int i = 0; i < parms.Count; i++)
- glue.Write (parms[i].Name + (i == parms.Count - 1 ? "" : ", "));
- glue.WriteLine (");");
- if (!IsVoid)
- glue.WriteLine ("\treturn " + DefaultGlueValue + ";");
- glue.WriteLine ("}");
-
- StreamWriter sw = gen_info.Writer;
- sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
- sw.WriteLine ("\t\tstatic extern {0} {1} ({2});\n", retval.MarshalType, glue_name, parms.ImportSignature);
- GenVMDeclaration (sw, null);
- sw.WriteLine ("\t\t{");
- MethodBody body = new MethodBody (parms);
- body.Initialize (gen_info, false, false, String.Empty);
- sw.WriteLine ("\t\t\t{0}{1} ({2});", IsVoid ? "" : retval.MarshalType + " __ret = ", glue_name, GlueCallString);
- body.Finish (sw, "");
- if (!IsVoid)
- sw.WriteLine ("\t\t\treturn {0};", retval.FromNative ("__ret"));
- sw.WriteLine ("\t\t}\n");
- }
-
- private void GenChainVirtualMethod (StreamWriter sw, ClassBase implementor)
- {
- GenVMDeclaration (sw, implementor);
- sw.WriteLine ("\t\t{");
- if (IsVoid)
- sw.WriteLine ("\t\t\tGLib.Value ret = GLib.Value.Empty;");
- else
- sw.WriteLine ("\t\t\tGLib.Value ret = new GLib.Value (" + ReturnGType + ");");
-
- sw.WriteLine ("\t\t\tGLib.ValueArray inst_and_params = new GLib.ValueArray (" + parms.Count + ");");
- sw.WriteLine ("\t\t\tGLib.Value[] vals = new GLib.Value [" + parms.Count + "];");
- sw.WriteLine ("\t\t\tvals [0] = new GLib.Value (this);");
- sw.WriteLine ("\t\t\tinst_and_params.Append (vals [0]);");
- string cleanup = "";
- for (int i = 1; i < parms.Count; i++) {
- Parameter p = parms [i];
- if (p.PassAs != "") {
- if (SymbolTable.Table.IsBoxed (p.CType)) {
- if (p.PassAs == "ref")
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
- else
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value ((GLib.GType)typeof (" + p.CSType + "));");
- cleanup += "\t\t\t" + p.Name + " = (" + p.CSType + ") vals [" + i + "];\n";
- } else {
- if (p.PassAs == "ref")
- sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = GLib.Marshaller.StructureToPtrAlloc (" + p.Generatable.CallByName (p.Name) + ");");
- else
- sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + p.MarshalType + ")));");
-
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + "_ptr);");
- cleanup += "\t\t\t" + p.Name + " = " + p.FromNative ("(" + p.MarshalType + ") Marshal.PtrToStructure (" + p.Name + "_ptr, typeof (" + p.MarshalType + "))") + ";\n";
- cleanup += "\t\t\tMarshal.FreeHGlobal (" + p.Name + "_ptr);\n";
- }
- } else if (p.IsLength && parms [i - 1].IsString)
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (System.Text.Encoding.UTF8.GetByteCount (" + parms [i-1].Name + "));");
- else
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
-
- sw.WriteLine ("\t\t\tinst_and_params.Append (vals [" + i + "]);");
- }
-
- sw.WriteLine ("\t\t\tg_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);");
- if (cleanup != "")
- sw.WriteLine (cleanup);
- sw.WriteLine ("\t\t\tforeach (GLib.Value v in vals)");
- sw.WriteLine ("\t\t\t\tv.Dispose ();");
- if (!IsVoid) {
- IGeneratable igen = SymbolTable.Table [retval.CType];
- sw.WriteLine ("\t\t\t" + retval.CSType + " result = (" + (igen is EnumGen ? retval.CSType + ") (Enum" : retval.CSType) + ") ret;");
- sw.WriteLine ("\t\t\tret.Dispose ();");
- sw.WriteLine ("\t\t\treturn result;");
- }
- sw.WriteLine ("\t\t}\n");
- }
-
- private void GenDefaultHandlerDelegate (GenerationInfo gen_info, ClassBase implementor)
- {
- StreamWriter sw = gen_info.Writer;
- StreamWriter glue;
- bool use_glue = gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0;
- string glue_name = String.Empty;
- ManagedCallString call = new ManagedCallString (parms, true);
- sw.WriteLine ("\t\t[GLib.CDeclCallback]");
- sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "VMDelegate (" + parms.ImportSignature + ");\n");
-
- if (use_glue) {
- glue = gen_info.GlueWriter;
- glue_name = String.Format ("{0}sharp_{1}_override_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
- sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
- sw.WriteLine ("\t\tstatic extern void {0} (IntPtr gtype, {1}VMDelegate cb);\n", glue_name, Name);
- glue.WriteLine ("void {0} (GType gtype, gpointer cb);\n", glue_name);
- glue.WriteLine ("void\n{0} (GType gtype, gpointer cb)", glue_name);
- glue.WriteLine ("{");
- glue.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
- glue.WriteLine ("\tif (klass == NULL)");
- glue.WriteLine ("\t\tklass = g_type_class_ref (gtype);");
- glue.WriteLine ("\t(({0} *)klass)->{1} = cb;", container_type.CName + "Class", ClassFieldName);
- glue.WriteLine ("}\n");
- }
-
- sw.WriteLine ("\t\tstatic {0} {1};\n", Name + "VMDelegate", Name + "VMCallback");
- sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + Name.ToLower() + "_cb (" + parms.ImportSignature + ")");
- sw.WriteLine ("\t\t{");
- string unconditional = call.Unconditional ("\t\t\t");
- if (unconditional.Length > 0)
- sw.WriteLine (unconditional);
- sw.WriteLine ("\t\t\ttry {");
- sw.WriteLine ("\t\t\t\t{0} {1}_managed = GLib.Object.GetObject ({1}, false) as {0};", implementor != null ? implementor.Name : container_type.Name, parms[0].Name);
- sw.Write (call.Setup ("\t\t\t\t"));
- sw.Write ("\t\t\t\t{0}", IsVoid ? "" : retval.CSType == retval.ToNativeType ? "return " : retval.CSType + " raw_ret = ");
- sw.WriteLine ("{2}_managed.{0} ({1});", "On" + Name, call.ToString (), parms[0].Name);
- sw.Write (call.Finish ("\t\t\t\t"));
- if (!IsVoid && retval.CSType != retval.ToNativeType)
- sw.WriteLine ("\t\t\t\treturn {0};", SymbolTable.Table.ToNativeReturn (retval.CType, "raw_ret"));
- sw.WriteLine ("\t\t\t} catch (Exception e) {");
- bool fatal = HasOutParams || !IsVoid;
- sw.WriteLine ("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, " + (fatal ? "true" : "false") + ");");
- if (fatal) {
- sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return");
- sw.WriteLine ("\t\t\t\tthrow e;");
- }
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}\n");
- sw.WriteLine ("\t\tprivate static void Override" + Name + " (GLib.GType gtype)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (" + Name + "VMCallback == null)");
- sw.WriteLine ("\t\t\t\t" + Name + "VMCallback = new " + Name + "VMDelegate (" + Name.ToLower() + "_cb);");
- if (use_glue)
- sw.WriteLine ("\t\t\t{0} (gtype.Val, {1}VMCallback);", glue_name, Name);
- else
- sw.WriteLine ("\t\t\tOverrideVirtualMethod (gtype, " + CName + ", " + Name + "VMCallback);");
- sw.WriteLine ("\t\t}\n");
- }
-
- public void GenEvent (StreamWriter sw, ClassBase implementor, string target)
- {
- string args_type = IsEventHandler ? "" : ", typeof (" + EventArgsQualifiedName + ")";
-
- if (Marshaled) {
- GenCallback (sw);
- args_type = ", new " + DelegateName + "(" + CallbackName + ")";
- }
-
- sw.WriteLine("\t\t[GLib.Signal("+ CName + ")]");
- sw.Write("\t\tpublic ");
- if (NeedNew (implementor))
- sw.Write("new ");
- sw.WriteLine("event " + EventHandlerQualifiedName + " " + Name + " {");
- sw.WriteLine("\t\t\tadd {");
- sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
- sw.WriteLine("\t\t\t\tsig.AddDelegate (value);");
- sw.WriteLine("\t\t\t}");
- sw.WriteLine("\t\t\tremove {");
- sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
- sw.WriteLine("\t\t\t\tsig.RemoveDelegate (value);");
- sw.WriteLine("\t\t\t}");
- sw.WriteLine("\t\t}");
- sw.WriteLine();
- }
-
- public void Generate (GenerationInfo gen_info, ClassBase implementor)
- {
- StreamWriter sw = gen_info.Writer;
-
- if (implementor == null)
- GenEventHandler (gen_info);
-
- GenDefaultHandlerDelegate (gen_info, implementor);
- if (gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0)
- GenGlueVirtualMethod (gen_info);
- else
- GenChainVirtualMethod (sw, implementor);
- GenEvent (sw, implementor, "this");
-
- Statistics.SignalCount++;
- }
- }
-}
-
+// GtkSharp.Generation.Signal.cs - The Signal Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2005 Novell, Inc.
+// Copyright (c) 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Signal {
+
+ bool marshaled;
+ string name;
+ XmlElement elem;
+ ReturnValue retval;
+ Parameters parms;
+ ClassBase container_type;
+
+ public Signal (XmlElement elem, ClassBase container_type)
+ {
+ this.elem = elem;
+ name = elem.GetAttribute ("name");
+ marshaled = elem.GetAttribute ("manual") == "true";
+ retval = new ReturnValue (elem ["return-type"]);
+ parms = new Parameters (elem["parameters"]);
+ this.container_type = container_type;
+ }
+
+ bool Marshaled {
+ get { return marshaled; }
+ }
+
+ public string Name {
+ get {
+ return name;
+ }
+ set {
+ name = value;
+ }
+ }
+
+ public bool Validate ()
+ {
+ if (Name == "") {
+ Console.Write ("Nameless signal ");
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ if (!parms.Validate () || !retval.Validate ()) {
+ Console.Write (" in signal " + Name + " ");
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ return true;
+ }
+
+ public void GenerateDecl (StreamWriter sw)
+ {
+ if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null))
+ sw.Write("new ");
+
+ sw.WriteLine ("\t\tevent " + EventHandlerQualifiedName + " " + Name + ";");
+ }
+
+ public string CName {
+ get {
+ return "\"" + elem.GetAttribute("cname") + "\"";
+ }
+ }
+
+ string CallbackSig {
+ get {
+ string result = "";
+ for (int i = 0; i < parms.Count; i++) {
+ if (i > 0)
+ result += ", ";
+
+ Parameter p = parms [i];
+ if (p.PassAs != "" && !(p.Generatable is StructBase))
+ result += p.PassAs + " ";
+ result += (p.MarshalType + " arg" + i);
+ }
+
+ return result;
+ }
+ }
+
+ string CallbackName {
+ get { return Name + "SignalCallback"; }
+ }
+
+ string DelegateName {
+ get { return Name + "SignalDelegate"; }
+ }
+
+ private string EventArgsName {
+ get {
+ if (IsEventHandler)
+ return "EventArgs";
+ else
+ return Name + "Args";
+ }
+ }
+
+ private string EventArgsQualifiedName {
+ get {
+ if (IsEventHandler)
+ return "System.EventArgs";
+ else
+ return container_type.NS + "." + Name + "Args";
+ }
+ }
+
+ private string EventHandlerName {
+ get {
+ if (IsEventHandler)
+ return "EventHandler";
+ else if (SymbolTable.Table [container_type.NS + Name + "Handler"] != null)
+ return Name + "EventHandler";
+ else
+ return Name + "Handler";
+ }
+ }
+
+ private string EventHandlerQualifiedName {
+ get {
+ if (IsEventHandler)
+ return "System.EventHandler";
+ else
+ return container_type.NS + "." + EventHandlerName;
+ }
+ }
+
+ string ClassFieldName {
+ get {
+ return elem.HasAttribute ("field_name") ? elem.GetAttribute("field_name") : String.Empty;
+ }
+ }
+
+ private bool HasOutParams {
+ get {
+ foreach (Parameter p in parms) {
+ if (p.PassAs == "out")
+ return true;
+ }
+ return false;
+ }
+ }
+
+ private bool IsEventHandler {
+ get {
+ return retval.CSType == "void" && parms.Count == 1 && (parms [0].Generatable is ObjectGen || parms [0].Generatable is InterfaceGen);
+ }
+ }
+
+ private bool IsVoid {
+ get {
+ return retval.CSType == "void";
+ }
+ }
+
+ private string ReturnGType {
+ get {
+ IGeneratable igen = SymbolTable.Table [retval.CType];
+
+ if (igen is ObjectGen)
+ return "GLib.GType.Object";
+ if (igen is BoxedGen)
+ return retval.CSType + ".GType";
+ if (igen is EnumGen)
+ return retval.CSType + "GType.GType";
+
+ switch (retval.CSType) {
+ case "bool":
+ return "GLib.GType.Boolean";
+ case "string":
+ return "GLib.GType.String";
+ case "int":
+ return "GLib.GType.Int";
+ default:
+ throw new Exception (retval.CSType);
+ }
+ }
+ }
+
+ public string GenArgsInitialization (StreamWriter sw)
+ {
+ if (parms.Count > 1)
+ sw.WriteLine("\t\t\t\targs.Args = new object[" + (parms.Count - 1) + "];");
+ string finish = "";
+ for (int idx = 1; idx < parms.Count; idx++) {
+ Parameter p = parms [idx];
+ IGeneratable igen = p.Generatable;
+ if (p.PassAs != "out") {
+ if (igen is ManualGen) {
+ sw.WriteLine("\t\t\t\tif (arg{0} == IntPtr.Zero)", idx);
+ sw.WriteLine("\t\t\t\t\targs.Args[{0}] = null;", idx - 1);
+ sw.WriteLine("\t\t\t\telse {");
+ sw.WriteLine("\t\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
+ sw.WriteLine("\t\t\t\t}");
+ } else
+ sw.WriteLine("\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
+ }
+ if (igen is StructBase && p.PassAs == "ref")
+ finish += "\t\t\t\tif (arg" + idx + " != IntPtr.Zero) System.Runtime.InteropServices.Marshal.StructureToPtr (args.Args[" + (idx-1) + "], arg" + idx + ", false);\n";
+ else if (p.PassAs != "")
+ finish += "\t\t\t\targ" + idx + " = " + igen.ToNativeReturn ("((" + p.CSType + ")args.Args[" + (idx - 1) + "])") + ";\n";
+ }
+ return finish;
+ }
+
+ public void GenArgsCleanup (StreamWriter sw, string finish)
+ {
+ if (IsVoid && finish.Length == 0)
+ return;
+
+ sw.WriteLine("\n\t\t\ttry {");
+ sw.Write (finish);
+ if (!IsVoid) {
+ if (retval.CSType == "bool") {
+ sw.WriteLine ("\t\t\t\tif (args.RetVal == null)");
+ sw.WriteLine ("\t\t\t\t\treturn false;");
+ }
+ sw.WriteLine("\t\t\t\treturn " + SymbolTable.Table.ToNativeReturn (retval.CType, "((" + retval.CSType + ")args.RetVal)") + ";");
+ }
+ sw.WriteLine("\t\t\t} catch (Exception) {");
+ sw.WriteLine ("\t\t\t\tException ex = new Exception (\"args.RetVal or 'out' property unset or set to incorrect type in " + EventHandlerQualifiedName + " callback\");");
+ sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (ex, true);");
+
+ sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return.");
+ sw.WriteLine ("\t\t\t\tthrow ex;");
+ sw.WriteLine("\t\t\t}");
+ }
+
+ public void GenCallback (StreamWriter sw)
+ {
+ if (IsEventHandler)
+ return;
+
+ sw.WriteLine ("\t\t[GLib.CDeclCallback]");
+ sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ", IntPtr gch);");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ", IntPtr gch)");
+ sw.WriteLine("\t\t{");
+ sw.WriteLine("\t\t\t{0} args = new {0} ();", EventArgsQualifiedName);
+ sw.WriteLine("\t\t\ttry {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;");
+ sw.WriteLine("\t\t\t\tif (sig == null)");
+ sw.WriteLine("\t\t\t\t\tthrow new Exception(\"Unknown signal GC handle received \" + gch);");
+ sw.WriteLine();
+ string finish = GenArgsInitialization (sw);
+ sw.WriteLine("\t\t\t\t{0} handler = ({0}) sig.Handler;", EventHandlerQualifiedName);
+ sw.WriteLine("\t\t\t\thandler (GLib.Object.GetObject (arg0), args);");
+ sw.WriteLine("\t\t\t} catch (Exception e) {");
+ sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, false);");
+ sw.WriteLine("\t\t\t}");
+ GenArgsCleanup (sw, finish);
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+ }
+
+ private bool NeedNew (ClassBase implementor)
+ {
+ return elem.HasAttribute ("new_flag") ||
+ (container_type != null && container_type.GetSignalRecursively (Name) != null) ||
+ (implementor != null && implementor.GetSignalRecursively (Name) != null);
+ }
+
+ public void GenEventHandler (GenerationInfo gen_info)
+ {
+ if (IsEventHandler)
+ return;
+
+ string ns = container_type.NS;
+
+ StreamWriter sw = gen_info.OpenStream (EventHandlerName);
+
+ sw.WriteLine ("namespace " + ns + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic delegate void " + EventHandlerName + "(object o, " + EventArgsName + " args);");
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic class " + EventArgsName + " : GLib.SignalArgs {");
+ for (int i = 1; i < parms.Count; i++) {
+ sw.WriteLine ("\t\tpublic " + parms[i].CSType + " " + parms[i].StudlyName + "{");
+ if (parms[i].PassAs != "out") {
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn (" + parms[i].CSType + ") Args[" + (i - 1) + "];");
+ sw.WriteLine ("\t\t\t}");
+ }
+ if (parms[i].PassAs != "") {
+ sw.WriteLine ("\t\t\tset {");
+ sw.WriteLine ("\t\t\t\tArgs[" + (i - 1) + "] = (" + parms[i].CSType + ")value;");
+ sw.WriteLine ("\t\t\t}");
+ }
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ }
+
+ private void GenVMDeclaration (StreamWriter sw, ClassBase implementor)
+ {
+ VMSignature vmsig = new VMSignature (parms);
+ sw.WriteLine ("\t\t[GLib.DefaultSignalHandler(Type=typeof(" + (implementor != null ? implementor.QualifiedName : container_type.QualifiedName) + "), ConnectionMethod=\"Override" + Name +"\")]");
+ sw.Write ("\t\tprotected ");
+ if (NeedNew (implementor))
+ sw.Write ("new ");
+ sw.WriteLine ("virtual {0} {1} ({2})", retval.CSType, "On" + Name, vmsig.ToString ());
+ }
+
+ private string CastFromInt (string type)
+ {
+ return type != "int" ? "(" + type + ") " : "";
+ }
+
+ private string GlueCallString {
+ get {
+ string result = "Handle";
+
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+ IGeneratable igen = p.Generatable;
+
+ if (i > 1 && parms [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
+ string string_name = parms [i - 1].Name;
+ result += ", " + igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
+ continue;
+ }
+
+ p.CallName = p.Name;
+ string call_parm = p.CallString;
+
+ if (p.IsUserData && parms.IsHidden (p) && !parms.HideData && (i == 1 || parms [i - 1].Scope != "notified")) {
+ call_parm = "IntPtr.Zero";
+ }
+
+ result += ", " + call_parm;
+ }
+ return result;
+ }
+ }
+
+ private string GlueSignature {
+ get {
+ string result = String.Empty;
+ for (int i = 0; i < parms.Count; i++)
+ result += parms[i].CType.Replace ("const-", "const ") + " " + parms[i].Name + (i == parms.Count-1 ? "" : ", ");
+ return result;
+ }
+ }
+
+ private string DefaultGlueValue {
+ get {
+ string val = retval.DefaultValue;
+ switch (val) {
+ case "null":
+ return "NULL";
+ case "false":
+ return "FALSE";
+ case "true":
+ return "TRUE";
+ default:
+ return val;
+ }
+ }
+ }
+
+ private void GenGlueVirtualMethod (GenerationInfo gen_info)
+ {
+ StreamWriter glue = gen_info.GlueWriter;
+ string glue_name = String.Format ("{0}sharp_{1}_base_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
+ glue.WriteLine ("{0} {1} ({2});\n", retval.CType, glue_name, GlueSignature);
+ glue.WriteLine ("{0}\n{1} ({2})", retval.CType, glue_name, GlueSignature);
+ glue.WriteLine ("{");
+ glue.WriteLine ("\t{0}Class *klass = ({0}Class *) get_threshold_class (G_OBJECT ({1}));", container_type.CName, parms[0].Name);
+ glue.Write ("\tif (klass->{0})\n\t\t", ClassFieldName);
+ if (!IsVoid)
+ glue.Write ("return ");
+ glue.Write ("(* klass->{0}) (", ClassFieldName);
+ for (int i = 0; i < parms.Count; i++)
+ glue.Write (parms[i].Name + (i == parms.Count - 1 ? "" : ", "));
+ glue.WriteLine (");");
+ if (!IsVoid)
+ glue.WriteLine ("\treturn " + DefaultGlueValue + ";");
+ glue.WriteLine ("}");
+
+ StreamWriter sw = gen_info.Writer;
+ sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
+ sw.WriteLine ("\t\tstatic extern {0} {1} ({2});\n", retval.MarshalType, glue_name, parms.ImportSignature);
+ GenVMDeclaration (sw, null);
+ sw.WriteLine ("\t\t{");
+ MethodBody body = new MethodBody (parms);
+ body.Initialize (gen_info, false, false, String.Empty);
+ sw.WriteLine ("\t\t\t{0}{1} ({2});", IsVoid ? "" : retval.MarshalType + " __ret = ", glue_name, GlueCallString);
+ body.Finish (sw, "");
+ if (!IsVoid)
+ sw.WriteLine ("\t\t\treturn {0};", retval.FromNative ("__ret"));
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ private void GenChainVirtualMethod (StreamWriter sw, ClassBase implementor)
+ {
+ GenVMDeclaration (sw, implementor);
+ sw.WriteLine ("\t\t{");
+ if (IsVoid)
+ sw.WriteLine ("\t\t\tGLib.Value ret = GLib.Value.Empty;");
+ else
+ sw.WriteLine ("\t\t\tGLib.Value ret = new GLib.Value (" + ReturnGType + ");");
+
+ sw.WriteLine ("\t\t\tGLib.ValueArray inst_and_params = new GLib.ValueArray (" + parms.Count + ");");
+ sw.WriteLine ("\t\t\tGLib.Value[] vals = new GLib.Value [" + parms.Count + "];");
+ sw.WriteLine ("\t\t\tvals [0] = new GLib.Value (this);");
+ sw.WriteLine ("\t\t\tinst_and_params.Append (vals [0]);");
+ string cleanup = "";
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+ if (p.PassAs != "") {
+ if (SymbolTable.Table.IsBoxed (p.CType)) {
+ if (p.PassAs == "ref")
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
+ else
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value ((GLib.GType)typeof (" + p.CSType + "));");
+ cleanup += "\t\t\t" + p.Name + " = (" + p.CSType + ") vals [" + i + "];\n";
+ } else {
+ if (p.PassAs == "ref")
+ sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = GLib.Marshaller.StructureToPtrAlloc (" + p.Generatable.CallByName (p.Name) + ");");
+ else
+ sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + p.MarshalType + ")));");
+
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + "_ptr);");
+ cleanup += "\t\t\t" + p.Name + " = " + p.FromNative ("(" + p.MarshalType + ") Marshal.PtrToStructure (" + p.Name + "_ptr, typeof (" + p.MarshalType + "))") + ";\n";
+ cleanup += "\t\t\tMarshal.FreeHGlobal (" + p.Name + "_ptr);\n";
+ }
+ } else if (p.IsLength && parms [i - 1].IsString)
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (System.Text.Encoding.UTF8.GetByteCount (" + parms [i-1].Name + "));");
+ else
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
+
+ sw.WriteLine ("\t\t\tinst_and_params.Append (vals [" + i + "]);");
+ }
+
+ sw.WriteLine ("\t\t\tg_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);");
+ if (cleanup != "")
+ sw.WriteLine (cleanup);
+ sw.WriteLine ("\t\t\tforeach (GLib.Value v in vals)");
+ sw.WriteLine ("\t\t\t\tv.Dispose ();");
+ if (!IsVoid) {
+ IGeneratable igen = SymbolTable.Table [retval.CType];
+ sw.WriteLine ("\t\t\t" + retval.CSType + " result = (" + (igen is EnumGen ? retval.CSType + ") (Enum" : retval.CSType) + ") ret;");
+ sw.WriteLine ("\t\t\tret.Dispose ();");
+ sw.WriteLine ("\t\t\treturn result;");
+ }
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ private void GenDefaultHandlerDelegate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ StreamWriter sw = gen_info.Writer;
+ StreamWriter glue;
+ bool use_glue = gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0;
+ string glue_name = String.Empty;
+ ManagedCallString call = new ManagedCallString (parms, true);
+ sw.WriteLine ("\t\t[GLib.CDeclCallback]");
+ sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "VMDelegate (" + parms.ImportSignature + ");\n");
+
+ if (use_glue) {
+ glue = gen_info.GlueWriter;
+ glue_name = String.Format ("{0}sharp_{1}_override_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
+ sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
+ sw.WriteLine ("\t\tstatic extern void {0} (IntPtr gtype, {1}VMDelegate cb);\n", glue_name, Name);
+ glue.WriteLine ("void {0} (GType gtype, gpointer cb);\n", glue_name);
+ glue.WriteLine ("void\n{0} (GType gtype, gpointer cb)", glue_name);
+ glue.WriteLine ("{");
+ glue.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
+ glue.WriteLine ("\tif (klass == NULL)");
+ glue.WriteLine ("\t\tklass = g_type_class_ref (gtype);");
+ glue.WriteLine ("\t(({0} *)klass)->{1} = cb;", container_type.CName + "Class", ClassFieldName);
+ glue.WriteLine ("}\n");
+ }
+
+ sw.WriteLine ("\t\tstatic {0} {1};\n", Name + "VMDelegate", Name + "VMCallback");
+ sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + Name.ToLower() + "_cb (" + parms.ImportSignature + ")");
+ sw.WriteLine ("\t\t{");
+ string unconditional = call.Unconditional ("\t\t\t");
+ if (unconditional.Length > 0)
+ sw.WriteLine (unconditional);
+ sw.WriteLine ("\t\t\ttry {");
+ sw.WriteLine ("\t\t\t\t{0} {1}_managed = GLib.Object.GetObject ({1}, false) as {0};", implementor != null ? implementor.Name : container_type.Name, parms[0].Name);
+ sw.Write (call.Setup ("\t\t\t\t"));
+ sw.Write ("\t\t\t\t{0}", IsVoid ? "" : retval.CSType == retval.ToNativeType ? "return " : retval.CSType + " raw_ret = ");
+ sw.WriteLine ("{2}_managed.{0} ({1});", "On" + Name, call.ToString (), parms[0].Name);
+ sw.Write (call.Finish ("\t\t\t\t"));
+ if (!IsVoid && retval.CSType != retval.ToNativeType)
+ sw.WriteLine ("\t\t\t\treturn {0};", SymbolTable.Table.ToNativeReturn (retval.CType, "raw_ret"));
+ sw.WriteLine ("\t\t\t} catch (Exception e) {");
+ bool fatal = HasOutParams || !IsVoid;
+ sw.WriteLine ("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, " + (fatal ? "true" : "false") + ");");
+ if (fatal) {
+ sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return");
+ sw.WriteLine ("\t\t\t\tthrow e;");
+ }
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}\n");
+ sw.WriteLine ("\t\tprivate static void Override" + Name + " (GLib.GType gtype)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (" + Name + "VMCallback == null)");
+ sw.WriteLine ("\t\t\t\t" + Name + "VMCallback = new " + Name + "VMDelegate (" + Name.ToLower() + "_cb);");
+ if (use_glue)
+ sw.WriteLine ("\t\t\t{0} (gtype.Val, {1}VMCallback);", glue_name, Name);
+ else
+ sw.WriteLine ("\t\t\tOverrideVirtualMethod (gtype, " + CName + ", " + Name + "VMCallback);");
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ public void GenEvent (StreamWriter sw, ClassBase implementor, string target)
+ {
+ string args_type = IsEventHandler ? "" : ", typeof (" + EventArgsQualifiedName + ")";
+
+ if (Marshaled) {
+ GenCallback (sw);
+ args_type = ", new " + DelegateName + "(" + CallbackName + ")";
+ }
+
+ sw.WriteLine("\t\t[GLib.Signal("+ CName + ")]");
+ sw.Write("\t\tpublic ");
+ if (NeedNew (implementor))
+ sw.Write("new ");
+ sw.WriteLine("event " + EventHandlerQualifiedName + " " + Name + " {");
+ sw.WriteLine("\t\t\tadd {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
+ sw.WriteLine("\t\t\t\tsig.AddDelegate (value);");
+ sw.WriteLine("\t\t\t}");
+ sw.WriteLine("\t\t\tremove {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
+ sw.WriteLine("\t\t\t\tsig.RemoveDelegate (value);");
+ sw.WriteLine("\t\t\t}");
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+ }
+
+ public void Generate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ StreamWriter sw = gen_info.Writer;
+
+ if (implementor == null)
+ GenEventHandler (gen_info);
+
+ GenDefaultHandlerDelegate (gen_info, implementor);
+ if (gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0)
+ GenGlueVirtualMethod (gen_info);
+ else
+ GenChainVirtualMethod (sw, implementor);
+ GenEvent (sw, implementor, "this");
+
+ Statistics.SignalCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Signature.cs b/lib/gio-sharp/generator/Signature.cs
index 1b01234..ff9f4bd 100644
--- a/lib/gio-sharp/generator/Signature.cs
+++ b/lib/gio-sharp/generator/Signature.cs
@@ -1,123 +1,123 @@
-// GtkSharp.Generation.Signature.cs - The Signature Generation Class.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.Xml;
-
- public class Signature {
-
- private ArrayList parms = new ArrayList ();
-
- public Signature (Parameters parms)
- {
- foreach (Parameter p in parms) {
- if (!parms.IsHidden (p))
- this.parms.Add (p);
- }
- }
-
- public override string ToString ()
- {
- if (parms.Count == 0)
- return "";
-
- string[] result = new string [parms.Count];
- int i = 0;
-
- foreach (Parameter p in parms) {
- result [i] = p.PassAs != "" ? p.PassAs + " " : "";
- result [i++] += p.CSType + " " + p.Name;
- }
-
- return String.Join (", ", result);
- }
-
- public string Types {
- get {
- if (parms.Count == 0)
- return "";
-
- string[] result = new string [parms.Count];
- int i = 0;
-
- foreach (Parameter p in parms)
- result [i++] = p.CSType;
-
- return String.Join (":", result);
- }
- }
-
- public bool IsAccessor {
- get {
- int count = 0;
- foreach (Parameter p in parms) {
- if (p.PassAs == "out")
- count++;
-
- if (count > 1)
- return false;
- }
- return count == 1;
- }
- }
-
- public string AccessorType {
- get {
- foreach (Parameter p in parms)
- if (p.PassAs == "out")
- return p.CSType;
-
- return null;
- }
- }
-
- public string AccessorName {
- get {
- foreach (Parameter p in parms)
- if (p.PassAs == "out")
- return p.Name;
-
- return null;
- }
- }
-
- public string AsAccessor {
- get {
- string[] result = new string [parms.Count - 1];
- int i = 0;
-
- foreach (Parameter p in parms) {
- if (p.PassAs == "out")
- continue;
-
- result [i] = p.PassAs != "" ? p.PassAs + " " : "";
- result [i++] += p.CSType + " " + p.Name;
- }
-
- return String.Join (", ", result);
- }
- }
- }
-}
-
+// GtkSharp.Generation.Signature.cs - The Signature Generation Class.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.Xml;
+
+ public class Signature {
+
+ private ArrayList parms = new ArrayList ();
+
+ public Signature (Parameters parms)
+ {
+ foreach (Parameter p in parms) {
+ if (!parms.IsHidden (p))
+ this.parms.Add (p);
+ }
+ }
+
+ public override string ToString ()
+ {
+ if (parms.Count == 0)
+ return "";
+
+ string[] result = new string [parms.Count];
+ int i = 0;
+
+ foreach (Parameter p in parms) {
+ result [i] = p.PassAs != "" ? p.PassAs + " " : "";
+ result [i++] += p.CSType + " " + p.Name;
+ }
+
+ return String.Join (", ", result);
+ }
+
+ public string Types {
+ get {
+ if (parms.Count == 0)
+ return "";
+
+ string[] result = new string [parms.Count];
+ int i = 0;
+
+ foreach (Parameter p in parms)
+ result [i++] = p.CSType;
+
+ return String.Join (":", result);
+ }
+ }
+
+ public bool IsAccessor {
+ get {
+ int count = 0;
+ foreach (Parameter p in parms) {
+ if (p.PassAs == "out")
+ count++;
+
+ if (count > 1)
+ return false;
+ }
+ return count == 1;
+ }
+ }
+
+ public string AccessorType {
+ get {
+ foreach (Parameter p in parms)
+ if (p.PassAs == "out")
+ return p.CSType;
+
+ return null;
+ }
+ }
+
+ public string AccessorName {
+ get {
+ foreach (Parameter p in parms)
+ if (p.PassAs == "out")
+ return p.Name;
+
+ return null;
+ }
+ }
+
+ public string AsAccessor {
+ get {
+ string[] result = new string [parms.Count - 1];
+ int i = 0;
+
+ foreach (Parameter p in parms) {
+ if (p.PassAs == "out")
+ continue;
+
+ result [i] = p.PassAs != "" ? p.PassAs + " " : "";
+ result [i++] += p.CSType + " " + p.Name;
+ }
+
+ return String.Join (", ", result);
+ }
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/SimpleBase.cs b/lib/gio-sharp/generator/SimpleBase.cs
index 38bfbe3..2637b2b 100644
--- a/lib/gio-sharp/generator/SimpleBase.cs
+++ b/lib/gio-sharp/generator/SimpleBase.cs
@@ -1,121 +1,121 @@
-// GtkSharp.Generation.SimpleBase.cs - base class for marshaling non-generated types.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public abstract class SimpleBase : IGeneratable {
-
- string type;
- string ctype;
- string ns = String.Empty;
- string default_value = String.Empty;
-
- public SimpleBase (string ctype, string type, string default_value)
- {
- string[] toks = type.Split('.');
- this.ctype = ctype;
- this.type = toks[toks.Length - 1];
- if (toks.Length > 2)
- this.ns = String.Join (".", toks, 0, toks.Length - 1);
- else if (toks.Length == 2)
- this.ns = toks[0];
- this.default_value = default_value;
- }
-
- public string CName {
- get {
- return ctype;
- }
- }
-
- public string Name {
- get {
- return type;
- }
- }
-
- public string QualifiedName {
- get {
- return ns == String.Empty ? type : ns + "." + type;
- }
- }
-
- public virtual string MarshalType {
- get {
- return QualifiedName;
- }
- }
-
- public virtual string MarshalReturnType {
- get {
- return MarshalType;
- }
- }
-
- public virtual string DefaultValue {
- get {
- return default_value;
- }
- }
-
- public virtual string ToNativeReturnType {
- get {
- return MarshalType;
- }
- }
-
- public virtual string CallByName (string var)
- {
- return var;
- }
-
- public virtual string FromNative(string var)
- {
- return var;
- }
-
- public virtual string FromNativeReturn(string var)
- {
- return FromNative (var);
- }
-
- public virtual string ToNativeReturn(string var)
- {
- return CallByName (var);
- }
-
- public bool Validate ()
- {
- return true;
- }
-
- public void Generate ()
- {
- }
-
- public void Generate (GenerationInfo gen_info)
- {
- }
- }
-}
-
+// GtkSharp.Generation.SimpleBase.cs - base class for marshaling non-generated types.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public abstract class SimpleBase : IGeneratable {
+
+ string type;
+ string ctype;
+ string ns = String.Empty;
+ string default_value = String.Empty;
+
+ public SimpleBase (string ctype, string type, string default_value)
+ {
+ string[] toks = type.Split('.');
+ this.ctype = ctype;
+ this.type = toks[toks.Length - 1];
+ if (toks.Length > 2)
+ this.ns = String.Join (".", toks, 0, toks.Length - 1);
+ else if (toks.Length == 2)
+ this.ns = toks[0];
+ this.default_value = default_value;
+ }
+
+ public string CName {
+ get {
+ return ctype;
+ }
+ }
+
+ public string Name {
+ get {
+ return type;
+ }
+ }
+
+ public string QualifiedName {
+ get {
+ return ns == String.Empty ? type : ns + "." + type;
+ }
+ }
+
+ public virtual string MarshalType {
+ get {
+ return QualifiedName;
+ }
+ }
+
+ public virtual string MarshalReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ public virtual string DefaultValue {
+ get {
+ return default_value;
+ }
+ }
+
+ public virtual string ToNativeReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ public virtual string CallByName (string var)
+ {
+ return var;
+ }
+
+ public virtual string FromNative(string var)
+ {
+ return var;
+ }
+
+ public virtual string FromNativeReturn(string var)
+ {
+ return FromNative (var);
+ }
+
+ public virtual string ToNativeReturn(string var)
+ {
+ return CallByName (var);
+ }
+
+ public bool Validate ()
+ {
+ return true;
+ }
+
+ public void Generate ()
+ {
+ }
+
+ public void Generate (GenerationInfo gen_info)
+ {
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/SimpleGen.cs b/lib/gio-sharp/generator/SimpleGen.cs
index b382135..14554ab 100644
--- a/lib/gio-sharp/generator/SimpleGen.cs
+++ b/lib/gio-sharp/generator/SimpleGen.cs
@@ -1,31 +1,31 @@
-// GtkSharp.Generation.SimpleGen.cs - The Simple type Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class SimpleGen : SimpleBase {
- public SimpleGen (string ctype, string type, string default_value) : base (ctype, type, default_value) {}
-
- }
-}
-
+// GtkSharp.Generation.SimpleGen.cs - The Simple type Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class SimpleGen : SimpleBase {
+ public SimpleGen (string ctype, string type, string default_value) : base (ctype, type, default_value) {}
+
+ }
+}
+
diff --git a/lib/gio-sharp/generator/Statistics.cs b/lib/gio-sharp/generator/Statistics.cs
index 4545765..f634185 100644
--- a/lib/gio-sharp/generator/Statistics.cs
+++ b/lib/gio-sharp/generator/Statistics.cs
@@ -1,197 +1,197 @@
-// Statistics.cs : Generation statistics class implementation
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2002 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
-
- public class Statistics {
-
- static int cbs = 0;
- static int enums = 0;
- static int objects = 0;
- static int structs = 0;
- static int boxed = 0;
- static int opaques = 0;
- static int interfaces = 0;
- static int methods = 0;
- static int ctors = 0;
- static int props = 0;
- static int sigs = 0;
- static int throttled = 0;
- static int ignored = 0;
- static bool vm_ignored = false;
-
- public static int CBCount {
- get {
- return cbs;
- }
- set {
- cbs = value;
- }
- }
-
- public static int EnumCount {
- get {
- return enums;
- }
- set {
- enums = value;
- }
- }
-
- public static int ObjectCount {
- get {
- return objects;
- }
- set {
- objects = value;
- }
- }
-
- public static int StructCount {
- get {
- return structs;
- }
- set {
- structs = value;
- }
- }
-
- public static int BoxedCount {
- get {
- return boxed;
- }
- set {
- boxed = value;
- }
- }
-
- public static int OpaqueCount {
- get {
- return opaques;
- }
- set {
- opaques = value;
- }
- }
-
- public static int CtorCount {
- get {
- return ctors;
- }
- set {
- ctors = value;
- }
- }
-
- public static int MethodCount {
- get {
- return methods;
- }
- set {
- methods = value;
- }
- }
-
- public static int PropCount {
- get {
- return props;
- }
- set {
- props = value;
- }
- }
-
- public static int SignalCount {
- get {
- return sigs;
- }
- set {
- sigs = value;
- }
- }
-
- public static int IFaceCount {
- get {
- return interfaces;
- }
- set {
- interfaces = value;
- }
- }
-
- public static int ThrottledCount {
- get {
- return throttled;
- }
- set {
- throttled = value;
- }
- }
-
- public static int IgnoreCount {
- get {
- return ignored;
- }
- set {
- ignored = value;
- }
- }
-
- public static bool VMIgnored {
- get {
- return vm_ignored;
- }
- set {
- if (value)
- vm_ignored = value;
- }
- }
-
- public static void Report()
- {
- if (VMIgnored) {
- Console.WriteLine();
- Console.WriteLine("Warning: Generation throttled for Virtual Methods.");
- Console.WriteLine(" Consider regenerating with --gluelib-name and --glue-filename.");
- }
- Console.WriteLine();
- Console.WriteLine("Generation Summary:");
- Console.Write(" Enums: " + enums);
- Console.Write(" Structs: " + structs);
- Console.Write(" Boxed: " + boxed);
- Console.Write(" Opaques: " + opaques);
- Console.Write(" Interfaces: " + interfaces);
- Console.Write(" Objects: " + objects);
- Console.WriteLine(" Callbacks: " + cbs);
- Console.Write(" Properties: " + props);
- Console.Write(" Signals: " + sigs);
- Console.Write(" Methods: " + methods);
- Console.Write(" Constructors: " + ctors);
- Console.WriteLine(" Throttled: " + throttled);
- Console.WriteLine("Total Nodes: " + (enums+structs+boxed+opaques+interfaces+cbs+objects+props+sigs+methods+ctors+throttled));
- Console.WriteLine();
- }
- }
-}
+// Statistics.cs : Generation statistics class implementation
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2002 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+
+ public class Statistics {
+
+ static int cbs = 0;
+ static int enums = 0;
+ static int objects = 0;
+ static int structs = 0;
+ static int boxed = 0;
+ static int opaques = 0;
+ static int interfaces = 0;
+ static int methods = 0;
+ static int ctors = 0;
+ static int props = 0;
+ static int sigs = 0;
+ static int throttled = 0;
+ static int ignored = 0;
+ static bool vm_ignored = false;
+
+ public static int CBCount {
+ get {
+ return cbs;
+ }
+ set {
+ cbs = value;
+ }
+ }
+
+ public static int EnumCount {
+ get {
+ return enums;
+ }
+ set {
+ enums = value;
+ }
+ }
+
+ public static int ObjectCount {
+ get {
+ return objects;
+ }
+ set {
+ objects = value;
+ }
+ }
+
+ public static int StructCount {
+ get {
+ return structs;
+ }
+ set {
+ structs = value;
+ }
+ }
+
+ public static int BoxedCount {
+ get {
+ return boxed;
+ }
+ set {
+ boxed = value;
+ }
+ }
+
+ public static int OpaqueCount {
+ get {
+ return opaques;
+ }
+ set {
+ opaques = value;
+ }
+ }
+
+ public static int CtorCount {
+ get {
+ return ctors;
+ }
+ set {
+ ctors = value;
+ }
+ }
+
+ public static int MethodCount {
+ get {
+ return methods;
+ }
+ set {
+ methods = value;
+ }
+ }
+
+ public static int PropCount {
+ get {
+ return props;
+ }
+ set {
+ props = value;
+ }
+ }
+
+ public static int SignalCount {
+ get {
+ return sigs;
+ }
+ set {
+ sigs = value;
+ }
+ }
+
+ public static int IFaceCount {
+ get {
+ return interfaces;
+ }
+ set {
+ interfaces = value;
+ }
+ }
+
+ public static int ThrottledCount {
+ get {
+ return throttled;
+ }
+ set {
+ throttled = value;
+ }
+ }
+
+ public static int IgnoreCount {
+ get {
+ return ignored;
+ }
+ set {
+ ignored = value;
+ }
+ }
+
+ public static bool VMIgnored {
+ get {
+ return vm_ignored;
+ }
+ set {
+ if (value)
+ vm_ignored = value;
+ }
+ }
+
+ public static void Report()
+ {
+ if (VMIgnored) {
+ Console.WriteLine();
+ Console.WriteLine("Warning: Generation throttled for Virtual Methods.");
+ Console.WriteLine(" Consider regenerating with --gluelib-name and --glue-filename.");
+ }
+ Console.WriteLine();
+ Console.WriteLine("Generation Summary:");
+ Console.Write(" Enums: " + enums);
+ Console.Write(" Structs: " + structs);
+ Console.Write(" Boxed: " + boxed);
+ Console.Write(" Opaques: " + opaques);
+ Console.Write(" Interfaces: " + interfaces);
+ Console.Write(" Objects: " + objects);
+ Console.WriteLine(" Callbacks: " + cbs);
+ Console.Write(" Properties: " + props);
+ Console.Write(" Signals: " + sigs);
+ Console.Write(" Methods: " + methods);
+ Console.Write(" Constructors: " + ctors);
+ Console.WriteLine(" Throttled: " + throttled);
+ Console.WriteLine("Total Nodes: " + (enums+structs+boxed+opaques+interfaces+cbs+objects+props+sigs+methods+ctors+throttled));
+ Console.WriteLine();
+ }
+ }
+}
diff --git a/lib/gio-sharp/generator/StructGen.cs b/lib/gio-sharp/generator/StructGen.cs
index 4d615ad..f759703 100644
--- a/lib/gio-sharp/generator/StructGen.cs
+++ b/lib/gio-sharp/generator/StructGen.cs
@@ -1,53 +1,53 @@
-// GtkSharp.Generation.StructGen.cs - The Structure Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
- using System.Xml;
-
- public class StructGen : StructBase {
-
- public StructGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
- base.Generate (gen_info);
- if (GetMethod ("GetType") == null && GetMethod ("GetGType") == null) {
- sw.WriteLine ("\t\tprivate static GLib.GType GType {");
- sw.WriteLine ("\t\t\tget { return GLib.GType.Pointer; }");
- sw.WriteLine ("\t\t}");
- }
- sw.WriteLine ("#endregion");
- AppendCustom (sw, gen_info.CustomDir);
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- Statistics.StructCount++;
- }
- }
-}
-
+// GtkSharp.Generation.StructGen.cs - The Structure Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+ using System.Xml;
+
+ public class StructGen : StructBase {
+
+ public StructGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ base.Generate (gen_info);
+ if (GetMethod ("GetType") == null && GetMethod ("GetGType") == null) {
+ sw.WriteLine ("\t\tprivate static GLib.GType GType {");
+ sw.WriteLine ("\t\t\tget { return GLib.GType.Pointer; }");
+ sw.WriteLine ("\t\t}");
+ }
+ sw.WriteLine ("#endregion");
+ AppendCustom (sw, gen_info.CustomDir);
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.StructCount++;
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/generator/SymbolTable.cs b/lib/gio-sharp/generator/SymbolTable.cs
index e10b51f..2d139fe 100644
--- a/lib/gio-sharp/generator/SymbolTable.cs
+++ b/lib/gio-sharp/generator/SymbolTable.cs
@@ -1,412 +1,412 @@
-// GtkSharp.Generation.SymbolTable.cs - The Symbol Table Class.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004-2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
-
- public class SymbolTable {
-
- static SymbolTable table = null;
-
- Hashtable types = new Hashtable ();
-
- public static SymbolTable Table {
- get {
- if (table == null)
- table = new SymbolTable ();
-
- return table;
- }
- }
-
- public SymbolTable ()
- {
- // Simple easily mapped types
- AddType (new SimpleGen ("void", "void", String.Empty));
- AddType (new SimpleGen ("gpointer", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("gboolean", "bool", "false"));
- AddType (new SimpleGen ("gint", "int", "0"));
- AddType (new SimpleGen ("guint", "uint", "0"));
- AddType (new SimpleGen ("int", "int", "0"));
- AddType (new SimpleGen ("unsigned", "uint", "0"));
- AddType (new SimpleGen ("unsigned int", "uint", "0"));
- AddType (new SimpleGen ("unsigned-int", "uint", "0"));
- AddType (new SimpleGen ("gshort", "short", "0"));
- AddType (new SimpleGen ("gushort", "ushort", "0"));
- AddType (new SimpleGen ("short", "short", "0"));
- AddType (new SimpleGen ("guchar", "byte", "0"));
- AddType (new SimpleGen ("unsigned char", "byte", "0"));
- AddType (new SimpleGen ("unsigned-char", "byte", "0"));
- AddType (new SimpleGen ("guint1", "bool", "false"));
- AddType (new SimpleGen ("uint1", "bool", "false"));
- AddType (new SimpleGen ("gint8", "sbyte", "0"));
- AddType (new SimpleGen ("guint8", "byte", "0"));
- AddType (new SimpleGen ("gint16", "short", "0"));
- AddType (new SimpleGen ("guint16", "ushort", "0"));
- AddType (new SimpleGen ("gint32", "int", "0"));
- AddType (new SimpleGen ("guint32", "uint", "0"));
- AddType (new SimpleGen ("gint64", "long", "0"));
- AddType (new SimpleGen ("guint64", "ulong", "0"));
- AddType (new SimpleGen ("long long", "long", "0"));
- AddType (new SimpleGen ("gfloat", "float", "0.0"));
- AddType (new SimpleGen ("float", "float", "0.0"));
- AddType (new SimpleGen ("gdouble", "double", "0.0"));
- AddType (new SimpleGen ("double", "double", "0.0"));
- AddType (new SimpleGen ("goffset", "long", "0"));
- AddType (new SimpleGen ("GQuark", "int", "0"));
-
- // platform specific integer types.
-#if WIN64LONGS
- AddType (new SimpleGen ("long", "int", "0"));
- AddType (new SimpleGen ("glong", "int", "0"));
- AddType (new SimpleGen ("ulong", "uint", "0"));
- AddType (new SimpleGen ("gulong", "uint", "0"));
- AddType (new SimpleGen ("unsigned long", "uint", "0"));
-#else
- AddType (new LPGen ("long"));
- AddType (new LPGen ("glong"));
- AddType (new LPUGen ("ulong"));
- AddType (new LPUGen ("gulong"));
- AddType (new LPUGen ("unsigned long"));
-#endif
-
- AddType (new LPGen ("ssize_t"));
- AddType (new LPGen ("gssize"));
- AddType (new LPUGen ("size_t"));
- AddType (new LPUGen ("gsize"));
-
-#if OFF_T_8
- AddType (new AliasGen ("off_t", "long"));
-#else
- AddType (new LPGen ("off_t"));
-#endif
-
- // string types
- AddType (new ConstStringGen ("const-gchar"));
- AddType (new ConstStringGen ("const-xmlChar"));
- AddType (new ConstStringGen ("const-char"));
- AddType (new ConstFilenameGen ("const-gfilename"));
- AddType (new MarshalGen ("gfilename", "string", "IntPtr", "GLib.Marshaller.StringToFilenamePtr({0})", "GLib.Marshaller.FilenamePtrToStringGFree({0})"));
- AddType (new MarshalGen ("gchar", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
- AddType (new MarshalGen ("char", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
- AddType (new SimpleGen ("GStrv", "string[]", "null"));
-
- // manually wrapped types requiring more complex marshaling
- AddType (new ManualGen ("GInitiallyUnowned", "GLib.InitiallyUnowned", "GLib.Object.GetObject ({0})"));
- AddType (new ManualGen ("GObject", "GLib.Object", "GLib.Object.GetObject ({0})"));
- AddType (new ManualGen ("GList", "GLib.List"));
- AddType (new ManualGen ("GPtrArray", "GLib.PtrArray"));
- AddType (new ManualGen ("GSList", "GLib.SList"));
- AddType (new MarshalGen ("gunichar", "char", "uint", "GLib.Marshaller.CharToGUnichar ({0})", "GLib.Marshaller.GUnicharToChar ({0})"));
- AddType (new MarshalGen ("time_t", "System.DateTime", "IntPtr", "GLib.Marshaller.DateTimeTotime_t ({0})", "GLib.Marshaller.time_tToDateTime ({0})"));
- AddType (new MarshalGen ("GString", "string", "IntPtr", "new GLib.GString ({0}).Handle", "GLib.GString.PtrToString ({0})"));
- AddType (new MarshalGen ("GType", "GLib.GType", "IntPtr", "{0}.Val", "new GLib.GType({0})"));
- AddType (new ByRefGen ("GValue", "GLib.Value"));
- AddType (new SimpleGen ("GDestroyNotify", "GLib.DestroyNotify", "null"));
-
- // FIXME: These ought to be handled properly.
- AddType (new SimpleGen ("GC", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GError", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GMemChunk", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GTimeVal", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GClosure", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GArray", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GByteArray", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GData", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GIOChannel", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GTypeModule", "GLib.Object", "null"));
- AddType (new SimpleGen ("GHashTable", "System.IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("va_list", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GParamSpec", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("gconstpointer", "IntPtr", "IntPtr.Zero"));
- }
-
- public void AddType (IGeneratable gen)
- {
- types [gen.CName] = gen;
- }
-
- public void AddTypes (IGeneratable[] gens)
- {
- foreach (IGeneratable gen in gens)
- types [gen.CName] = gen;
- }
-
- public int Count {
- get
- {
- return types.Count;
- }
- }
-
- public IEnumerable Generatables {
- get {
- return types.Values;
- }
- }
-
- public IGeneratable this [string ctype] {
- get {
- return DeAlias (ctype) as IGeneratable;
- }
- }
-
- private bool IsConstString (string type)
- {
- switch (type) {
- case "const-gchar":
- case "const-char":
- case "const-xmlChar":
- case "const-gfilename":
- return true;
- default:
- return false;
- }
- }
-
- private string Trim(string type)
- {
- // HACK: If we don't detect this here, there is no
- // way of indicating it in the symbol table
- if (type == "void*" || type == "const-void*") return "gpointer";
-
- string trim_type = type.TrimEnd('*');
-
- if (IsConstString (trim_type))
- return trim_type;
-
- if (trim_type.StartsWith("const-")) return trim_type.Substring(6);
- return trim_type;
- }
-
- private object DeAlias (string type)
- {
- type = Trim (type);
- while (types [type] is AliasGen) {
- IGeneratable igen = types [type] as AliasGen;
- types [type] = types [igen.Name];
- type = igen.Name;
- }
-
- return types [type];
- }
-
- public string FromNativeReturn(string c_type, string val)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.FromNativeReturn (val);
- }
-
- public string ToNativeReturn(string c_type, string val)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.ToNativeReturn (val);
- }
-
- public string FromNative(string c_type, string val)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.FromNative (val);
- }
-
- public string GetCSType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.QualifiedName;
- }
-
- public string GetName(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.Name;
- }
-
- public string GetMarshalReturnType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.MarshalReturnType;
- }
-
- public string GetToNativeReturnType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.ToNativeReturnType;
- }
-
- public string GetMarshalType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.MarshalType;
- }
-
- public string CallByName(string c_type, string var_name)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.CallByName(var_name);
- }
-
- public bool IsOpaque(string c_type)
- {
- if (this[c_type] is OpaqueGen)
- return true;
-
- return false;
- }
-
- public bool IsBoxed(string c_type)
- {
- if (this[c_type] is BoxedGen)
- return true;
-
- return false;
- }
-
- public bool IsStruct(string c_type)
- {
- if (this[c_type] is StructGen)
- return true;
-
- return false;
- }
-
- public bool IsEnum(string c_type)
- {
- if (this[c_type] is EnumGen)
- return true;
-
- return false;
- }
-
- public bool IsEnumFlags(string c_type)
- {
- EnumGen gen = this [c_type] as EnumGen;
- return (gen != null && gen.Elem.GetAttribute ("type") == "flags");
- }
-
- public bool IsInterface(string c_type)
- {
- if (this[c_type] is InterfaceGen)
- return true;
-
- return false;
- }
-
- public ClassBase GetClassGen(string c_type)
- {
- return this[c_type] as ClassBase;
- }
-
- public bool IsObject(string c_type)
- {
- if (this[c_type] is ObjectGen)
- return true;
-
- return false;
- }
-
- public bool IsCallback(string c_type)
- {
- if (this[c_type] is CallbackGen)
- return true;
-
- return false;
- }
-
- public bool IsManuallyWrapped(string c_type)
- {
- if (this[c_type] is ManualGen)
- return true;
-
- return false;
- }
-
- public string MangleName(string name)
- {
- switch (name) {
- case "string":
- return "str1ng";
- case "event":
- return "evnt";
- case "null":
- return "is_null";
- case "object":
- return "objekt";
- case "params":
- return "parms";
- case "ref":
- return "reference";
- case "in":
- return "in_param";
- case "out":
- return "out_param";
- case "fixed":
- return "mfixed";
- case "byte":
- return "_byte";
- case "new":
- return "_new";
- case "base":
- return "_base";
- case "lock":
- return "_lock";
- case "callback":
- return "cb";
- case "readonly":
- return "read_only";
- case "interface":
- return "iface";
- case "internal":
- return "_internal";
- case "where":
- return "wh3r3";
- case "foreach":
- return "for_each";
- case "remove":
- return "_remove";
- default:
- break;
- }
-
- return name;
- }
- }
-}
+// GtkSharp.Generation.SymbolTable.cs - The Symbol Table Class.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+
+ public class SymbolTable {
+
+ static SymbolTable table = null;
+
+ Hashtable types = new Hashtable ();
+
+ public static SymbolTable Table {
+ get {
+ if (table == null)
+ table = new SymbolTable ();
+
+ return table;
+ }
+ }
+
+ public SymbolTable ()
+ {
+ // Simple easily mapped types
+ AddType (new SimpleGen ("void", "void", String.Empty));
+ AddType (new SimpleGen ("gpointer", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("gboolean", "bool", "false"));
+ AddType (new SimpleGen ("gint", "int", "0"));
+ AddType (new SimpleGen ("guint", "uint", "0"));
+ AddType (new SimpleGen ("int", "int", "0"));
+ AddType (new SimpleGen ("unsigned", "uint", "0"));
+ AddType (new SimpleGen ("unsigned int", "uint", "0"));
+ AddType (new SimpleGen ("unsigned-int", "uint", "0"));
+ AddType (new SimpleGen ("gshort", "short", "0"));
+ AddType (new SimpleGen ("gushort", "ushort", "0"));
+ AddType (new SimpleGen ("short", "short", "0"));
+ AddType (new SimpleGen ("guchar", "byte", "0"));
+ AddType (new SimpleGen ("unsigned char", "byte", "0"));
+ AddType (new SimpleGen ("unsigned-char", "byte", "0"));
+ AddType (new SimpleGen ("guint1", "bool", "false"));
+ AddType (new SimpleGen ("uint1", "bool", "false"));
+ AddType (new SimpleGen ("gint8", "sbyte", "0"));
+ AddType (new SimpleGen ("guint8", "byte", "0"));
+ AddType (new SimpleGen ("gint16", "short", "0"));
+ AddType (new SimpleGen ("guint16", "ushort", "0"));
+ AddType (new SimpleGen ("gint32", "int", "0"));
+ AddType (new SimpleGen ("guint32", "uint", "0"));
+ AddType (new SimpleGen ("gint64", "long", "0"));
+ AddType (new SimpleGen ("guint64", "ulong", "0"));
+ AddType (new SimpleGen ("long long", "long", "0"));
+ AddType (new SimpleGen ("gfloat", "float", "0.0"));
+ AddType (new SimpleGen ("float", "float", "0.0"));
+ AddType (new SimpleGen ("gdouble", "double", "0.0"));
+ AddType (new SimpleGen ("double", "double", "0.0"));
+ AddType (new SimpleGen ("goffset", "long", "0"));
+ AddType (new SimpleGen ("GQuark", "int", "0"));
+
+ // platform specific integer types.
+#if WIN64LONGS
+ AddType (new SimpleGen ("long", "int", "0"));
+ AddType (new SimpleGen ("glong", "int", "0"));
+ AddType (new SimpleGen ("ulong", "uint", "0"));
+ AddType (new SimpleGen ("gulong", "uint", "0"));
+ AddType (new SimpleGen ("unsigned long", "uint", "0"));
+#else
+ AddType (new LPGen ("long"));
+ AddType (new LPGen ("glong"));
+ AddType (new LPUGen ("ulong"));
+ AddType (new LPUGen ("gulong"));
+ AddType (new LPUGen ("unsigned long"));
+#endif
+
+ AddType (new LPGen ("ssize_t"));
+ AddType (new LPGen ("gssize"));
+ AddType (new LPUGen ("size_t"));
+ AddType (new LPUGen ("gsize"));
+
+#if OFF_T_8
+ AddType (new AliasGen ("off_t", "long"));
+#else
+ AddType (new LPGen ("off_t"));
+#endif
+
+ // string types
+ AddType (new ConstStringGen ("const-gchar"));
+ AddType (new ConstStringGen ("const-xmlChar"));
+ AddType (new ConstStringGen ("const-char"));
+ AddType (new ConstFilenameGen ("const-gfilename"));
+ AddType (new MarshalGen ("gfilename", "string", "IntPtr", "GLib.Marshaller.StringToFilenamePtr({0})", "GLib.Marshaller.FilenamePtrToStringGFree({0})"));
+ AddType (new MarshalGen ("gchar", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
+ AddType (new MarshalGen ("char", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
+ AddType (new SimpleGen ("GStrv", "string[]", "null"));
+
+ // manually wrapped types requiring more complex marshaling
+ AddType (new ManualGen ("GInitiallyUnowned", "GLib.InitiallyUnowned", "GLib.Object.GetObject ({0})"));
+ AddType (new ManualGen ("GObject", "GLib.Object", "GLib.Object.GetObject ({0})"));
+ AddType (new ManualGen ("GList", "GLib.List"));
+ AddType (new ManualGen ("GPtrArray", "GLib.PtrArray"));
+ AddType (new ManualGen ("GSList", "GLib.SList"));
+ AddType (new MarshalGen ("gunichar", "char", "uint", "GLib.Marshaller.CharToGUnichar ({0})", "GLib.Marshaller.GUnicharToChar ({0})"));
+ AddType (new MarshalGen ("time_t", "System.DateTime", "IntPtr", "GLib.Marshaller.DateTimeTotime_t ({0})", "GLib.Marshaller.time_tToDateTime ({0})"));
+ AddType (new MarshalGen ("GString", "string", "IntPtr", "new GLib.GString ({0}).Handle", "GLib.GString.PtrToString ({0})"));
+ AddType (new MarshalGen ("GType", "GLib.GType", "IntPtr", "{0}.Val", "new GLib.GType({0})"));
+ AddType (new ByRefGen ("GValue", "GLib.Value"));
+ AddType (new SimpleGen ("GDestroyNotify", "GLib.DestroyNotify", "null"));
+
+ // FIXME: These ought to be handled properly.
+ AddType (new SimpleGen ("GC", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GError", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GMemChunk", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GTimeVal", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GClosure", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GArray", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GByteArray", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GData", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GIOChannel", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GTypeModule", "GLib.Object", "null"));
+ AddType (new SimpleGen ("GHashTable", "System.IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("va_list", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GParamSpec", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("gconstpointer", "IntPtr", "IntPtr.Zero"));
+ }
+
+ public void AddType (IGeneratable gen)
+ {
+ types [gen.CName] = gen;
+ }
+
+ public void AddTypes (IGeneratable[] gens)
+ {
+ foreach (IGeneratable gen in gens)
+ types [gen.CName] = gen;
+ }
+
+ public int Count {
+ get
+ {
+ return types.Count;
+ }
+ }
+
+ public IEnumerable Generatables {
+ get {
+ return types.Values;
+ }
+ }
+
+ public IGeneratable this [string ctype] {
+ get {
+ return DeAlias (ctype) as IGeneratable;
+ }
+ }
+
+ private bool IsConstString (string type)
+ {
+ switch (type) {
+ case "const-gchar":
+ case "const-char":
+ case "const-xmlChar":
+ case "const-gfilename":
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ private string Trim(string type)
+ {
+ // HACK: If we don't detect this here, there is no
+ // way of indicating it in the symbol table
+ if (type == "void*" || type == "const-void*") return "gpointer";
+
+ string trim_type = type.TrimEnd('*');
+
+ if (IsConstString (trim_type))
+ return trim_type;
+
+ if (trim_type.StartsWith("const-")) return trim_type.Substring(6);
+ return trim_type;
+ }
+
+ private object DeAlias (string type)
+ {
+ type = Trim (type);
+ while (types [type] is AliasGen) {
+ IGeneratable igen = types [type] as AliasGen;
+ types [type] = types [igen.Name];
+ type = igen.Name;
+ }
+
+ return types [type];
+ }
+
+ public string FromNativeReturn(string c_type, string val)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.FromNativeReturn (val);
+ }
+
+ public string ToNativeReturn(string c_type, string val)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.ToNativeReturn (val);
+ }
+
+ public string FromNative(string c_type, string val)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.FromNative (val);
+ }
+
+ public string GetCSType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.QualifiedName;
+ }
+
+ public string GetName(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.Name;
+ }
+
+ public string GetMarshalReturnType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.MarshalReturnType;
+ }
+
+ public string GetToNativeReturnType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.ToNativeReturnType;
+ }
+
+ public string GetMarshalType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.MarshalType;
+ }
+
+ public string CallByName(string c_type, string var_name)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.CallByName(var_name);
+ }
+
+ public bool IsOpaque(string c_type)
+ {
+ if (this[c_type] is OpaqueGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsBoxed(string c_type)
+ {
+ if (this[c_type] is BoxedGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsStruct(string c_type)
+ {
+ if (this[c_type] is StructGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsEnum(string c_type)
+ {
+ if (this[c_type] is EnumGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsEnumFlags(string c_type)
+ {
+ EnumGen gen = this [c_type] as EnumGen;
+ return (gen != null && gen.Elem.GetAttribute ("type") == "flags");
+ }
+
+ public bool IsInterface(string c_type)
+ {
+ if (this[c_type] is InterfaceGen)
+ return true;
+
+ return false;
+ }
+
+ public ClassBase GetClassGen(string c_type)
+ {
+ return this[c_type] as ClassBase;
+ }
+
+ public bool IsObject(string c_type)
+ {
+ if (this[c_type] is ObjectGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsCallback(string c_type)
+ {
+ if (this[c_type] is CallbackGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsManuallyWrapped(string c_type)
+ {
+ if (this[c_type] is ManualGen)
+ return true;
+
+ return false;
+ }
+
+ public string MangleName(string name)
+ {
+ switch (name) {
+ case "string":
+ return "str1ng";
+ case "event":
+ return "evnt";
+ case "null":
+ return "is_null";
+ case "object":
+ return "objekt";
+ case "params":
+ return "parms";
+ case "ref":
+ return "reference";
+ case "in":
+ return "in_param";
+ case "out":
+ return "out_param";
+ case "fixed":
+ return "mfixed";
+ case "byte":
+ return "_byte";
+ case "new":
+ return "_new";
+ case "base":
+ return "_base";
+ case "lock":
+ return "_lock";
+ case "callback":
+ return "cb";
+ case "readonly":
+ return "read_only";
+ case "interface":
+ return "iface";
+ case "internal":
+ return "_internal";
+ case "where":
+ return "wh3r3";
+ case "foreach":
+ return "for_each";
+ case "remove":
+ return "_remove";
+ default:
+ break;
+ }
+
+ return name;
+ }
+ }
+}
diff --git a/lib/gio-sharp/generator/VMSignature.cs b/lib/gio-sharp/generator/VMSignature.cs
index fe0ebf1..5937c0a 100644
--- a/lib/gio-sharp/generator/VMSignature.cs
+++ b/lib/gio-sharp/generator/VMSignature.cs
@@ -1,75 +1,75 @@
-// GtkSharp.Generation.VMSignature.cs - The Virtual Method Signature Generation Class.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.Xml;
-
- public class VMSignature {
-
- private ArrayList parms = new ArrayList ();
-
- public VMSignature (Parameters parms)
- {
- bool has_cb = parms.HideData;
- for (int i = 1; i < parms.Count; i++) {
- Parameter p = parms [i];
-
- if (i > 1 && p.IsLength && parms [i - 1].IsString)
- continue;
-
- if (p.IsCount && ((i > 1 && parms [i - 1].IsArray) || (i < parms.Count - 1 && parms [i + 1].IsArray)))
- continue;
-
- has_cb = has_cb || p.Generatable is CallbackGen;
- if (p.IsUserData && has_cb)
- continue;
-
- if (p.CType == "GError**")
- continue;
-
- if (p.Scope == "notified")
- i += 2;
-
- this.parms.Add (p);
- }
- }
-
- public override string ToString ()
- {
- if (parms.Count == 0)
- return "";
-
- string[] result = new string [parms.Count];
- int i = 0;
-
- foreach (Parameter p in parms) {
- result [i] = p.PassAs != "" ? p.PassAs + " " : "";
- result [i++] += p.CSType + " " + p.Name;
- }
-
- return String.Join (", ", result);
- }
- }
-}
-
+// GtkSharp.Generation.VMSignature.cs - The Virtual Method Signature Generation Class.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.Xml;
+
+ public class VMSignature {
+
+ private ArrayList parms = new ArrayList ();
+
+ public VMSignature (Parameters parms)
+ {
+ bool has_cb = parms.HideData;
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+
+ if (i > 1 && p.IsLength && parms [i - 1].IsString)
+ continue;
+
+ if (p.IsCount && ((i > 1 && parms [i - 1].IsArray) || (i < parms.Count - 1 && parms [i + 1].IsArray)))
+ continue;
+
+ has_cb = has_cb || p.Generatable is CallbackGen;
+ if (p.IsUserData && has_cb)
+ continue;
+
+ if (p.CType == "GError**")
+ continue;
+
+ if (p.Scope == "notified")
+ i += 2;
+
+ this.parms.Add (p);
+ }
+ }
+
+ public override string ToString ()
+ {
+ if (parms.Count == 0)
+ return "";
+
+ string[] result = new string [parms.Count];
+ int i = 0;
+
+ foreach (Parameter p in parms) {
+ result [i] = p.PassAs != "" ? p.PassAs + " " : "";
+ result [i++] += p.CSType + " " + p.Name;
+ }
+
+ return String.Join (", ", result);
+ }
+ }
+}
+
diff --git a/lib/gio-sharp/gio/snk b/lib/gio-sharp/gio/snk
old mode 100755
new mode 100644
diff --git a/lib/unique-sharp/generator/AliasGen.cs b/lib/unique-sharp/generator/AliasGen.cs
index 19911d6..3134aa7 100644
--- a/lib/unique-sharp/generator/AliasGen.cs
+++ b/lib/unique-sharp/generator/AliasGen.cs
@@ -1,30 +1,30 @@
-// GtkSharp.Generation.AliasGen.cs - The Alias type Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class AliasGen : SimpleBase {
-
- public AliasGen (string ctype, string type) : base (ctype, type, String.Empty) {}
- }
-}
-
+// GtkSharp.Generation.AliasGen.cs - The Alias type Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class AliasGen : SimpleBase {
+
+ public AliasGen (string ctype, string type) : base (ctype, type, String.Empty) {}
+ }
+}
+
diff --git a/lib/unique-sharp/generator/BoxedGen.cs b/lib/unique-sharp/generator/BoxedGen.cs
index 759868c..6f0321d 100644
--- a/lib/unique-sharp/generator/BoxedGen.cs
+++ b/lib/unique-sharp/generator/BoxedGen.cs
@@ -1,82 +1,82 @@
-// GtkSharp.Generation.BoxedGen.cs - The Boxed Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
- using System.Xml;
-
- public class BoxedGen : StructBase {
-
- public BoxedGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override void Generate (GenerationInfo gen_info)
- {
- Method copy = methods["Copy"] as Method;
- methods.Remove ("Copy");
- methods.Remove ("Free");
-
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
- base.Generate (gen_info);
- sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
- sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);");
- sw.WriteLine ();
- sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
- sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");
- sw.WriteLine ("\t\t{");
-
- sw.WriteLine ("\t\t\tGLib.Value val = GLib.Value.Empty;");
- sw.WriteLine ("\t\t\tval.Init (" + QualifiedName + ".GType);");
- sw.WriteLine ("\t\t\tglibsharp_value_set_boxed (ref val, ref boxed);");
- sw.WriteLine ("\t\t\treturn val;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static explicit operator " + QualifiedName + " (GLib.Value val)");
- sw.WriteLine ("\t\t{");
-
- sw.WriteLine ("\t\t\tIntPtr boxed_ptr = glibsharp_value_get_boxed (ref val);");
- sw.WriteLine ("\t\t\treturn New (boxed_ptr);");
- sw.WriteLine ("\t\t}");
-
- if (copy != null && copy.IsDeprecated) {
- sw.WriteLine ();
- sw.WriteLine ("\t\t[Obsolete(\"This is a no-op\")]");
- sw.WriteLine ("\t\tpublic " + QualifiedName + " Copy() {");
- sw.WriteLine ("\t\t\treturn this;");
- sw.WriteLine ("\t\t}");
- }
-
- sw.WriteLine ("#endregion");
- AppendCustom(sw, gen_info.CustomDir);
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- Statistics.BoxedCount++;
- }
- }
-}
-
+// GtkSharp.Generation.BoxedGen.cs - The Boxed Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+ using System.Xml;
+
+ public class BoxedGen : StructBase {
+
+ public BoxedGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ Method copy = methods["Copy"] as Method;
+ methods.Remove ("Copy");
+ methods.Remove ("Free");
+
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ base.Generate (gen_info);
+ sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
+ sw.WriteLine ("\t\tstatic extern IntPtr glibsharp_value_get_boxed (ref GLib.Value val);");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t[DllImport(\"glibsharpglue-2\")]");
+ sw.WriteLine ("\t\tstatic extern void glibsharp_value_set_boxed (ref GLib.Value val, ref " + QualifiedName + " boxed);");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static explicit operator GLib.Value (" + QualifiedName + " boxed)");
+ sw.WriteLine ("\t\t{");
+
+ sw.WriteLine ("\t\t\tGLib.Value val = GLib.Value.Empty;");
+ sw.WriteLine ("\t\t\tval.Init (" + QualifiedName + ".GType);");
+ sw.WriteLine ("\t\t\tglibsharp_value_set_boxed (ref val, ref boxed);");
+ sw.WriteLine ("\t\t\treturn val;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static explicit operator " + QualifiedName + " (GLib.Value val)");
+ sw.WriteLine ("\t\t{");
+
+ sw.WriteLine ("\t\t\tIntPtr boxed_ptr = glibsharp_value_get_boxed (ref val);");
+ sw.WriteLine ("\t\t\treturn New (boxed_ptr);");
+ sw.WriteLine ("\t\t}");
+
+ if (copy != null && copy.IsDeprecated) {
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t[Obsolete(\"This is a no-op\")]");
+ sw.WriteLine ("\t\tpublic " + QualifiedName + " Copy() {");
+ sw.WriteLine ("\t\t\treturn this;");
+ sw.WriteLine ("\t\t}");
+ }
+
+ sw.WriteLine ("#endregion");
+ AppendCustom(sw, gen_info.CustomDir);
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.BoxedCount++;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/ByRefGen.cs b/lib/unique-sharp/generator/ByRefGen.cs
index 7a2641e..232c325 100644
--- a/lib/unique-sharp/generator/ByRefGen.cs
+++ b/lib/unique-sharp/generator/ByRefGen.cs
@@ -1,63 +1,63 @@
-// GtkSharp.Generation.ByRefGen.cs - The ByRef type Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ByRefGen : SimpleBase, IManualMarshaler {
-
- public ByRefGen (string ctype, string type) : base (ctype, type, type + ".Empty") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "native_" + var_name;
- }
-
- public string AllocNative ()
- {
- return "Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + QualifiedName + ")))";
- }
-
- public string AllocNative (string var_name)
- {
- return "GLib.Marshaller.StructureToPtrAlloc (" + var_name + ")";
- }
-
- public override string FromNative (string var_name)
- {
- return String.Format ("({0}) Marshal.PtrToStructure ({1}, typeof ({0}))", QualifiedName, var_name);
- }
-
- public string ReleaseNative (string var_name)
- {
- return "Marshal.FreeHGlobal (" + var_name + ")";
- }
- }
-}
-
+// GtkSharp.Generation.ByRefGen.cs - The ByRef type Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ByRefGen : SimpleBase, IManualMarshaler {
+
+ public ByRefGen (string ctype, string type) : base (ctype, type, type + ".Empty") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "native_" + var_name;
+ }
+
+ public string AllocNative ()
+ {
+ return "Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + QualifiedName + ")))";
+ }
+
+ public string AllocNative (string var_name)
+ {
+ return "GLib.Marshaller.StructureToPtrAlloc (" + var_name + ")";
+ }
+
+ public override string FromNative (string var_name)
+ {
+ return String.Format ("({0}) Marshal.PtrToStructure ({1}, typeof ({0}))", QualifiedName, var_name);
+ }
+
+ public string ReleaseNative (string var_name)
+ {
+ return "Marshal.FreeHGlobal (" + var_name + ")";
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/ChildProperty.cs b/lib/unique-sharp/generator/ChildProperty.cs
index fe361ed..a3041d0 100644
--- a/lib/unique-sharp/generator/ChildProperty.cs
+++ b/lib/unique-sharp/generator/ChildProperty.cs
@@ -1,45 +1,45 @@
-// GtkSharp.Generation.ChildProperty.cs - GtkContainer child properties
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class ChildProperty : Property {
-
- public ChildProperty (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
-
- protected override string PropertyAttribute (string qpname) {
- return "[Gtk.ChildProperty (" + qpname + ")]";
- }
-
- protected override string RawGetter (string qpname) {
- return "parent.ChildGetProperty (child, " + qpname + ")";
- }
-
- protected override string RawSetter (string qpname) {
- return "parent.ChildSetProperty(child, " + qpname + ", val)";
- }
-
- }
-}
-
+// GtkSharp.Generation.ChildProperty.cs - GtkContainer child properties
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class ChildProperty : Property {
+
+ public ChildProperty (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
+
+ protected override string PropertyAttribute (string qpname) {
+ return "[Gtk.ChildProperty (" + qpname + ")]";
+ }
+
+ protected override string RawGetter (string qpname) {
+ return "parent.ChildGetProperty (child, " + qpname + ")";
+ }
+
+ protected override string RawSetter (string qpname) {
+ return "parent.ChildSetProperty(child, " + qpname + ", val)";
+ }
+
+ }
+}
+
diff --git a/lib/unique-sharp/generator/ClassGen.cs b/lib/unique-sharp/generator/ClassGen.cs
index 700a27a..9f4a2f2 100644
--- a/lib/unique-sharp/generator/ClassGen.cs
+++ b/lib/unique-sharp/generator/ClassGen.cs
@@ -1,94 +1,94 @@
-// GtkSharp.Generation.ClassGen.cs - The Class Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Text;
- using System.Xml;
-
- public class ClassGen : ClassBase {
-
- public ClassGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override string AssignToName {
- get {
- return String.Empty;
- }
- }
-
- public override string MarshalType {
- get {
- return String.Empty;
- }
- }
-
- public override string CallByName ()
- {
- return String.Empty;
- }
-
- public override string CallByName (string var)
- {
- return String.Empty;
- }
-
- public override string FromNative (string var)
- {
- return String.Empty;
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream(Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- sw.WriteLine ("#region Autogenerated code");
- if (IsDeprecated)
- sw.WriteLine ("\t[Obsolete]");
- sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
- sw.WriteLine (" {");
- sw.WriteLine ();
-
- GenProperties (gen_info, null);
- GenMethods (gen_info, null, null);
-
- sw.WriteLine ("#endregion");
- AppendCustom(sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
-
- sw.Close ();
- gen_info.Writer = null;
- }
- }
-}
-
+// GtkSharp.Generation.ClassGen.cs - The Class Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Text;
+ using System.Xml;
+
+ public class ClassGen : ClassBase {
+
+ public ClassGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override string AssignToName {
+ get {
+ return String.Empty;
+ }
+ }
+
+ public override string MarshalType {
+ get {
+ return String.Empty;
+ }
+ }
+
+ public override string CallByName ()
+ {
+ return String.Empty;
+ }
+
+ public override string CallByName (string var)
+ {
+ return String.Empty;
+ }
+
+ public override string FromNative (string var)
+ {
+ return String.Empty;
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream(Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ sw.WriteLine ("#region Autogenerated code");
+ if (IsDeprecated)
+ sw.WriteLine ("\t[Obsolete]");
+ sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
+ sw.WriteLine (" {");
+ sw.WriteLine ();
+
+ GenProperties (gen_info, null);
+ GenMethods (gen_info, null, null);
+
+ sw.WriteLine ("#endregion");
+ AppendCustom(sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+
+ sw.Close ();
+ gen_info.Writer = null;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/CodeGenerator.cs b/lib/unique-sharp/generator/CodeGenerator.cs
index f45c7a0..dfb9526 100644
--- a/lib/unique-sharp/generator/CodeGenerator.cs
+++ b/lib/unique-sharp/generator/CodeGenerator.cs
@@ -1,122 +1,122 @@
-// GtkSharp.Generation.CodeGenerator.cs - The main code generation engine.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.Xml;
-
- public class CodeGenerator {
-
- public static int Main (string[] args)
- {
- if (args.Length < 2) {
- Console.WriteLine ("Usage: codegen --generate <filename1...>");
- return 0;
- }
-
- bool generate = false;
- string dir = "";
- string custom_dir = "";
- string assembly_name = "";
- string glue_filename = "";
- string glue_includes = "";
- string gluelib_name = "";
-
- SymbolTable table = SymbolTable.Table;
- ArrayList gens = new ArrayList ();
- foreach (string arg in args) {
- string filename = arg;
- if (arg == "--generate") {
- generate = true;
- continue;
- } else if (arg == "--include") {
- generate = false;
- continue;
- } else if (arg.StartsWith ("-I:")) {
- generate = false;
- filename = filename.Substring (3);
- } else if (arg.StartsWith ("--outdir=")) {
- generate = false;
- dir = arg.Substring (9);
- continue;
- } else if (arg.StartsWith ("--customdir=")) {
- generate = false;
- custom_dir = arg.Substring (12);
- continue;
- } else if (arg.StartsWith ("--assembly-name=")) {
- generate = false;
- assembly_name = arg.Substring (16);
- continue;
- } else if (arg.StartsWith ("--glue-filename=")) {
- generate = false;
- glue_filename = arg.Substring (16);
- continue;
- } else if (arg.StartsWith ("--glue-includes=")) {
- generate = false;
- glue_includes = arg.Substring (16);
- continue;
- } else if (arg.StartsWith ("--gluelib-name=")) {
- generate = false;
- gluelib_name = arg.Substring (15);
- continue;
- }
-
- Parser p = new Parser ();
- IGeneratable[] curr_gens = p.Parse (filename);
- table.AddTypes (curr_gens);
- if (generate)
- gens.AddRange (curr_gens);
- }
-
- // Now that everything is loaded, validate all the to-be-
- // generated generatables and then remove the invalid ones.
- ArrayList invalids = new ArrayList ();
- foreach (IGeneratable gen in gens) {
- if (!gen.Validate ())
- invalids.Add (gen);
- }
- foreach (IGeneratable gen in invalids)
- gens.Remove (gen);
-
- GenerationInfo gen_info = null;
- if (dir != "" || assembly_name != "" || glue_filename != "" || glue_includes != "" || gluelib_name != "")
- gen_info = new GenerationInfo (dir, custom_dir, assembly_name, glue_filename, glue_includes, gluelib_name);
-
- foreach (IGeneratable gen in gens) {
- if (gen_info == null)
- gen.Generate ();
- else
- gen.Generate (gen_info);
- }
-
- ObjectGen.GenerateMappers ();
-
- if (gen_info != null)
- gen_info.CloseGlueWriter ();
-
- Statistics.Report();
- return 0;
- }
- }
-}
+// GtkSharp.Generation.CodeGenerator.cs - The main code generation engine.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.Xml;
+
+ public class CodeGenerator {
+
+ public static int Main (string[] args)
+ {
+ if (args.Length < 2) {
+ Console.WriteLine ("Usage: codegen --generate <filename1...>");
+ return 0;
+ }
+
+ bool generate = false;
+ string dir = "";
+ string custom_dir = "";
+ string assembly_name = "";
+ string glue_filename = "";
+ string glue_includes = "";
+ string gluelib_name = "";
+
+ SymbolTable table = SymbolTable.Table;
+ ArrayList gens = new ArrayList ();
+ foreach (string arg in args) {
+ string filename = arg;
+ if (arg == "--generate") {
+ generate = true;
+ continue;
+ } else if (arg == "--include") {
+ generate = false;
+ continue;
+ } else if (arg.StartsWith ("-I:")) {
+ generate = false;
+ filename = filename.Substring (3);
+ } else if (arg.StartsWith ("--outdir=")) {
+ generate = false;
+ dir = arg.Substring (9);
+ continue;
+ } else if (arg.StartsWith ("--customdir=")) {
+ generate = false;
+ custom_dir = arg.Substring (12);
+ continue;
+ } else if (arg.StartsWith ("--assembly-name=")) {
+ generate = false;
+ assembly_name = arg.Substring (16);
+ continue;
+ } else if (arg.StartsWith ("--glue-filename=")) {
+ generate = false;
+ glue_filename = arg.Substring (16);
+ continue;
+ } else if (arg.StartsWith ("--glue-includes=")) {
+ generate = false;
+ glue_includes = arg.Substring (16);
+ continue;
+ } else if (arg.StartsWith ("--gluelib-name=")) {
+ generate = false;
+ gluelib_name = arg.Substring (15);
+ continue;
+ }
+
+ Parser p = new Parser ();
+ IGeneratable[] curr_gens = p.Parse (filename);
+ table.AddTypes (curr_gens);
+ if (generate)
+ gens.AddRange (curr_gens);
+ }
+
+ // Now that everything is loaded, validate all the to-be-
+ // generated generatables and then remove the invalid ones.
+ ArrayList invalids = new ArrayList ();
+ foreach (IGeneratable gen in gens) {
+ if (!gen.Validate ())
+ invalids.Add (gen);
+ }
+ foreach (IGeneratable gen in invalids)
+ gens.Remove (gen);
+
+ GenerationInfo gen_info = null;
+ if (dir != "" || assembly_name != "" || glue_filename != "" || glue_includes != "" || gluelib_name != "")
+ gen_info = new GenerationInfo (dir, custom_dir, assembly_name, glue_filename, glue_includes, gluelib_name);
+
+ foreach (IGeneratable gen in gens) {
+ if (gen_info == null)
+ gen.Generate ();
+ else
+ gen.Generate (gen_info);
+ }
+
+ ObjectGen.GenerateMappers ();
+
+ if (gen_info != null)
+ gen_info.CloseGlueWriter ();
+
+ Statistics.Report();
+ return 0;
+ }
+ }
+}
diff --git a/lib/unique-sharp/generator/ConstFilenameGen.cs b/lib/unique-sharp/generator/ConstFilenameGen.cs
index 562ab9c..f094aa1 100644
--- a/lib/unique-sharp/generator/ConstFilenameGen.cs
+++ b/lib/unique-sharp/generator/ConstFilenameGen.cs
@@ -1,52 +1,52 @@
-// ConstFilenameGen.cs - The Const Filename type Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ConstFilenameGen : SimpleBase, IManualMarshaler {
-
- public ConstFilenameGen (string ctype) : base (ctype, "string", "null") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string FromNative (string var)
- {
- return "GLib.Marshaller.FilenamePtrToString (" + var + ")";
- }
-
- public string AllocNative (string managed_var)
- {
- return "GLib.Marshaller.StringToFilenamePtr (" + managed_var + ")";
- }
-
- public string ReleaseNative (string native_var)
- {
- return "GLib.Marshaller.Free (" + native_var + ")";
- }
- }
-}
-
+// ConstFilenameGen.cs - The Const Filename type Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ConstFilenameGen : SimpleBase, IManualMarshaler {
+
+ public ConstFilenameGen (string ctype) : base (ctype, "string", "null") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string FromNative (string var)
+ {
+ return "GLib.Marshaller.FilenamePtrToString (" + var + ")";
+ }
+
+ public string AllocNative (string managed_var)
+ {
+ return "GLib.Marshaller.StringToFilenamePtr (" + managed_var + ")";
+ }
+
+ public string ReleaseNative (string native_var)
+ {
+ return "GLib.Marshaller.Free (" + native_var + ")";
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/ConstStringGen.cs b/lib/unique-sharp/generator/ConstStringGen.cs
index 70f882e..adef8d3 100644
--- a/lib/unique-sharp/generator/ConstStringGen.cs
+++ b/lib/unique-sharp/generator/ConstStringGen.cs
@@ -1,59 +1,59 @@
-// GtkSharp.Generation.ConstStringGen.cs - The Const String type Generatable.
-//
-// Author: Rachel Hestilow <rachel nullenvoid com>
-// Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2003 Rachel Hestilow
-// Copyright (c) 2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ConstStringGen : SimpleBase, IManualMarshaler {
-
- public ConstStringGen (string ctype) : base (ctype, "string", "null") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string FromNative (string var)
- {
- return "GLib.Marshaller.Utf8PtrToString (" + var + ")";
- }
-
- public override string ToNativeReturn (string var)
- {
- return "GLib.Marshaller.StringToPtrGStrdup (" + var + ")";
- }
-
- public string AllocNative (string managed_var)
- {
- return "GLib.Marshaller.StringToPtrGStrdup (" + managed_var + ")";
- }
-
- public string ReleaseNative (string native_var)
- {
- return "GLib.Marshaller.Free (" + native_var + ")";
- }
- }
-}
-
+// GtkSharp.Generation.ConstStringGen.cs - The Const String type Generatable.
+//
+// Author: Rachel Hestilow <rachel nullenvoid com>
+// Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2003 Rachel Hestilow
+// Copyright (c) 2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ConstStringGen : SimpleBase, IManualMarshaler {
+
+ public ConstStringGen (string ctype) : base (ctype, "string", "null") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string FromNative (string var)
+ {
+ return "GLib.Marshaller.Utf8PtrToString (" + var + ")";
+ }
+
+ public override string ToNativeReturn (string var)
+ {
+ return "GLib.Marshaller.StringToPtrGStrdup (" + var + ")";
+ }
+
+ public string AllocNative (string managed_var)
+ {
+ return "GLib.Marshaller.StringToPtrGStrdup (" + managed_var + ")";
+ }
+
+ public string ReleaseNative (string native_var)
+ {
+ return "GLib.Marshaller.Free (" + native_var + ")";
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/Ctor.cs b/lib/unique-sharp/generator/Ctor.cs
index 9d57043..d6a427e 100644
--- a/lib/unique-sharp/generator/Ctor.cs
+++ b/lib/unique-sharp/generator/Ctor.cs
@@ -1,165 +1,165 @@
-// GtkSharp.Generation.Ctor.cs - The Constructor Generation Class.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004-2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Ctor : MethodBase {
-
- private bool preferred;
- private string name;
- private bool needs_chaining = false;
-
- public Ctor (XmlElement elem, ClassBase implementor) : base (elem, implementor)
- {
- if (elem.HasAttribute ("preferred"))
- preferred = true;
- if (implementor is ObjectGen)
- needs_chaining = true;
- name = implementor.Name;
- }
-
- public bool Preferred {
- get { return preferred; }
- set { preferred = value; }
- }
-
- public string StaticName {
- get {
- if (!IsStatic)
- return String.Empty;
-
- string[] toks = CName.Substring(CName.IndexOf("new")).Split ('_');
- string result = String.Empty;
-
- foreach (string tok in toks)
- result += tok.Substring(0,1).ToUpper() + tok.Substring(1);
- return result;
- }
- }
-
- void GenerateImport (StreamWriter sw)
- {
- sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
- sw.WriteLine("\t\tstatic extern " + Safety + "IntPtr " + CName + "(" + Parameters.ImportSignature + ");");
- sw.WriteLine();
- }
-
- void GenerateStatic (GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.Writer;
+// GtkSharp.Generation.Ctor.cs - The Constructor Generation Class.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Ctor : MethodBase {
+
+ private bool preferred;
+ private string name;
+ private bool needs_chaining = false;
+
+ public Ctor (XmlElement elem, ClassBase implementor) : base (elem, implementor)
+ {
+ if (elem.HasAttribute ("preferred"))
+ preferred = true;
+ if (implementor is ObjectGen)
+ needs_chaining = true;
+ name = implementor.Name;
+ }
+
+ public bool Preferred {
+ get { return preferred; }
+ set { preferred = value; }
+ }
+
+ public string StaticName {
+ get {
+ if (!IsStatic)
+ return String.Empty;
+
+ string[] toks = CName.Substring(CName.IndexOf("new")).Split ('_');
+ string result = String.Empty;
+
+ foreach (string tok in toks)
+ result += tok.Substring(0,1).ToUpper() + tok.Substring(1);
+ return result;
+ }
+ }
+
+ void GenerateImport (StreamWriter sw)
+ {
+ sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
+ sw.WriteLine("\t\tstatic extern " + Safety + "IntPtr " + CName + "(" + Parameters.ImportSignature + ");");
+ sw.WriteLine();
+ }
+
+ void GenerateStatic (GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.Writer;
sw.WriteLine("\t\t" + Protection + " static " + Safety + Modifiers + name + " " + StaticName + "(" + Signature + ")");
- sw.WriteLine("\t\t{");
-
- Body.Initialize(gen_info, false, false, "");
-
- sw.Write("\t\t\t" + name + " result = ");
- if (container_type is StructBase)
- sw.Write ("{0}.New (", name);
- else
- sw.Write ("new {0} (", name);
- sw.WriteLine (CName + "(" + Body.GetCallString (false) + "));");
- Body.Finish (sw, "");
- Body.HandleException (sw, "");
- sw.WriteLine ("\t\t\treturn result;");
- }
-
- public void Generate (GenerationInfo gen_info)
- {
- if (!Validate ())
- return;
-
- StreamWriter sw = gen_info.Writer;
- gen_info.CurrentMember = CName;
-
- GenerateImport (sw);
-
- if (IsStatic)
- GenerateStatic (gen_info);
- else {
+ sw.WriteLine("\t\t{");
+
+ Body.Initialize(gen_info, false, false, "");
+
+ sw.Write("\t\t\t" + name + " result = ");
+ if (container_type is StructBase)
+ sw.Write ("{0}.New (", name);
+ else
+ sw.Write ("new {0} (", name);
+ sw.WriteLine (CName + "(" + Body.GetCallString (false) + "));");
+ Body.Finish (sw, "");
+ Body.HandleException (sw, "");
+ sw.WriteLine ("\t\t\treturn result;");
+ }
+
+ public void Generate (GenerationInfo gen_info)
+ {
+ if (!Validate ())
+ return;
+
+ StreamWriter sw = gen_info.Writer;
+ gen_info.CurrentMember = CName;
+
+ GenerateImport (sw);
+
+ if (IsStatic)
+ GenerateStatic (gen_info);
+ else {
sw.WriteLine("\t\t{0} {1}{2} ({3}) {4}", Protection, Safety, name, Signature.ToString(), needs_chaining ? ": base (IntPtr.Zero)" : "");
- sw.WriteLine("\t\t{");
-
- if (needs_chaining) {
- sw.WriteLine ("\t\t\tif (GetType () != typeof (" + name + ")) {");
-
- if (Parameters.Count == 0) {
- sw.WriteLine ("\t\t\t\tCreateNativeObject (new string [0], new GLib.Value[0]);");
- sw.WriteLine ("\t\t\t\treturn;");
- } else {
- ArrayList names = new ArrayList ();
- ArrayList values = new ArrayList ();
- for (int i = 0; i < Parameters.Count; i++) {
- Parameter p = Parameters[i];
- if (container_type.GetPropertyRecursively (p.StudlyName) != null) {
- names.Add (p.Name);
- values.Add (p.Name);
- } else if (p.PropertyName != String.Empty) {
- names.Add (p.PropertyName);
- values.Add (p.Name);
- }
- }
-
- if (names.Count == Parameters.Count) {
- sw.WriteLine ("\t\t\t\tArrayList vals = new ArrayList();");
- sw.WriteLine ("\t\t\t\tArrayList names = new ArrayList();");
- for (int i = 0; i < names.Count; i++) {
- Parameter p = Parameters [i];
- string indent = "\t\t\t\t";
- if (p.Generatable is ClassBase && !(p.Generatable is StructBase)) {
- sw.WriteLine (indent + "if (" + p.Name + " != null) {");
- indent += "\t";
- }
- sw.WriteLine (indent + "names.Add (\"" + names [i] + "\");");
- sw.WriteLine (indent + "vals.Add (new GLib.Value (" + values[i] + "));");
-
- if (p.Generatable is ClassBase && !(p.Generatable is StructBase))
- sw.WriteLine ("\t\t\t\t}");
- }
-
- sw.WriteLine ("\t\t\t\tCreateNativeObject ((string[])names.ToArray (typeof (string)), (GLib.Value[])vals.ToArray (typeof (GLib.Value)));");
- sw.WriteLine ("\t\t\t\treturn;");
- } else
- sw.WriteLine ("\t\t\t\tthrow new InvalidOperationException (\"Can't override this constructor.\");");
- }
-
- sw.WriteLine ("\t\t\t}");
- }
-
- Body.Initialize(gen_info, false, false, "");
- sw.WriteLine("\t\t\t{0} = {1}({2});", container_type.AssignToName, CName, Body.GetCallString (false));
- Body.Finish (sw, "");
- Body.HandleException (sw, "");
- }
-
- sw.WriteLine("\t\t}");
- sw.WriteLine();
-
- Statistics.CtorCount++;
- }
- }
-}
-
+ sw.WriteLine("\t\t{");
+
+ if (needs_chaining) {
+ sw.WriteLine ("\t\t\tif (GetType () != typeof (" + name + ")) {");
+
+ if (Parameters.Count == 0) {
+ sw.WriteLine ("\t\t\t\tCreateNativeObject (new string [0], new GLib.Value[0]);");
+ sw.WriteLine ("\t\t\t\treturn;");
+ } else {
+ ArrayList names = new ArrayList ();
+ ArrayList values = new ArrayList ();
+ for (int i = 0; i < Parameters.Count; i++) {
+ Parameter p = Parameters[i];
+ if (container_type.GetPropertyRecursively (p.StudlyName) != null) {
+ names.Add (p.Name);
+ values.Add (p.Name);
+ } else if (p.PropertyName != String.Empty) {
+ names.Add (p.PropertyName);
+ values.Add (p.Name);
+ }
+ }
+
+ if (names.Count == Parameters.Count) {
+ sw.WriteLine ("\t\t\t\tArrayList vals = new ArrayList();");
+ sw.WriteLine ("\t\t\t\tArrayList names = new ArrayList();");
+ for (int i = 0; i < names.Count; i++) {
+ Parameter p = Parameters [i];
+ string indent = "\t\t\t\t";
+ if (p.Generatable is ClassBase && !(p.Generatable is StructBase)) {
+ sw.WriteLine (indent + "if (" + p.Name + " != null) {");
+ indent += "\t";
+ }
+ sw.WriteLine (indent + "names.Add (\"" + names [i] + "\");");
+ sw.WriteLine (indent + "vals.Add (new GLib.Value (" + values[i] + "));");
+
+ if (p.Generatable is ClassBase && !(p.Generatable is StructBase))
+ sw.WriteLine ("\t\t\t\t}");
+ }
+
+ sw.WriteLine ("\t\t\t\tCreateNativeObject ((string[])names.ToArray (typeof (string)), (GLib.Value[])vals.ToArray (typeof (GLib.Value)));");
+ sw.WriteLine ("\t\t\t\treturn;");
+ } else
+ sw.WriteLine ("\t\t\t\tthrow new InvalidOperationException (\"Can't override this constructor.\");");
+ }
+
+ sw.WriteLine ("\t\t\t}");
+ }
+
+ Body.Initialize(gen_info, false, false, "");
+ sw.WriteLine("\t\t\t{0} = {1}({2});", container_type.AssignToName, CName, Body.GetCallString (false));
+ Body.Finish (sw, "");
+ Body.HandleException (sw, "");
+ }
+
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+
+ Statistics.CtorCount++;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/EnumGen.cs b/lib/unique-sharp/generator/EnumGen.cs
index fa66af5..82091f6 100644
--- a/lib/unique-sharp/generator/EnumGen.cs
+++ b/lib/unique-sharp/generator/EnumGen.cs
@@ -1,127 +1,127 @@
-// GtkSharp.Generation.EnumGen.cs - The Enumeration Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class EnumGen : GenBase {
-
- string enum_type = String.Empty;
- ArrayList members = new ArrayList ();
-
- public EnumGen (XmlElement ns, XmlElement elem) : base (ns, elem)
- {
- foreach (XmlElement member in elem.ChildNodes) {
- if (member.Name != "member")
- continue;
-
- string result = "\t\t" + member.GetAttribute("name");
- if (member.HasAttribute("value")) {
- string value = member.GetAttribute("value");
- if (value.EndsWith("U")) {
- enum_type = " : uint";
- value = value.TrimEnd('U');
- }
- result += " = " + value;
- }
- members.Add (result + ",");
- }
- }
-
- public override bool Validate ()
- {
- return true;
- }
-
- public override string DefaultValue {
- get {
- return "(" + QualifiedName + ") 0";
- }
- }
-
- public override string MarshalType {
- get {
- return "int";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "(int) " + var_name;
- }
-
- public override string FromNative(string var)
- {
- return "(" + QualifiedName + ") " + var;
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- sw.WriteLine ("#region Autogenerated code");
-
- if (Elem.GetAttribute("type") == "flags")
- sw.WriteLine ("\t[Flags]");
- if (Elem.HasAttribute("gtype"))
- sw.WriteLine ("\t[GLib.GType (typeof (" + NS + "." + Name + "GType))]");
-
- string access = IsInternal ? "internal" : "public";
- sw.WriteLine ("\t" + access + " enum " + Name + enum_type + " {");
- sw.WriteLine ();
-
- foreach (string member in members)
- sw.WriteLine (member);
-
- sw.WriteLine ("\t}");
-
- if (Elem.HasAttribute ("gtype")) {
- sw.WriteLine ();
- sw.WriteLine ("\tinternal class " + Name + "GType {");
- sw.WriteLine ("\t\t[DllImport (\"" + LibraryName + "\")]");
- sw.WriteLine ("\t\tstatic extern IntPtr " + Elem.GetAttribute ("gtype") + " ();");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static GLib.GType GType {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn new GLib.GType (" + Elem.GetAttribute ("gtype") + " ());");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("\t}");
- }
-
- sw.WriteLine ("#endregion");
- sw.WriteLine ("}");
- sw.Close ();
- Statistics.EnumCount++;
- }
- }
-}
-
+// GtkSharp.Generation.EnumGen.cs - The Enumeration Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class EnumGen : GenBase {
+
+ string enum_type = String.Empty;
+ ArrayList members = new ArrayList ();
+
+ public EnumGen (XmlElement ns, XmlElement elem) : base (ns, elem)
+ {
+ foreach (XmlElement member in elem.ChildNodes) {
+ if (member.Name != "member")
+ continue;
+
+ string result = "\t\t" + member.GetAttribute("name");
+ if (member.HasAttribute("value")) {
+ string value = member.GetAttribute("value");
+ if (value.EndsWith("U")) {
+ enum_type = " : uint";
+ value = value.TrimEnd('U');
+ }
+ result += " = " + value;
+ }
+ members.Add (result + ",");
+ }
+ }
+
+ public override bool Validate ()
+ {
+ return true;
+ }
+
+ public override string DefaultValue {
+ get {
+ return "(" + QualifiedName + ") 0";
+ }
+ }
+
+ public override string MarshalType {
+ get {
+ return "int";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "(int) " + var_name;
+ }
+
+ public override string FromNative(string var)
+ {
+ return "(" + QualifiedName + ") " + var;
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ sw.WriteLine ("#region Autogenerated code");
+
+ if (Elem.GetAttribute("type") == "flags")
+ sw.WriteLine ("\t[Flags]");
+ if (Elem.HasAttribute("gtype"))
+ sw.WriteLine ("\t[GLib.GType (typeof (" + NS + "." + Name + "GType))]");
+
+ string access = IsInternal ? "internal" : "public";
+ sw.WriteLine ("\t" + access + " enum " + Name + enum_type + " {");
+ sw.WriteLine ();
+
+ foreach (string member in members)
+ sw.WriteLine (member);
+
+ sw.WriteLine ("\t}");
+
+ if (Elem.HasAttribute ("gtype")) {
+ sw.WriteLine ();
+ sw.WriteLine ("\tinternal class " + Name + "GType {");
+ sw.WriteLine ("\t\t[DllImport (\"" + LibraryName + "\")]");
+ sw.WriteLine ("\t\tstatic extern IntPtr " + Elem.GetAttribute ("gtype") + " ();");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static GLib.GType GType {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn new GLib.GType (" + Elem.GetAttribute ("gtype") + " ());");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("\t}");
+ }
+
+ sw.WriteLine ("#endregion");
+ sw.WriteLine ("}");
+ sw.Close ();
+ Statistics.EnumCount++;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/GenBase.cs b/lib/unique-sharp/generator/GenBase.cs
index db0a004..5b9219a 100644
--- a/lib/unique-sharp/generator/GenBase.cs
+++ b/lib/unique-sharp/generator/GenBase.cs
@@ -1,54 +1,54 @@
-// GtkSharp.Generation.GenBase.cs - The Generatable base class.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001-2002 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
- using System.Xml;
-
- public abstract class GenBase : IGeneratable {
-
- private XmlElement ns;
- private XmlElement elem;
-
- protected GenBase (XmlElement ns, XmlElement elem)
- {
- this.ns = ns;
- this.elem = elem;
- }
-
- public string CName {
- get {
- return elem.GetAttribute ("cname");
- }
- }
-
- public XmlElement Elem {
- get {
- return elem;
- }
- }
-
+// GtkSharp.Generation.GenBase.cs - The Generatable base class.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001-2002 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+ using System.Xml;
+
+ public abstract class GenBase : IGeneratable {
+
+ private XmlElement ns;
+ private XmlElement elem;
+
+ protected GenBase (XmlElement ns, XmlElement elem)
+ {
+ this.ns = ns;
+ this.elem = elem;
+ }
+
+ public string CName {
+ get {
+ return elem.GetAttribute ("cname");
+ }
+ }
+
+ public XmlElement Elem {
+ get {
+ return elem;
+ }
+ }
+
public bool IsInternal {
get {
if (elem.HasAttribute ("internal")) {
@@ -59,84 +59,84 @@ namespace GtkSharp.Generation {
}
}
- public string LibraryName {
- get {
- return ns.GetAttribute ("library");
- }
- }
-
- public virtual string MarshalReturnType {
- get {
- return MarshalType;
- }
- }
-
- public abstract string MarshalType { get; }
-
- public string Name {
- get {
- return elem.GetAttribute ("name");
- }
- }
-
- public string NS {
- get {
- return ns.GetAttribute ("name");
- }
- }
-
- public abstract string DefaultValue { get; }
-
- public string QualifiedName {
- get {
- return NS + "." + Name;
- }
- }
-
- public virtual string ToNativeReturnType {
- get {
- return MarshalType;
- }
- }
-
- protected void AppendCustom (StreamWriter sw, string custom_dir)
- {
- char sep = Path.DirectorySeparatorChar;
- string custom = custom_dir + sep + Name + ".custom";
- if (File.Exists(custom)) {
- sw.WriteLine ("#region Customized extensions");
- sw.WriteLine ("#line 1 \"" + Name + ".custom\"");
- FileStream custstream = new FileStream(custom, FileMode.Open, FileAccess.Read);
- StreamReader sr = new StreamReader(custstream);
- sw.WriteLine (sr.ReadToEnd ());
- sw.WriteLine ("#endregion");
- sr.Close ();
- }
- }
-
- public abstract string CallByName (string var);
-
- public abstract string FromNative (string var);
-
- public virtual string FromNativeReturn (string var)
- {
- return FromNative (var);
- }
-
- public virtual string ToNativeReturn (string var)
- {
- return CallByName (var);
- }
-
- public abstract bool Validate ();
-
- public void Generate ()
- {
- GenerationInfo geninfo = new GenerationInfo (ns);
- Generate (geninfo);
- }
-
- public abstract void Generate (GenerationInfo geninfo);
- }
-}
-
+ public string LibraryName {
+ get {
+ return ns.GetAttribute ("library");
+ }
+ }
+
+ public virtual string MarshalReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ public abstract string MarshalType { get; }
+
+ public string Name {
+ get {
+ return elem.GetAttribute ("name");
+ }
+ }
+
+ public string NS {
+ get {
+ return ns.GetAttribute ("name");
+ }
+ }
+
+ public abstract string DefaultValue { get; }
+
+ public string QualifiedName {
+ get {
+ return NS + "." + Name;
+ }
+ }
+
+ public virtual string ToNativeReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ protected void AppendCustom (StreamWriter sw, string custom_dir)
+ {
+ char sep = Path.DirectorySeparatorChar;
+ string custom = custom_dir + sep + Name + ".custom";
+ if (File.Exists(custom)) {
+ sw.WriteLine ("#region Customized extensions");
+ sw.WriteLine ("#line 1 \"" + Name + ".custom\"");
+ FileStream custstream = new FileStream(custom, FileMode.Open, FileAccess.Read);
+ StreamReader sr = new StreamReader(custstream);
+ sw.WriteLine (sr.ReadToEnd ());
+ sw.WriteLine ("#endregion");
+ sr.Close ();
+ }
+ }
+
+ public abstract string CallByName (string var);
+
+ public abstract string FromNative (string var);
+
+ public virtual string FromNativeReturn (string var)
+ {
+ return FromNative (var);
+ }
+
+ public virtual string ToNativeReturn (string var)
+ {
+ return CallByName (var);
+ }
+
+ public abstract bool Validate ();
+
+ public void Generate ()
+ {
+ GenerationInfo geninfo = new GenerationInfo (ns);
+ Generate (geninfo);
+ }
+
+ public abstract void Generate (GenerationInfo geninfo);
+ }
+}
+
diff --git a/lib/unique-sharp/generator/GenerationInfo.cs b/lib/unique-sharp/generator/GenerationInfo.cs
index 7b7619a..3031c7c 100644
--- a/lib/unique-sharp/generator/GenerationInfo.cs
+++ b/lib/unique-sharp/generator/GenerationInfo.cs
@@ -1,188 +1,188 @@
-// GtkSharp.Generation.GenerationInfo.cs - Generation information class.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2003-2008 Novell Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class GenerationInfo {
-
- string dir;
- string custom_dir;
- string assembly_name;
- string gluelib_name;
- bool glue_enabled;
- StreamWriter sw;
- StreamWriter glue_sw;
-
- public GenerationInfo (XmlElement ns)
- {
- string ns_name = ns.GetAttribute ("name");
- char sep = Path.DirectorySeparatorChar;
- dir = ".." + sep + ns_name.ToLower () + sep + "generated";
- custom_dir = ".." + sep + ns_name.ToLower ();
- assembly_name = ns_name.ToLower () + "-sharp";
- }
-
- public GenerationInfo (string dir, string assembly_name) : this (dir, dir, assembly_name, "", "", "") {}
-
- public GenerationInfo (string dir, string custom_dir, string assembly_name, string glue_filename, string glue_includes, string gluelib_name)
- {
- this.dir = dir;
- this.custom_dir = custom_dir;
- this.assembly_name = assembly_name;
- this.gluelib_name = gluelib_name;
- InitializeGlue (glue_filename, glue_includes, gluelib_name);
- }
-
- void InitializeGlue (string glue_filename, string glue_includes, string gluelib_name)
- {
- if (gluelib_name != String.Empty && glue_filename != String.Empty) {
- FileStream stream;
- try {
- stream = new FileStream (glue_filename, FileMode.Create, FileAccess.Write);
- } catch (Exception) {
- Console.Error.WriteLine ("Unable to create specified glue file. Glue will not be generated.");
- return;
- }
-
- glue_sw = new StreamWriter (stream);
-
- glue_sw.WriteLine ("// This file was generated by the Gtk# code generator.");
- glue_sw.WriteLine ("// Any changes made will be lost if regenerated.");
- glue_sw.WriteLine ();
-
- if (glue_includes != "") {
- foreach (string header in glue_includes.Split (new char[] {',', ' '})) {
- if (header != "")
- glue_sw.WriteLine ("#include <{0}>", header);
- }
- glue_sw.WriteLine ("");
- }
- glue_sw.WriteLine ("const gchar *__prefix = \"__gtksharp_\";\n");
- glue_sw.WriteLine ("#define HAS_PREFIX(a) (*((guint64 *)(a)) == *((guint64 *) __prefix))\n");
- glue_sw.WriteLine ("static GObjectClass *");
- glue_sw.WriteLine ("get_threshold_class (GObject *obj)");
- glue_sw.WriteLine ("{");
- glue_sw.WriteLine ("\tGType gtype = G_TYPE_FROM_INSTANCE (obj);");
- glue_sw.WriteLine ("\twhile (HAS_PREFIX (g_type_name (gtype)))");
- glue_sw.WriteLine ("\t\tgtype = g_type_parent (gtype);");
- glue_sw.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
- glue_sw.WriteLine ("\tif (klass == NULL) klass = g_type_class_ref (gtype);");
- glue_sw.WriteLine ("\treturn klass;");
- glue_sw.WriteLine ("}\n");
- glue_enabled = true;
- }
- }
-
- public string AssemblyName {
- get {
- return assembly_name;
- }
- }
-
- public string CustomDir {
- get {
- return custom_dir;
- }
- }
-
- public string Dir {
- get {
- return dir;
- }
- }
-
- public string GluelibName {
- get {
- return gluelib_name;
- }
- }
-
- public bool GlueEnabled {
- get {
- return glue_enabled;
- }
- }
-
- public StreamWriter GlueWriter {
- get {
- return glue_sw;
- }
- }
-
- public StreamWriter Writer {
- get {
- return sw;
- }
- set {
- sw = value;
- }
- }
-
- public void CloseGlueWriter ()
- {
- if (glue_sw != null)
- glue_sw.Close ();
- }
-
- string member;
- public string CurrentMember {
- get {
- return typename + "." + member;
- }
- set {
- member = value;
- }
- }
-
- string typename;
- public string CurrentType {
- get {
- return typename;
- }
- set {
- typename = value;
- }
- }
-
- public StreamWriter OpenStream (string name)
- {
- char sep = Path.DirectorySeparatorChar;
- if (!Directory.Exists(dir))
- Directory.CreateDirectory(dir);
- string filename = dir + sep + name + ".cs";
-
- FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
- StreamWriter sw = new StreamWriter (stream);
-
- sw.WriteLine ("// This file was generated by the Gtk# code generator.");
- sw.WriteLine ("// Any changes made will be lost if regenerated.");
- sw.WriteLine ();
-
- return sw;
- }
- }
-}
-
+// GtkSharp.Generation.GenerationInfo.cs - Generation information class.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2003-2008 Novell Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class GenerationInfo {
+
+ string dir;
+ string custom_dir;
+ string assembly_name;
+ string gluelib_name;
+ bool glue_enabled;
+ StreamWriter sw;
+ StreamWriter glue_sw;
+
+ public GenerationInfo (XmlElement ns)
+ {
+ string ns_name = ns.GetAttribute ("name");
+ char sep = Path.DirectorySeparatorChar;
+ dir = ".." + sep + ns_name.ToLower () + sep + "generated";
+ custom_dir = ".." + sep + ns_name.ToLower ();
+ assembly_name = ns_name.ToLower () + "-sharp";
+ }
+
+ public GenerationInfo (string dir, string assembly_name) : this (dir, dir, assembly_name, "", "", "") {}
+
+ public GenerationInfo (string dir, string custom_dir, string assembly_name, string glue_filename, string glue_includes, string gluelib_name)
+ {
+ this.dir = dir;
+ this.custom_dir = custom_dir;
+ this.assembly_name = assembly_name;
+ this.gluelib_name = gluelib_name;
+ InitializeGlue (glue_filename, glue_includes, gluelib_name);
+ }
+
+ void InitializeGlue (string glue_filename, string glue_includes, string gluelib_name)
+ {
+ if (gluelib_name != String.Empty && glue_filename != String.Empty) {
+ FileStream stream;
+ try {
+ stream = new FileStream (glue_filename, FileMode.Create, FileAccess.Write);
+ } catch (Exception) {
+ Console.Error.WriteLine ("Unable to create specified glue file. Glue will not be generated.");
+ return;
+ }
+
+ glue_sw = new StreamWriter (stream);
+
+ glue_sw.WriteLine ("// This file was generated by the Gtk# code generator.");
+ glue_sw.WriteLine ("// Any changes made will be lost if regenerated.");
+ glue_sw.WriteLine ();
+
+ if (glue_includes != "") {
+ foreach (string header in glue_includes.Split (new char[] {',', ' '})) {
+ if (header != "")
+ glue_sw.WriteLine ("#include <{0}>", header);
+ }
+ glue_sw.WriteLine ("");
+ }
+ glue_sw.WriteLine ("const gchar *__prefix = \"__gtksharp_\";\n");
+ glue_sw.WriteLine ("#define HAS_PREFIX(a) (*((guint64 *)(a)) == *((guint64 *) __prefix))\n");
+ glue_sw.WriteLine ("static GObjectClass *");
+ glue_sw.WriteLine ("get_threshold_class (GObject *obj)");
+ glue_sw.WriteLine ("{");
+ glue_sw.WriteLine ("\tGType gtype = G_TYPE_FROM_INSTANCE (obj);");
+ glue_sw.WriteLine ("\twhile (HAS_PREFIX (g_type_name (gtype)))");
+ glue_sw.WriteLine ("\t\tgtype = g_type_parent (gtype);");
+ glue_sw.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
+ glue_sw.WriteLine ("\tif (klass == NULL) klass = g_type_class_ref (gtype);");
+ glue_sw.WriteLine ("\treturn klass;");
+ glue_sw.WriteLine ("}\n");
+ glue_enabled = true;
+ }
+ }
+
+ public string AssemblyName {
+ get {
+ return assembly_name;
+ }
+ }
+
+ public string CustomDir {
+ get {
+ return custom_dir;
+ }
+ }
+
+ public string Dir {
+ get {
+ return dir;
+ }
+ }
+
+ public string GluelibName {
+ get {
+ return gluelib_name;
+ }
+ }
+
+ public bool GlueEnabled {
+ get {
+ return glue_enabled;
+ }
+ }
+
+ public StreamWriter GlueWriter {
+ get {
+ return glue_sw;
+ }
+ }
+
+ public StreamWriter Writer {
+ get {
+ return sw;
+ }
+ set {
+ sw = value;
+ }
+ }
+
+ public void CloseGlueWriter ()
+ {
+ if (glue_sw != null)
+ glue_sw.Close ();
+ }
+
+ string member;
+ public string CurrentMember {
+ get {
+ return typename + "." + member;
+ }
+ set {
+ member = value;
+ }
+ }
+
+ string typename;
+ public string CurrentType {
+ get {
+ return typename;
+ }
+ set {
+ typename = value;
+ }
+ }
+
+ public StreamWriter OpenStream (string name)
+ {
+ char sep = Path.DirectorySeparatorChar;
+ if (!Directory.Exists(dir))
+ Directory.CreateDirectory(dir);
+ string filename = dir + sep + name + ".cs";
+
+ FileStream stream = new FileStream (filename, FileMode.Create, FileAccess.Write);
+ StreamWriter sw = new StreamWriter (stream);
+
+ sw.WriteLine ("// This file was generated by the Gtk# code generator.");
+ sw.WriteLine ("// Any changes made will be lost if regenerated.");
+ sw.WriteLine ();
+
+ return sw;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/IGeneratable.cs b/lib/unique-sharp/generator/IGeneratable.cs
index 1608fd7..effb558 100644
--- a/lib/unique-sharp/generator/IGeneratable.cs
+++ b/lib/unique-sharp/generator/IGeneratable.cs
@@ -1,71 +1,71 @@
-// GtkSharp.Generation.IGeneratable.cs - Interface to generate code for a type.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001 Mike Kestner
-// Copyright (c) 2007 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- public interface IGeneratable {
-
- // The C name of the generatable
- string CName {get;}
-
- // The (short) C# name of the generatable
- string Name {get;}
-
- // The fully-qualified C# name of the generatable
- string QualifiedName {get;}
-
- // The type (possibly including "ref" or "out") to use in the import
- // signature when passing this generatable to unmanaged code
- string MarshalType {get;}
-
- // The type to use as the return type in an import signature when
- // receiving this generatable back from unmanaged code
- string MarshalReturnType {get;}
-
- // The type to use in a managed callback signature when returning this
- // generatable to unmanaged code
- string ToNativeReturnType {get;}
-
- // The value returned by callbacks that are interrupted prematurely
- // by managed exceptions or other conditions where an appropriate
- // value can't be otherwise obtained.
- string DefaultValue {get;}
-
- // Generates an expression to convert var_name to MarshalType
- string CallByName (string var_name);
-
- // Generates an expression to convert var from MarshalType
- string FromNative (string var);
-
- // Generates an expression to convert var from MarshalReturnType
- string FromNativeReturn (string var);
-
- // Generates an expression to convert var to ToNativeReturnType
- string ToNativeReturn (string var);
-
- bool Validate ();
-
- void Generate ();
-
- void Generate (GenerationInfo gen_info);
- }
-}
+// GtkSharp.Generation.IGeneratable.cs - Interface to generate code for a type.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001 Mike Kestner
+// Copyright (c) 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ public interface IGeneratable {
+
+ // The C name of the generatable
+ string CName {get;}
+
+ // The (short) C# name of the generatable
+ string Name {get;}
+
+ // The fully-qualified C# name of the generatable
+ string QualifiedName {get;}
+
+ // The type (possibly including "ref" or "out") to use in the import
+ // signature when passing this generatable to unmanaged code
+ string MarshalType {get;}
+
+ // The type to use as the return type in an import signature when
+ // receiving this generatable back from unmanaged code
+ string MarshalReturnType {get;}
+
+ // The type to use in a managed callback signature when returning this
+ // generatable to unmanaged code
+ string ToNativeReturnType {get;}
+
+ // The value returned by callbacks that are interrupted prematurely
+ // by managed exceptions or other conditions where an appropriate
+ // value can't be otherwise obtained.
+ string DefaultValue {get;}
+
+ // Generates an expression to convert var_name to MarshalType
+ string CallByName (string var_name);
+
+ // Generates an expression to convert var from MarshalType
+ string FromNative (string var);
+
+ // Generates an expression to convert var from MarshalReturnType
+ string FromNativeReturn (string var);
+
+ // Generates an expression to convert var to ToNativeReturnType
+ string ToNativeReturn (string var);
+
+ bool Validate ();
+
+ void Generate ();
+
+ void Generate (GenerationInfo gen_info);
+ }
+}
diff --git a/lib/unique-sharp/generator/IManualMarshaler.cs b/lib/unique-sharp/generator/IManualMarshaler.cs
index e9e7eaf..25633c5 100644
--- a/lib/unique-sharp/generator/IManualMarshaler.cs
+++ b/lib/unique-sharp/generator/IManualMarshaler.cs
@@ -1,32 +1,32 @@
-// GtkSharp.Generation.IManualMarshaler.cs - Interface for manual marshaling.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- public interface IManualMarshaler {
-
- string AllocNative (string managed_var);
-
- string ReleaseNative (string native_var);
-
- }
-}
-
+// GtkSharp.Generation.IManualMarshaler.cs - Interface for manual marshaling.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ public interface IManualMarshaler {
+
+ string AllocNative (string managed_var);
+
+ string ReleaseNative (string native_var);
+
+ }
+}
+
diff --git a/lib/unique-sharp/generator/InterfaceGen.cs b/lib/unique-sharp/generator/InterfaceGen.cs
index 00cd892..f2b0f51 100644
--- a/lib/unique-sharp/generator/InterfaceGen.cs
+++ b/lib/unique-sharp/generator/InterfaceGen.cs
@@ -1,384 +1,384 @@
-// GtkSharp.Generation.InterfaceGen.cs - The Interface Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004, 2007 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class InterfaceGen : ObjectBase {
-
- bool consume_only;
- ArrayList vms = new ArrayList ();
- ArrayList members = new ArrayList ();
-
- public InterfaceGen (XmlElement ns, XmlElement elem) : base (ns, elem)
- {
- consume_only = elem.HasAttribute ("consume_only");
- foreach (XmlNode node in elem.ChildNodes) {
- switch (node.Name) {
- case "virtual_method":
- VirtualMethod vm = new VirtualMethod (node as XmlElement, this);
- vms.Add (vm);
- members.Add (vm);
- break;
- case "signal":
- object sig = sigs [(node as XmlElement).GetAttribute ("name")];
- if (sig == null)
- sig = new Signal (node as XmlElement, this);
- members.Add (sig);
- break;
- default:
- if (!IsNodeNameHandled (node.Name))
- Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
- break;
- }
- }
- }
-
- public bool IsConsumeOnly {
- get {
- return consume_only;
- }
- }
-
- public override string FromNative (string var, bool owned)
- {
- return QualifiedName + "Adapter.GetObject (" + var + ", " + (owned ? "true" : "false") + ")";
- }
-
- public override bool ValidateForSubclass ()
- {
- ArrayList invalids = new ArrayList ();
-
- foreach (Method method in methods.Values) {
- if (!method.Validate ()) {
- Console.WriteLine ("in type " + QualifiedName);
- invalids.Add (method);
- }
- }
- foreach (Method method in invalids)
- methods.Remove (method.Name);
- invalids.Clear ();
-
- return base.ValidateForSubclass ();
- }
-
- string IfaceName {
- get {
- return Name + "Iface";
- }
- }
-
- void GenerateIfaceStruct (StreamWriter sw)
- {
- sw.WriteLine ("\t\tstatic " + IfaceName + " iface;");
- sw.WriteLine ();
- sw.WriteLine ("\t\tstruct " + IfaceName + " {");
- sw.WriteLine ("\t\t\tpublic IntPtr gtype;");
- sw.WriteLine ("\t\t\tpublic IntPtr itype;");
- sw.WriteLine ();
-
- foreach (object member in members) {
- if (member is Signal) {
- Signal sig = member as Signal;
- sw.WriteLine ("\t\t\tpublic IntPtr {0};", sig.CName.Replace ("\"", "").Replace ("-", "_"));
- } else if (member is VirtualMethod) {
- VirtualMethod vm = member as VirtualMethod;
- bool has_target = methods [vm.Name] != null;
- if (!has_target)
- Console.WriteLine ("Interface " + QualifiedName + " virtual method " + vm.Name + " has no matching method to invoke.");
- string type = has_target && vm.IsValid ? vm.Name + "Delegate" : "IntPtr";
- sw.WriteLine ("\t\t\tpublic " + type + " " + vm.CName + ";");
- }
- }
-
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateStaticCtor (StreamWriter sw)
- {
- sw.WriteLine ("\t\tstatic " + Name + "Adapter ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGLib.GType.Register (_gtype, typeof({0}Adapter));", Name);
- foreach (VirtualMethod vm in vms) {
- bool has_target = methods [vm.Name] != null;
- if (has_target && vm.IsValid)
- sw.WriteLine ("\t\t\tiface.{0} = new {1}Delegate ({1}Callback);", vm.CName, vm.Name);
- }
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateInitialize (StreamWriter sw)
- {
- sw.WriteLine ("\t\tstatic void Initialize (IntPtr ifaceptr, IntPtr data)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\t" + IfaceName + " native_iface = (" + IfaceName + ") Marshal.PtrToStructure (ifaceptr, typeof (" + IfaceName + "));");
- foreach (VirtualMethod vm in vms)
- sw.WriteLine ("\t\t\tnative_iface." + vm.CName + " = iface." + vm.CName + ";");
- sw.WriteLine ("\t\t\tMarshal.StructureToPtr (native_iface, ifaceptr, false);");
- sw.WriteLine ("\t\t\tGCHandle gch = (GCHandle) data;");
- sw.WriteLine ("\t\t\tgch.Free ();");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateCallbacks (StreamWriter sw)
- {
- foreach (VirtualMethod vm in vms) {
- if (methods [vm.Name] != null) {
- sw.WriteLine ();
- vm.GenerateCallback (sw);
- }
- }
- }
-
- void GenerateCtors (StreamWriter sw)
- {
- if (!IsConsumeOnly) {
- sw.WriteLine ("\t\tpublic " + Name + "Adapter ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tInitHandler = new GLib.GInterfaceInitHandler (Initialize);");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\t{0}Implementor implementor;", Name);
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic {0}Adapter ({0}Implementor implementor)", Name);
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (implementor == null)");
- sw.WriteLine ("\t\t\t\tthrow new ArgumentNullException (\"implementor\");");
- sw.WriteLine ("\t\t\tthis.implementor = implementor;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
- sw.WriteLine ("\t\tpublic " + Name + "Adapter (IntPtr handle)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tthis.handle = handle;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateGType (StreamWriter sw)
- {
- Method m = GetMethod ("GetType");
- m.GenerateImport (sw);
- sw.WriteLine ("\t\tprivate static GLib.GType _gtype = new GLib.GType ({0} ());", m.CName);
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic override GLib.GType GType {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn _gtype;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateHandleProp (StreamWriter sw)
- {
- sw.WriteLine ("\t\tIntPtr handle;");
- sw.WriteLine ("\t\tpublic override IntPtr Handle {");
- sw.WriteLine ("\t\t\tget {");
- if (IsConsumeOnly) {
- sw.WriteLine ("\t\t\t\treturn handle;");
- } else {
- sw.WriteLine ("\t\t\t\tif (handle != IntPtr.Zero)");
- sw.WriteLine ("\t\t\t\t\treturn handle;");
- sw.WriteLine ("\t\t\t\treturn implementor == null ? IntPtr.Zero : implementor.Handle;");
- }
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateGetObject (StreamWriter sw)
- {
- sw.WriteLine ("\t\tpublic static " + Name + " GetObject (IntPtr handle, bool owned)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGLib.Object obj = GLib.Object.GetObject (handle, owned);");
- sw.WriteLine ("\t\t\treturn GetObject (obj);");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\tpublic static " + Name + " GetObject (GLib.Object obj)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (obj == null)");
- sw.WriteLine ("\t\t\t\treturn null;");
- if (!IsConsumeOnly) {
- sw.WriteLine ("\t\t\telse if (obj is " + Name + "Implementor)");
- sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj as {0}Implementor);", Name);
- }
- sw.WriteLine ("\t\t\telse if (obj as " + Name + " == null)");
- sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj.Handle);", Name);
- sw.WriteLine ("\t\t\telse");
- sw.WriteLine ("\t\t\t\treturn obj as {0};", Name);
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateImplementorProp (StreamWriter sw)
- {
- sw.WriteLine ("\t\tpublic " + Name + "Implementor Implementor {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn implementor;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
- void GenerateAdapter (GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name + "Adapter");
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
- sw.WriteLine ("#region Autogenerated code");
- sw.WriteLine ("\tpublic class " + Name + "Adapter : GLib.GInterfaceAdapter, " + QualifiedName + " {");
- sw.WriteLine ();
-
- if (!IsConsumeOnly) {
- GenerateIfaceStruct (sw);
- GenerateStaticCtor (sw);
- GenerateCallbacks (sw);
- GenerateInitialize (sw);
- }
- GenerateCtors (sw);
- GenerateGType (sw);
- GenerateHandleProp (sw);
- GenerateGetObject (sw);
- if (!IsConsumeOnly)
- GenerateImplementorProp (sw);
-
- GenProperties (gen_info, null);
-
- foreach (Signal sig in sigs.Values)
- sig.GenEvent (sw, null, "GLib.Object.GetObject (Handle)");
-
- Method temp = methods ["GetType"] as Method;
- if (temp != null)
- methods.Remove ("GetType");
- GenMethods (gen_info, new Hashtable (), this);
- if (temp != null)
- methods ["GetType"] = temp;
-
- sw.WriteLine ("#endregion");
-
- string custom = Path.Combine (gen_info.CustomDir, Name + "Adapter.custom");
- if (File.Exists (custom)) {
- sw.WriteLine ("#region Customized extensions");
- sw.WriteLine ("#line 1 \"" + Name + "Adapter.custom\"");
- using (StreamReader sr = new StreamReader(new FileStream (custom, FileMode.Open, FileAccess.Read)))
- sw.WriteLine (sr.ReadToEnd ());
-
- sw.WriteLine ("#endregion");
- }
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- }
-
- void GenerateImplementorIface (StreamWriter sw)
- {
- if (IsConsumeOnly)
- return;
-
- sw.WriteLine ();
- sw.WriteLine ("\t[GLib.GInterface (typeof (" + Name + "Adapter))]");
- string access = IsInternal ? "internal" : "public";
- sw.WriteLine ("\t" + access + " interface " + Name + "Implementor : GLib.IWrapper {");
- sw.WriteLine ();
- Hashtable vm_table = new Hashtable ();
- foreach (VirtualMethod vm in vms)
- vm_table [vm.Name] = vm;
- foreach (VirtualMethod vm in vms) {
- if (vm_table [vm.Name] == null)
- continue;
- else if (!vm.IsValid) {
- vm_table.Remove (vm.Name);
- continue;
- } else if (vm.IsGetter || vm.IsSetter) {
- string cmp_name = (vm.IsGetter ? "Set" : "Get") + vm.Name.Substring (3);
- VirtualMethod cmp = vm_table [cmp_name] as VirtualMethod;
- if (cmp != null && (cmp.IsGetter || cmp.IsSetter)) {
- if (vm.IsSetter)
- cmp.GenerateDeclaration (sw, vm);
- else
- vm.GenerateDeclaration (sw, cmp);
- vm_table.Remove (cmp.Name);
- } else
- vm.GenerateDeclaration (sw, null);
- vm_table.Remove (vm.Name);
- } else {
- vm.GenerateDeclaration (sw, null);
- vm_table.Remove (vm.Name);
- }
- }
- sw.WriteLine ("\t}");
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- GenerateAdapter (gen_info);
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ();
- sw.WriteLine ("#region Autogenerated code");
- string access = IsInternal ? "internal" : "public";
- sw.WriteLine ("\t" + access + " interface " + Name + " : GLib.IWrapper {");
- sw.WriteLine ();
-
- foreach (Signal sig in sigs.Values) {
- sig.GenerateDecl (sw);
- sig.GenEventHandler (gen_info);
- }
-
- foreach (Method method in methods.Values) {
- if (IgnoreMethod (method, this))
- continue;
- method.GenerateDecl (sw);
- }
-
- foreach (Property prop in props.Values)
- prop.GenerateDecl (sw, "\t\t");
-
- AppendCustom (sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- GenerateImplementorIface (sw);
- sw.WriteLine ("#endregion");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- Statistics.IFaceCount++;
- }
- }
-}
-
+// GtkSharp.Generation.InterfaceGen.cs - The Interface Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004, 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class InterfaceGen : ObjectBase {
+
+ bool consume_only;
+ ArrayList vms = new ArrayList ();
+ ArrayList members = new ArrayList ();
+
+ public InterfaceGen (XmlElement ns, XmlElement elem) : base (ns, elem)
+ {
+ consume_only = elem.HasAttribute ("consume_only");
+ foreach (XmlNode node in elem.ChildNodes) {
+ switch (node.Name) {
+ case "virtual_method":
+ VirtualMethod vm = new VirtualMethod (node as XmlElement, this);
+ vms.Add (vm);
+ members.Add (vm);
+ break;
+ case "signal":
+ object sig = sigs [(node as XmlElement).GetAttribute ("name")];
+ if (sig == null)
+ sig = new Signal (node as XmlElement, this);
+ members.Add (sig);
+ break;
+ default:
+ if (!IsNodeNameHandled (node.Name))
+ Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
+ break;
+ }
+ }
+ }
+
+ public bool IsConsumeOnly {
+ get {
+ return consume_only;
+ }
+ }
+
+ public override string FromNative (string var, bool owned)
+ {
+ return QualifiedName + "Adapter.GetObject (" + var + ", " + (owned ? "true" : "false") + ")";
+ }
+
+ public override bool ValidateForSubclass ()
+ {
+ ArrayList invalids = new ArrayList ();
+
+ foreach (Method method in methods.Values) {
+ if (!method.Validate ()) {
+ Console.WriteLine ("in type " + QualifiedName);
+ invalids.Add (method);
+ }
+ }
+ foreach (Method method in invalids)
+ methods.Remove (method.Name);
+ invalids.Clear ();
+
+ return base.ValidateForSubclass ();
+ }
+
+ string IfaceName {
+ get {
+ return Name + "Iface";
+ }
+ }
+
+ void GenerateIfaceStruct (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tstatic " + IfaceName + " iface;");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstruct " + IfaceName + " {");
+ sw.WriteLine ("\t\t\tpublic IntPtr gtype;");
+ sw.WriteLine ("\t\t\tpublic IntPtr itype;");
+ sw.WriteLine ();
+
+ foreach (object member in members) {
+ if (member is Signal) {
+ Signal sig = member as Signal;
+ sw.WriteLine ("\t\t\tpublic IntPtr {0};", sig.CName.Replace ("\"", "").Replace ("-", "_"));
+ } else if (member is VirtualMethod) {
+ VirtualMethod vm = member as VirtualMethod;
+ bool has_target = methods [vm.Name] != null;
+ if (!has_target)
+ Console.WriteLine ("Interface " + QualifiedName + " virtual method " + vm.Name + " has no matching method to invoke.");
+ string type = has_target && vm.IsValid ? vm.Name + "Delegate" : "IntPtr";
+ sw.WriteLine ("\t\t\tpublic " + type + " " + vm.CName + ";");
+ }
+ }
+
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateStaticCtor (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tstatic " + Name + "Adapter ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGLib.GType.Register (_gtype, typeof({0}Adapter));", Name);
+ foreach (VirtualMethod vm in vms) {
+ bool has_target = methods [vm.Name] != null;
+ if (has_target && vm.IsValid)
+ sw.WriteLine ("\t\t\tiface.{0} = new {1}Delegate ({1}Callback);", vm.CName, vm.Name);
+ }
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateInitialize (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tstatic void Initialize (IntPtr ifaceptr, IntPtr data)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\t" + IfaceName + " native_iface = (" + IfaceName + ") Marshal.PtrToStructure (ifaceptr, typeof (" + IfaceName + "));");
+ foreach (VirtualMethod vm in vms)
+ sw.WriteLine ("\t\t\tnative_iface." + vm.CName + " = iface." + vm.CName + ";");
+ sw.WriteLine ("\t\t\tMarshal.StructureToPtr (native_iface, ifaceptr, false);");
+ sw.WriteLine ("\t\t\tGCHandle gch = (GCHandle) data;");
+ sw.WriteLine ("\t\t\tgch.Free ();");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateCallbacks (StreamWriter sw)
+ {
+ foreach (VirtualMethod vm in vms) {
+ if (methods [vm.Name] != null) {
+ sw.WriteLine ();
+ vm.GenerateCallback (sw);
+ }
+ }
+ }
+
+ void GenerateCtors (StreamWriter sw)
+ {
+ if (!IsConsumeOnly) {
+ sw.WriteLine ("\t\tpublic " + Name + "Adapter ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tInitHandler = new GLib.GInterfaceInitHandler (Initialize);");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t{0}Implementor implementor;", Name);
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic {0}Adapter ({0}Implementor implementor)", Name);
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (implementor == null)");
+ sw.WriteLine ("\t\t\t\tthrow new ArgumentNullException (\"implementor\");");
+ sw.WriteLine ("\t\t\tthis.implementor = implementor;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+ sw.WriteLine ("\t\tpublic " + Name + "Adapter (IntPtr handle)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tthis.handle = handle;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateGType (StreamWriter sw)
+ {
+ Method m = GetMethod ("GetType");
+ m.GenerateImport (sw);
+ sw.WriteLine ("\t\tprivate static GLib.GType _gtype = new GLib.GType ({0} ());", m.CName);
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic override GLib.GType GType {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn _gtype;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateHandleProp (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tIntPtr handle;");
+ sw.WriteLine ("\t\tpublic override IntPtr Handle {");
+ sw.WriteLine ("\t\t\tget {");
+ if (IsConsumeOnly) {
+ sw.WriteLine ("\t\t\t\treturn handle;");
+ } else {
+ sw.WriteLine ("\t\t\t\tif (handle != IntPtr.Zero)");
+ sw.WriteLine ("\t\t\t\t\treturn handle;");
+ sw.WriteLine ("\t\t\t\treturn implementor == null ? IntPtr.Zero : implementor.Handle;");
+ }
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateGetObject (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tpublic static " + Name + " GetObject (IntPtr handle, bool owned)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGLib.Object obj = GLib.Object.GetObject (handle, owned);");
+ sw.WriteLine ("\t\t\treturn GetObject (obj);");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tpublic static " + Name + " GetObject (GLib.Object obj)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (obj == null)");
+ sw.WriteLine ("\t\t\t\treturn null;");
+ if (!IsConsumeOnly) {
+ sw.WriteLine ("\t\t\telse if (obj is " + Name + "Implementor)");
+ sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj as {0}Implementor);", Name);
+ }
+ sw.WriteLine ("\t\t\telse if (obj as " + Name + " == null)");
+ sw.WriteLine ("\t\t\t\treturn new {0}Adapter (obj.Handle);", Name);
+ sw.WriteLine ("\t\t\telse");
+ sw.WriteLine ("\t\t\t\treturn obj as {0};", Name);
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateImplementorProp (StreamWriter sw)
+ {
+ sw.WriteLine ("\t\tpublic " + Name + "Implementor Implementor {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn implementor;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+ void GenerateAdapter (GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name + "Adapter");
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+ sw.WriteLine ("#region Autogenerated code");
+ sw.WriteLine ("\tpublic class " + Name + "Adapter : GLib.GInterfaceAdapter, " + QualifiedName + " {");
+ sw.WriteLine ();
+
+ if (!IsConsumeOnly) {
+ GenerateIfaceStruct (sw);
+ GenerateStaticCtor (sw);
+ GenerateCallbacks (sw);
+ GenerateInitialize (sw);
+ }
+ GenerateCtors (sw);
+ GenerateGType (sw);
+ GenerateHandleProp (sw);
+ GenerateGetObject (sw);
+ if (!IsConsumeOnly)
+ GenerateImplementorProp (sw);
+
+ GenProperties (gen_info, null);
+
+ foreach (Signal sig in sigs.Values)
+ sig.GenEvent (sw, null, "GLib.Object.GetObject (Handle)");
+
+ Method temp = methods ["GetType"] as Method;
+ if (temp != null)
+ methods.Remove ("GetType");
+ GenMethods (gen_info, new Hashtable (), this);
+ if (temp != null)
+ methods ["GetType"] = temp;
+
+ sw.WriteLine ("#endregion");
+
+ string custom = Path.Combine (gen_info.CustomDir, Name + "Adapter.custom");
+ if (File.Exists (custom)) {
+ sw.WriteLine ("#region Customized extensions");
+ sw.WriteLine ("#line 1 \"" + Name + "Adapter.custom\"");
+ using (StreamReader sr = new StreamReader(new FileStream (custom, FileMode.Open, FileAccess.Read)))
+ sw.WriteLine (sr.ReadToEnd ());
+
+ sw.WriteLine ("#endregion");
+ }
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ }
+
+ void GenerateImplementorIface (StreamWriter sw)
+ {
+ if (IsConsumeOnly)
+ return;
+
+ sw.WriteLine ();
+ sw.WriteLine ("\t[GLib.GInterface (typeof (" + Name + "Adapter))]");
+ string access = IsInternal ? "internal" : "public";
+ sw.WriteLine ("\t" + access + " interface " + Name + "Implementor : GLib.IWrapper {");
+ sw.WriteLine ();
+ Hashtable vm_table = new Hashtable ();
+ foreach (VirtualMethod vm in vms)
+ vm_table [vm.Name] = vm;
+ foreach (VirtualMethod vm in vms) {
+ if (vm_table [vm.Name] == null)
+ continue;
+ else if (!vm.IsValid) {
+ vm_table.Remove (vm.Name);
+ continue;
+ } else if (vm.IsGetter || vm.IsSetter) {
+ string cmp_name = (vm.IsGetter ? "Set" : "Get") + vm.Name.Substring (3);
+ VirtualMethod cmp = vm_table [cmp_name] as VirtualMethod;
+ if (cmp != null && (cmp.IsGetter || cmp.IsSetter)) {
+ if (vm.IsSetter)
+ cmp.GenerateDeclaration (sw, vm);
+ else
+ vm.GenerateDeclaration (sw, cmp);
+ vm_table.Remove (cmp.Name);
+ } else
+ vm.GenerateDeclaration (sw, null);
+ vm_table.Remove (vm.Name);
+ } else {
+ vm.GenerateDeclaration (sw, null);
+ vm_table.Remove (vm.Name);
+ }
+ }
+ sw.WriteLine ("\t}");
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ GenerateAdapter (gen_info);
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ();
+ sw.WriteLine ("#region Autogenerated code");
+ string access = IsInternal ? "internal" : "public";
+ sw.WriteLine ("\t" + access + " interface " + Name + " : GLib.IWrapper {");
+ sw.WriteLine ();
+
+ foreach (Signal sig in sigs.Values) {
+ sig.GenerateDecl (sw);
+ sig.GenEventHandler (gen_info);
+ }
+
+ foreach (Method method in methods.Values) {
+ if (IgnoreMethod (method, this))
+ continue;
+ method.GenerateDecl (sw);
+ }
+
+ foreach (Property prop in props.Values)
+ prop.GenerateDecl (sw, "\t\t");
+
+ AppendCustom (sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ GenerateImplementorIface (sw);
+ sw.WriteLine ("#endregion");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.IFaceCount++;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/LPGen.cs b/lib/unique-sharp/generator/LPGen.cs
index 3fb774e..84940b5 100644
--- a/lib/unique-sharp/generator/LPGen.cs
+++ b/lib/unique-sharp/generator/LPGen.cs
@@ -1,58 +1,58 @@
-// GtkSharp.Generation.LPGen.cs - long/pointer Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
-
- public class LPGen : SimpleGen, IAccessor {
-
- public LPGen (string ctype) : base (ctype, "long", "0L") {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "new IntPtr (" + var_name + ")";
- }
-
- public override string FromNative(string var)
- {
- return "(long) " + var;
- }
-
- public void WriteAccessors (StreamWriter sw, string indent, string var)
- {
- sw.WriteLine (indent + "get {");
- sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
- sw.WriteLine (indent + "}");
- sw.WriteLine (indent + "set {");
- sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
- sw.WriteLine (indent + "}");
- }
- }
-}
-
+// GtkSharp.Generation.LPGen.cs - long/pointer Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+
+ public class LPGen : SimpleGen, IAccessor {
+
+ public LPGen (string ctype) : base (ctype, "long", "0L") {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "new IntPtr (" + var_name + ")";
+ }
+
+ public override string FromNative(string var)
+ {
+ return "(long) " + var;
+ }
+
+ public void WriteAccessors (StreamWriter sw, string indent, string var)
+ {
+ sw.WriteLine (indent + "get {");
+ sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
+ sw.WriteLine (indent + "}");
+ sw.WriteLine (indent + "set {");
+ sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
+ sw.WriteLine (indent + "}");
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/LPUGen.cs b/lib/unique-sharp/generator/LPUGen.cs
index 331b25f..f84cdd8 100644
--- a/lib/unique-sharp/generator/LPUGen.cs
+++ b/lib/unique-sharp/generator/LPUGen.cs
@@ -1,58 +1,58 @@
-// GtkSharp.Generation.LPUGen.cs - unsugned long/pointer generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
-
- public class LPUGen : SimpleGen, IAccessor {
-
- public LPUGen (string ctype) : base (ctype, "ulong", "0") {}
-
- public override string MarshalType {
- get {
- return "UIntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return "new UIntPtr (" + var_name + ")";
- }
-
- public override string FromNative(string var)
- {
- return "(ulong) " + var;
- }
-
- public void WriteAccessors (StreamWriter sw, string indent, string var)
- {
- sw.WriteLine (indent + "get {");
- sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
- sw.WriteLine (indent + "}");
- sw.WriteLine (indent + "set {");
- sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
- sw.WriteLine (indent + "}");
- }
- }
-}
-
+// GtkSharp.Generation.LPUGen.cs - unsugned long/pointer generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+
+ public class LPUGen : SimpleGen, IAccessor {
+
+ public LPUGen (string ctype) : base (ctype, "ulong", "0") {}
+
+ public override string MarshalType {
+ get {
+ return "UIntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return "new UIntPtr (" + var_name + ")";
+ }
+
+ public override string FromNative(string var)
+ {
+ return "(ulong) " + var;
+ }
+
+ public void WriteAccessors (StreamWriter sw, string indent, string var)
+ {
+ sw.WriteLine (indent + "get {");
+ sw.WriteLine (indent + "\treturn " + FromNative (var) + ";");
+ sw.WriteLine (indent + "}");
+ sw.WriteLine (indent + "set {");
+ sw.WriteLine (indent + "\t" + var + " = " + CallByName ("value") + ";");
+ sw.WriteLine (indent + "}");
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/ManualGen.cs b/lib/unique-sharp/generator/ManualGen.cs
index 1d94916..8041905 100644
--- a/lib/unique-sharp/generator/ManualGen.cs
+++ b/lib/unique-sharp/generator/ManualGen.cs
@@ -1,58 +1,58 @@
-// GtkSharp.Generation.ManualGen.cs - Ungenerated handle type Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class ManualGen : SimpleBase {
-
- string from_fmt;
-
- public ManualGen (string ctype, string type) : base (ctype, type, "null")
- {
- from_fmt = "new " + QualifiedName + "({0})";
- }
-
- public ManualGen (string ctype, string type, string from_fmt) : base (ctype, type, "null")
- {
- this.from_fmt = from_fmt;
- }
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string CallByName (string var_name)
- {
- return var_name + " == null ? IntPtr.Zero : " + var_name + ".Handle";
- }
-
- public override string FromNative(string var)
- {
- return String.Format (from_fmt, var);
- }
- }
-}
-
+// GtkSharp.Generation.ManualGen.cs - Ungenerated handle type Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class ManualGen : SimpleBase {
+
+ string from_fmt;
+
+ public ManualGen (string ctype, string type) : base (ctype, type, "null")
+ {
+ from_fmt = "new " + QualifiedName + "({0})";
+ }
+
+ public ManualGen (string ctype, string type, string from_fmt) : base (ctype, type, "null")
+ {
+ this.from_fmt = from_fmt;
+ }
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string CallByName (string var_name)
+ {
+ return var_name + " == null ? IntPtr.Zero : " + var_name + ".Handle";
+ }
+
+ public override string FromNative(string var)
+ {
+ return String.Format (from_fmt, var);
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/Method.cs b/lib/unique-sharp/generator/Method.cs
index 76cd721..7c1d179 100644
--- a/lib/unique-sharp/generator/Method.cs
+++ b/lib/unique-sharp/generator/Method.cs
@@ -1,304 +1,304 @@
-// GtkSharp.Generation.Method.cs - The Method Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Method : MethodBase {
-
- private ReturnValue retval;
-
- private string call;
- private bool is_get, is_set;
- private bool deprecated = false;
-
- public Method (XmlElement elem, ClassBase container_type) : base (elem, container_type)
- {
- this.retval = new ReturnValue (elem["return-type"]);
-
- if (!container_type.IsDeprecated && elem.HasAttribute ("deprecated")) {
- string attr = elem.GetAttribute ("deprecated");
- deprecated = attr == "1" || attr == "true";
- }
-
- if (Name == "GetType")
- Name = "GetGType";
- }
-
- public bool IsDeprecated {
- get {
- return deprecated;
- }
- }
-
- public bool IsGetter {
- get {
- return is_get;
- }
- }
-
- public bool IsSetter {
- get {
- return is_set;
- }
- }
-
- public string ReturnType {
- get {
- return retval.CSType;
- }
- }
-
- public override bool Validate ()
- {
- if (!retval.Validate () || !base.Validate ()) {
- Console.Write(" in method " + Name + " ");
- return false;
- }
-
- Parameters parms = Parameters;
- is_get = ((((parms.IsAccessor && retval.IsVoid) || (parms.Count == 0 && !retval.IsVoid)) || (parms.Count == 0 && !retval.IsVoid)) && HasGetterName);
- is_set = ((parms.IsAccessor || (parms.VisibleCount == 1 && retval.IsVoid)) && HasSetterName);
-
- call = "(" + (IsStatic ? "" : container_type.CallByName () + (parms.Count > 0 ? ", " : "")) + Body.GetCallString (is_set) + ")";
-
- return true;
- }
-
- private Method GetComplement ()
- {
- char complement;
- if (is_get)
- complement = 'S';
- else
- complement = 'G';
-
- return container_type.GetMethod (complement + BaseName.Substring (1));
- }
-
- public string Declaration {
- get {
- return retval.CSType + " " + Name + " (" + (Signature != null ? Signature.ToString() : "") + ");";
- }
- }
-
- private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor)
- {
- if (IsStatic)
- sw.Write("static ");
- sw.Write (Safety);
- Method dup = null;
- if (container_type != null)
- dup = container_type.GetMethodRecursively (Name);
- if (implementor != null)
- dup = implementor.GetMethodRecursively (Name);
-
- if (Name == "ToString" && Parameters.Count == 0)
- sw.Write("override ");
- else if (Name == "GetGType" && container_type is ObjectGen)
- sw.Write("new ");
- else if (Modifiers == "new " || (dup != null && ((dup.Signature != null && Signature != null && dup.Signature.ToString() == Signature.ToString()) || (dup.Signature == null && Signature == null))))
- sw.Write("new ");
-
- if (is_get || is_set) {
- if (retval.IsVoid)
- sw.Write (Parameters.AccessorReturnType);
- else
- sw.Write(retval.CSType);
- sw.Write(" ");
- if (Name.StartsWith ("Get") || Name.StartsWith ("Set"))
- sw.Write (Name.Substring (3));
- else {
- int dot = Name.LastIndexOf ('.');
- if (dot != -1 && (Name.Substring (dot + 1, 3) == "Get" || Name.Substring (dot + 1, 3) == "Set"))
- sw.Write (Name.Substring (0, dot + 1) + Name.Substring (dot + 4));
- else
- sw.Write (Name);
- }
- sw.WriteLine(" { ");
- } else if (IsAccessor) {
- sw.Write (Signature.AccessorType + " " + Name + "(" + Signature.AsAccessor + ")");
- } else {
- sw.Write(retval.CSType + " " + Name + "(" + (Signature != null ? Signature.ToString() : "") + ")");
- }
- }
-
- public void GenerateDecl (StreamWriter sw)
- {
- if (IsStatic)
- return;
-
- if (is_get || is_set)
- {
- Method comp = GetComplement ();
- if (comp != null && is_set)
- return;
-
- sw.Write("\t\t");
- GenerateDeclCommon (sw, null);
-
- sw.Write("\t\t\t");
- sw.Write ((is_get) ? "get;" : "set;");
-
- if (comp != null && comp.is_set)
- sw.WriteLine (" set;");
- else
- sw.WriteLine ();
-
- sw.WriteLine ("\t\t}");
- }
- else
- {
- sw.Write("\t\t");
- GenerateDeclCommon (sw, null);
- sw.WriteLine (";");
- }
-
- Statistics.MethodCount++;
- }
-
- public void GenerateImport (StreamWriter sw)
- {
- string import_sig = IsStatic ? "" : container_type.MarshalType + " raw";
- import_sig += !IsStatic && Parameters.Count > 0 ? ", " : "";
- import_sig += Parameters.ImportSignature.ToString();
- sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
- if (retval.MarshalType.StartsWith ("[return:"))
- sw.WriteLine("\t\t" + retval.MarshalType + " static extern " + Safety + retval.CSType + " " + CName + "(" + import_sig + ");");
- else
- sw.WriteLine("\t\tstatic extern " + Safety + retval.MarshalType + " " + CName + "(" + import_sig + ");");
- sw.WriteLine();
- }
-
- public void Generate (GenerationInfo gen_info, ClassBase implementor)
- {
- if (!Validate ())
- return;
-
- Method comp = null;
-
- gen_info.CurrentMember = Name;
-
- /* we are generated by the get Method, if there is one */
- if (is_set || is_get)
- {
- if (Modifiers != "new " && container_type.GetPropertyRecursively (Name.Substring (3)) != null)
- return;
- comp = GetComplement ();
- if (comp != null && is_set) {
- if (Parameters.AccessorReturnType == comp.ReturnType)
- return;
- else {
- is_set = false;
- call = "(Handle, " + Body.GetCallString (false) + ")";
- comp = null;
- }
- }
- /* some setters take more than one arg */
- if (comp != null && !comp.is_set)
- comp = null;
- }
-
- GenerateImport (gen_info.Writer);
- if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
- comp.GenerateImport (gen_info.Writer);
-
- if (IsDeprecated)
- gen_info.Writer.WriteLine("\t\t[Obsolete]");
- gen_info.Writer.Write("\t\t");
+// GtkSharp.Generation.Method.cs - The Method Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Method : MethodBase {
+
+ private ReturnValue retval;
+
+ private string call;
+ private bool is_get, is_set;
+ private bool deprecated = false;
+
+ public Method (XmlElement elem, ClassBase container_type) : base (elem, container_type)
+ {
+ this.retval = new ReturnValue (elem["return-type"]);
+
+ if (!container_type.IsDeprecated && elem.HasAttribute ("deprecated")) {
+ string attr = elem.GetAttribute ("deprecated");
+ deprecated = attr == "1" || attr == "true";
+ }
+
+ if (Name == "GetType")
+ Name = "GetGType";
+ }
+
+ public bool IsDeprecated {
+ get {
+ return deprecated;
+ }
+ }
+
+ public bool IsGetter {
+ get {
+ return is_get;
+ }
+ }
+
+ public bool IsSetter {
+ get {
+ return is_set;
+ }
+ }
+
+ public string ReturnType {
+ get {
+ return retval.CSType;
+ }
+ }
+
+ public override bool Validate ()
+ {
+ if (!retval.Validate () || !base.Validate ()) {
+ Console.Write(" in method " + Name + " ");
+ return false;
+ }
+
+ Parameters parms = Parameters;
+ is_get = ((((parms.IsAccessor && retval.IsVoid) || (parms.Count == 0 && !retval.IsVoid)) || (parms.Count == 0 && !retval.IsVoid)) && HasGetterName);
+ is_set = ((parms.IsAccessor || (parms.VisibleCount == 1 && retval.IsVoid)) && HasSetterName);
+
+ call = "(" + (IsStatic ? "" : container_type.CallByName () + (parms.Count > 0 ? ", " : "")) + Body.GetCallString (is_set) + ")";
+
+ return true;
+ }
+
+ private Method GetComplement ()
+ {
+ char complement;
+ if (is_get)
+ complement = 'S';
+ else
+ complement = 'G';
+
+ return container_type.GetMethod (complement + BaseName.Substring (1));
+ }
+
+ public string Declaration {
+ get {
+ return retval.CSType + " " + Name + " (" + (Signature != null ? Signature.ToString() : "") + ");";
+ }
+ }
+
+ private void GenerateDeclCommon (StreamWriter sw, ClassBase implementor)
+ {
+ if (IsStatic)
+ sw.Write("static ");
+ sw.Write (Safety);
+ Method dup = null;
+ if (container_type != null)
+ dup = container_type.GetMethodRecursively (Name);
+ if (implementor != null)
+ dup = implementor.GetMethodRecursively (Name);
+
+ if (Name == "ToString" && Parameters.Count == 0)
+ sw.Write("override ");
+ else if (Name == "GetGType" && container_type is ObjectGen)
+ sw.Write("new ");
+ else if (Modifiers == "new " || (dup != null && ((dup.Signature != null && Signature != null && dup.Signature.ToString() == Signature.ToString()) || (dup.Signature == null && Signature == null))))
+ sw.Write("new ");
+
+ if (is_get || is_set) {
+ if (retval.IsVoid)
+ sw.Write (Parameters.AccessorReturnType);
+ else
+ sw.Write(retval.CSType);
+ sw.Write(" ");
+ if (Name.StartsWith ("Get") || Name.StartsWith ("Set"))
+ sw.Write (Name.Substring (3));
+ else {
+ int dot = Name.LastIndexOf ('.');
+ if (dot != -1 && (Name.Substring (dot + 1, 3) == "Get" || Name.Substring (dot + 1, 3) == "Set"))
+ sw.Write (Name.Substring (0, dot + 1) + Name.Substring (dot + 4));
+ else
+ sw.Write (Name);
+ }
+ sw.WriteLine(" { ");
+ } else if (IsAccessor) {
+ sw.Write (Signature.AccessorType + " " + Name + "(" + Signature.AsAccessor + ")");
+ } else {
+ sw.Write(retval.CSType + " " + Name + "(" + (Signature != null ? Signature.ToString() : "") + ")");
+ }
+ }
+
+ public void GenerateDecl (StreamWriter sw)
+ {
+ if (IsStatic)
+ return;
+
+ if (is_get || is_set)
+ {
+ Method comp = GetComplement ();
+ if (comp != null && is_set)
+ return;
+
+ sw.Write("\t\t");
+ GenerateDeclCommon (sw, null);
+
+ sw.Write("\t\t\t");
+ sw.Write ((is_get) ? "get;" : "set;");
+
+ if (comp != null && comp.is_set)
+ sw.WriteLine (" set;");
+ else
+ sw.WriteLine ();
+
+ sw.WriteLine ("\t\t}");
+ }
+ else
+ {
+ sw.Write("\t\t");
+ GenerateDeclCommon (sw, null);
+ sw.WriteLine (";");
+ }
+
+ Statistics.MethodCount++;
+ }
+
+ public void GenerateImport (StreamWriter sw)
+ {
+ string import_sig = IsStatic ? "" : container_type.MarshalType + " raw";
+ import_sig += !IsStatic && Parameters.Count > 0 ? ", " : "";
+ import_sig += Parameters.ImportSignature.ToString();
+ sw.WriteLine("\t\t[DllImport(\"" + LibraryName + "\")]");
+ if (retval.MarshalType.StartsWith ("[return:"))
+ sw.WriteLine("\t\t" + retval.MarshalType + " static extern " + Safety + retval.CSType + " " + CName + "(" + import_sig + ");");
+ else
+ sw.WriteLine("\t\tstatic extern " + Safety + retval.MarshalType + " " + CName + "(" + import_sig + ");");
+ sw.WriteLine();
+ }
+
+ public void Generate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ if (!Validate ())
+ return;
+
+ Method comp = null;
+
+ gen_info.CurrentMember = Name;
+
+ /* we are generated by the get Method, if there is one */
+ if (is_set || is_get)
+ {
+ if (Modifiers != "new " && container_type.GetPropertyRecursively (Name.Substring (3)) != null)
+ return;
+ comp = GetComplement ();
+ if (comp != null && is_set) {
+ if (Parameters.AccessorReturnType == comp.ReturnType)
+ return;
+ else {
+ is_set = false;
+ call = "(Handle, " + Body.GetCallString (false) + ")";
+ comp = null;
+ }
+ }
+ /* some setters take more than one arg */
+ if (comp != null && !comp.is_set)
+ comp = null;
+ }
+
+ GenerateImport (gen_info.Writer);
+ if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
+ comp.GenerateImport (gen_info.Writer);
+
+ if (IsDeprecated)
+ gen_info.Writer.WriteLine("\t\t[Obsolete]");
+ gen_info.Writer.Write("\t\t");
if (Protection != "")
- gen_info.Writer.Write("{0} ", Protection);
- GenerateDeclCommon (gen_info.Writer, implementor);
-
- if (is_get || is_set)
- {
- gen_info.Writer.Write ("\t\t\t");
- gen_info.Writer.Write ((is_get) ? "get" : "set");
- GenerateBody (gen_info, implementor, "\t");
- }
- else
- GenerateBody (gen_info, implementor, "");
-
- if (is_get || is_set)
- {
- if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
- {
- gen_info.Writer.WriteLine ();
- gen_info.Writer.Write ("\t\t\tset");
- comp.GenerateBody (gen_info, implementor, "\t");
- }
- gen_info.Writer.WriteLine ();
- gen_info.Writer.WriteLine ("\t\t}");
- }
- else
- gen_info.Writer.WriteLine();
-
- gen_info.Writer.WriteLine();
-
- Statistics.MethodCount++;
- }
-
- public void GenerateBody (GenerationInfo gen_info, ClassBase implementor, string indent)
- {
- StreamWriter sw = gen_info.Writer;
- sw.WriteLine(" {");
- if (!IsStatic && implementor != null)
- implementor.Prepare (sw, indent + "\t\t\t");
- if (IsAccessor)
- Body.InitAccessor (sw, Signature, indent);
- Body.Initialize(gen_info, is_get, is_set, indent);
-
- sw.Write(indent + "\t\t\t");
- if (retval.IsVoid)
- sw.WriteLine(CName + call + ";");
- else {
- sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
- sw.WriteLine(indent + "\t\t\t" + retval.CSType + " ret = " + retval.FromNative ("raw_ret") + ";");
- }
-
- if (!IsStatic && implementor != null)
- implementor.Finish (sw, indent + "\t\t\t");
- Body.Finish (sw, indent);
- Body.HandleException (sw, indent);
-
- if (is_get && Parameters.Count > 0)
- sw.WriteLine (indent + "\t\t\treturn " + Parameters.AccessorName + ";");
- else if (!retval.IsVoid)
- sw.WriteLine (indent + "\t\t\treturn ret;");
- else if (IsAccessor)
- Body.FinishAccessor (sw, Signature, indent);
-
- sw.Write(indent + "\t\t}");
- }
-
- bool IsAccessor {
- get {
- return retval.IsVoid && Signature.IsAccessor;
- }
- }
- }
-}
-
+ gen_info.Writer.Write("{0} ", Protection);
+ GenerateDeclCommon (gen_info.Writer, implementor);
+
+ if (is_get || is_set)
+ {
+ gen_info.Writer.Write ("\t\t\t");
+ gen_info.Writer.Write ((is_get) ? "get" : "set");
+ GenerateBody (gen_info, implementor, "\t");
+ }
+ else
+ GenerateBody (gen_info, implementor, "");
+
+ if (is_get || is_set)
+ {
+ if (comp != null && retval.CSType == comp.Parameters.AccessorReturnType)
+ {
+ gen_info.Writer.WriteLine ();
+ gen_info.Writer.Write ("\t\t\tset");
+ comp.GenerateBody (gen_info, implementor, "\t");
+ }
+ gen_info.Writer.WriteLine ();
+ gen_info.Writer.WriteLine ("\t\t}");
+ }
+ else
+ gen_info.Writer.WriteLine();
+
+ gen_info.Writer.WriteLine();
+
+ Statistics.MethodCount++;
+ }
+
+ public void GenerateBody (GenerationInfo gen_info, ClassBase implementor, string indent)
+ {
+ StreamWriter sw = gen_info.Writer;
+ sw.WriteLine(" {");
+ if (!IsStatic && implementor != null)
+ implementor.Prepare (sw, indent + "\t\t\t");
+ if (IsAccessor)
+ Body.InitAccessor (sw, Signature, indent);
+ Body.Initialize(gen_info, is_get, is_set, indent);
+
+ sw.Write(indent + "\t\t\t");
+ if (retval.IsVoid)
+ sw.WriteLine(CName + call + ";");
+ else {
+ sw.WriteLine(retval.MarshalType + " raw_ret = " + CName + call + ";");
+ sw.WriteLine(indent + "\t\t\t" + retval.CSType + " ret = " + retval.FromNative ("raw_ret") + ";");
+ }
+
+ if (!IsStatic && implementor != null)
+ implementor.Finish (sw, indent + "\t\t\t");
+ Body.Finish (sw, indent);
+ Body.HandleException (sw, indent);
+
+ if (is_get && Parameters.Count > 0)
+ sw.WriteLine (indent + "\t\t\treturn " + Parameters.AccessorName + ";");
+ else if (!retval.IsVoid)
+ sw.WriteLine (indent + "\t\t\treturn ret;");
+ else if (IsAccessor)
+ Body.FinishAccessor (sw, Signature, indent);
+
+ sw.Write(indent + "\t\t}");
+ }
+
+ bool IsAccessor {
+ get {
+ return retval.IsVoid && Signature.IsAccessor;
+ }
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/MethodBody.cs b/lib/unique-sharp/generator/MethodBody.cs
index cee7079..2f614d0 100644
--- a/lib/unique-sharp/generator/MethodBody.cs
+++ b/lib/unique-sharp/generator/MethodBody.cs
@@ -1,177 +1,177 @@
-// GtkSharp.Generation.MethodBody.cs - The MethodBody Generation Class.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
-
- public class MethodBody {
-
- Parameters parameters;
-
- public MethodBody (Parameters parms)
- {
- parameters = parms;
- }
-
- private string CastFromInt (string type)
- {
- return type != "int" ? "(" + type + ") " : "";
- }
-
- public string GetCallString (bool is_set)
- {
- if (parameters.Count == 0)
- return String.Empty;
-
- string[] result = new string [parameters.Count];
- for (int i = 0; i < parameters.Count; i++) {
- Parameter p = parameters [i];
- IGeneratable igen = p.Generatable;
-
- bool is_prop = is_set && i == 0;
-
- if (i > 0 && parameters [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
- string string_name = (i == 1 && is_set) ? "value" : parameters [i - 1].Name;
- result[i] = igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
- continue;
- }
-
- if (is_prop)
- p.CallName = "value";
- else
- p.CallName = p.Name;
- string call_parm = p.CallString;
-
- if (p.IsUserData && parameters.IsHidden (p) && !parameters.HideData &&
- (i == 0 || parameters [i - 1].Scope != "notified")) {
- call_parm = "IntPtr.Zero";
- }
-
- result [i] += call_parm;
- }
-
- return String.Join (", ", result);
- }
-
- public void Initialize (GenerationInfo gen_info)
- {
- Initialize (gen_info, false, false, String.Empty);
- }
-
- public void Initialize (GenerationInfo gen_info, bool is_get, bool is_set, string indent)
- {
- if (parameters.Count == 0)
- return;
-
- StreamWriter sw = gen_info.Writer;
- for (int i = 0; i < parameters.Count; i++) {
- Parameter p = parameters [i];
-
- IGeneratable gen = p.Generatable;
- string name = p.Name;
- if (is_set)
- name = "value";
-
- p.CallName = name;
- foreach (string prep in p.Prepare)
- sw.WriteLine (indent + "\t\t\t" + prep);
-
- if (gen is CallbackGen) {
- CallbackGen cbgen = gen as CallbackGen;
- string wrapper = cbgen.GenWrapper(gen_info);
- switch (p.Scope) {
- case "notified":
- sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
- sw.WriteLine (indent + "\t\t\tIntPtr {0};", parameters [i + 1].Name);
- sw.WriteLine (indent + "\t\t\t{0} {1};", parameters [i + 2].CSType, parameters [i + 2].Name);
- sw.WriteLine (indent + "\t\t\tif ({0} == null) {{", name);
- sw.WriteLine (indent + "\t\t\t\t{0} = IntPtr.Zero;", parameters [i + 1].Name);
- sw.WriteLine (indent + "\t\t\t\t{0} = null;", parameters [i + 2].Name);
- sw.WriteLine (indent + "\t\t\t} else {");
- sw.WriteLine (indent + "\t\t\t\t{0} = (IntPtr) GCHandle.Alloc ({1}_wrapper);", parameters [i + 1].Name, name);
- sw.WriteLine (indent + "\t\t\t\t{0} = GLib.DestroyHelper.NotifyHandler;", parameters [i + 2].Name, parameters [i + 2].CSType);
- sw.WriteLine (indent + "\t\t\t}");
- break;
-
- case "async":
- sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
- sw.WriteLine (indent + "\t\t\t{0}_wrapper.PersistUntilCalled ();", name);
- break;
- case "call":
- default:
- if (p.Scope == String.Empty)
- Console.WriteLine ("Defaulting " + gen.Name + " param to 'call' scope in method " + gen_info.CurrentMember);
- sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
- break;
- }
- }
- }
-
- if (ThrowsException)
- sw.WriteLine (indent + "\t\t\tIntPtr error = IntPtr.Zero;");
- }
-
- public void InitAccessor (StreamWriter sw, Signature sig, string indent)
- {
- sw.WriteLine (indent + "\t\t\t" + sig.AccessorType + " " + sig.AccessorName + ";");
- }
-
- public void Finish (StreamWriter sw, string indent)
- {
- foreach (Parameter p in parameters)
- foreach (string s in p.Finish)
- sw.WriteLine(indent + "\t\t\t" + s);
- }
-
- public void FinishAccessor (StreamWriter sw, Signature sig, string indent)
- {
- sw.WriteLine (indent + "\t\t\treturn " + sig.AccessorName + ";");
- }
-
- public void HandleException (StreamWriter sw, string indent)
- {
- if (!ThrowsException)
- return;
- sw.WriteLine (indent + "\t\t\tif (error != IntPtr.Zero) throw new GLib.GException (error);");
- }
-
- public bool ThrowsException {
- get {
- int idx = parameters.Count - 1;
-
- while (idx >= 0) {
- if (parameters [idx].IsUserData)
- idx--;
- else if (parameters [idx].CType == "GError**")
- return true;
- else
- break;
- }
- return false;
- }
- }
- }
-}
-
+// GtkSharp.Generation.MethodBody.cs - The MethodBody Generation Class.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+
+ public class MethodBody {
+
+ Parameters parameters;
+
+ public MethodBody (Parameters parms)
+ {
+ parameters = parms;
+ }
+
+ private string CastFromInt (string type)
+ {
+ return type != "int" ? "(" + type + ") " : "";
+ }
+
+ public string GetCallString (bool is_set)
+ {
+ if (parameters.Count == 0)
+ return String.Empty;
+
+ string[] result = new string [parameters.Count];
+ for (int i = 0; i < parameters.Count; i++) {
+ Parameter p = parameters [i];
+ IGeneratable igen = p.Generatable;
+
+ bool is_prop = is_set && i == 0;
+
+ if (i > 0 && parameters [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
+ string string_name = (i == 1 && is_set) ? "value" : parameters [i - 1].Name;
+ result[i] = igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
+ continue;
+ }
+
+ if (is_prop)
+ p.CallName = "value";
+ else
+ p.CallName = p.Name;
+ string call_parm = p.CallString;
+
+ if (p.IsUserData && parameters.IsHidden (p) && !parameters.HideData &&
+ (i == 0 || parameters [i - 1].Scope != "notified")) {
+ call_parm = "IntPtr.Zero";
+ }
+
+ result [i] += call_parm;
+ }
+
+ return String.Join (", ", result);
+ }
+
+ public void Initialize (GenerationInfo gen_info)
+ {
+ Initialize (gen_info, false, false, String.Empty);
+ }
+
+ public void Initialize (GenerationInfo gen_info, bool is_get, bool is_set, string indent)
+ {
+ if (parameters.Count == 0)
+ return;
+
+ StreamWriter sw = gen_info.Writer;
+ for (int i = 0; i < parameters.Count; i++) {
+ Parameter p = parameters [i];
+
+ IGeneratable gen = p.Generatable;
+ string name = p.Name;
+ if (is_set)
+ name = "value";
+
+ p.CallName = name;
+ foreach (string prep in p.Prepare)
+ sw.WriteLine (indent + "\t\t\t" + prep);
+
+ if (gen is CallbackGen) {
+ CallbackGen cbgen = gen as CallbackGen;
+ string wrapper = cbgen.GenWrapper(gen_info);
+ switch (p.Scope) {
+ case "notified":
+ sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
+ sw.WriteLine (indent + "\t\t\tIntPtr {0};", parameters [i + 1].Name);
+ sw.WriteLine (indent + "\t\t\t{0} {1};", parameters [i + 2].CSType, parameters [i + 2].Name);
+ sw.WriteLine (indent + "\t\t\tif ({0} == null) {{", name);
+ sw.WriteLine (indent + "\t\t\t\t{0} = IntPtr.Zero;", parameters [i + 1].Name);
+ sw.WriteLine (indent + "\t\t\t\t{0} = null;", parameters [i + 2].Name);
+ sw.WriteLine (indent + "\t\t\t} else {");
+ sw.WriteLine (indent + "\t\t\t\t{0} = (IntPtr) GCHandle.Alloc ({1}_wrapper);", parameters [i + 1].Name, name);
+ sw.WriteLine (indent + "\t\t\t\t{0} = GLib.DestroyHelper.NotifyHandler;", parameters [i + 2].Name, parameters [i + 2].CSType);
+ sw.WriteLine (indent + "\t\t\t}");
+ break;
+
+ case "async":
+ sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
+ sw.WriteLine (indent + "\t\t\t{0}_wrapper.PersistUntilCalled ();", name);
+ break;
+ case "call":
+ default:
+ if (p.Scope == String.Empty)
+ Console.WriteLine ("Defaulting " + gen.Name + " param to 'call' scope in method " + gen_info.CurrentMember);
+ sw.WriteLine (indent + "\t\t\t{0} {1}_wrapper = new {0} ({1});", wrapper, name);
+ break;
+ }
+ }
+ }
+
+ if (ThrowsException)
+ sw.WriteLine (indent + "\t\t\tIntPtr error = IntPtr.Zero;");
+ }
+
+ public void InitAccessor (StreamWriter sw, Signature sig, string indent)
+ {
+ sw.WriteLine (indent + "\t\t\t" + sig.AccessorType + " " + sig.AccessorName + ";");
+ }
+
+ public void Finish (StreamWriter sw, string indent)
+ {
+ foreach (Parameter p in parameters)
+ foreach (string s in p.Finish)
+ sw.WriteLine(indent + "\t\t\t" + s);
+ }
+
+ public void FinishAccessor (StreamWriter sw, Signature sig, string indent)
+ {
+ sw.WriteLine (indent + "\t\t\treturn " + sig.AccessorName + ";");
+ }
+
+ public void HandleException (StreamWriter sw, string indent)
+ {
+ if (!ThrowsException)
+ return;
+ sw.WriteLine (indent + "\t\t\tif (error != IntPtr.Zero) throw new GLib.GException (error);");
+ }
+
+ public bool ThrowsException {
+ get {
+ int idx = parameters.Count - 1;
+
+ while (idx >= 0) {
+ if (parameters [idx].IsUserData)
+ idx--;
+ else if (parameters [idx].CType == "GError**")
+ return true;
+ else
+ break;
+ }
+ return false;
+ }
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/ObjectGen.cs b/lib/unique-sharp/generator/ObjectGen.cs
index 58d2c17..2235a64 100644
--- a/lib/unique-sharp/generator/ObjectGen.cs
+++ b/lib/unique-sharp/generator/ObjectGen.cs
@@ -1,425 +1,425 @@
-// GtkSharp.Generation.ObjectGen.cs - The Object Generatable.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Text;
- using System.Xml;
-
- public class ObjectGen : ObjectBase {
-
- private ArrayList custom_attrs = new ArrayList();
- private ArrayList strings = new ArrayList();
- private ArrayList vm_nodes = new ArrayList();
- private Hashtable childprops = new Hashtable();
- private static Hashtable dirs = new Hashtable ();
-
- public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem)
- {
- foreach (XmlNode node in elem.ChildNodes) {
- string name;
-
- if (!(node is XmlElement)) continue;
- XmlElement member = (XmlElement) node;
-
- switch (node.Name) {
- case "callback":
- Statistics.IgnoreCount++;
- break;
-
- case "custom-attribute":
- custom_attrs.Add (member.InnerXml);
- break;
-
- case "virtual_method":
- Statistics.IgnoreCount++;
- break;
-
- case "static-string":
- strings.Add (node);
- break;
-
- case "childprop":
- name = member.GetAttribute ("name");
- while (childprops.ContainsKey (name))
- name += "mangled";
- childprops.Add (name, new ChildProperty (member, this));
- break;
-
- default:
- if (!IsNodeNameHandled (node.Name))
- Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
- break;
- }
- }
- }
-
- public override bool Validate ()
- {
- ArrayList invalids = new ArrayList ();
-
- foreach (ChildProperty prop in childprops.Values) {
- if (!prop.Validate ()) {
- Console.WriteLine ("in Object " + QualifiedName);
- invalids.Add (prop);
- }
- }
- foreach (ChildProperty prop in invalids)
- childprops.Remove (prop);
-
- return base.Validate ();
- }
-
- private bool DisableVoidCtor {
- get {
- return Elem.HasAttribute ("disable_void_ctor");
- }
- }
-
- private bool DisableGTypeCtor {
- get {
- return Elem.HasAttribute ("disable_gtype_ctor");
- }
- }
-
- private class DirectoryInfo {
- public string assembly_name;
- public Hashtable objects;
-
- public DirectoryInfo (string assembly_name) {
- this.assembly_name = assembly_name;
- objects = new Hashtable ();
- }
- }
-
- private static DirectoryInfo GetDirectoryInfo (string dir, string assembly_name)
- {
- DirectoryInfo result;
-
- if (dirs.ContainsKey (dir)) {
- result = dirs [dir] as DirectoryInfo;
- if (result.assembly_name != assembly_name) {
- Console.WriteLine ("Can't put multiple assemblies in one directory.");
- return null;
- }
-
- return result;
- }
-
- result = new DirectoryInfo (assembly_name);
- dirs.Add (dir, result);
-
- return result;
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- string asm_name = gen_info.AssemblyName.Length == 0 ? NS.ToLower () + "-sharp" : gen_info.AssemblyName;
- DirectoryInfo di = GetDirectoryInfo (gen_info.Dir, asm_name);
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Collections;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- SymbolTable table = SymbolTable.Table;
-
- sw.WriteLine ("#region Autogenerated code");
- if (IsDeprecated)
- sw.WriteLine ("\t[Obsolete]");
- foreach (string attr in custom_attrs)
- sw.WriteLine ("\t" + attr);
- sw.Write ("\t{0} {1}class " + Name, IsInternal ? "internal" : "public", IsAbstract ? "abstract " : "");
- string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
- if (cs_parent != "") {
- di.objects.Add (CName, QualifiedName);
- sw.Write (" : " + cs_parent);
- }
- foreach (string iface in interfaces) {
- if (Parent != null && Parent.Implements (iface))
- continue;
- sw.Write (", " + table.GetCSType (iface));
- }
- foreach (string iface in managed_interfaces) {
- if (Parent != null && Parent.Implements (iface))
- continue;
- sw.Write (", " + iface);
- }
- sw.WriteLine (" {");
- sw.WriteLine ();
-
- GenCtors (gen_info);
- GenProperties (gen_info, null);
- GenFields (gen_info);
- GenChildProperties (gen_info);
-
- bool has_sigs = (sigs != null && sigs.Count > 0);
- if (!has_sigs) {
- foreach (string iface in interfaces) {
- ClassBase igen = table.GetClassGen (iface);
- if (igen != null && igen.Signals != null) {
- has_sigs = true;
- break;
- }
- }
- }
-
- if (has_sigs && Elem.HasAttribute("parent")) {
- GenSignals (gen_info, null);
- }
-
- if (vm_nodes.Count > 0) {
- if (gen_info.GlueEnabled) {
- GenVirtualMethods (gen_info);
- } else {
- Statistics.VMIgnored = true;
- Statistics.ThrottledCount += vm_nodes.Count;
- }
- }
-
- GenMethods (gen_info, null, null);
-
- if (interfaces.Count != 0) {
- Hashtable all_methods = new Hashtable ();
- foreach (Method m in Methods.Values)
- all_methods[m.Name] = m;
- Hashtable collisions = new Hashtable ();
- foreach (string iface in interfaces) {
- ClassBase igen = table.GetClassGen (iface);
- foreach (Method m in igen.Methods.Values) {
- Method collision = all_methods[m.Name] as Method;
- if (collision != null && collision.Signature.Types == m.Signature.Types)
- collisions[m.Name] = true;
- else
- all_methods[m.Name] = m;
- }
- }
-
- foreach (string iface in interfaces) {
- if (Parent != null && Parent.Implements (iface))
- continue;
- ClassBase igen = table.GetClassGen (iface);
- igen.GenMethods (gen_info, collisions, this);
- igen.GenProperties (gen_info, this);
- igen.GenSignals (gen_info, this);
- }
- }
-
- foreach (XmlElement str in strings) {
- sw.Write ("\t\tpublic static string " + str.GetAttribute ("name"));
- sw.WriteLine (" {\n\t\t\t get { return \"" + str.GetAttribute ("value") + "\"; }\n\t\t}");
- }
-
- if (cs_parent != String.Empty && GetExpected (CName) != QualifiedName) {
- sw.WriteLine ();
- sw.WriteLine ("\t\tstatic " + Name + " ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGtkSharp." + Studlify (asm_name) + ".ObjectManager.Initialize ();");
- sw.WriteLine ("\t\t}");
- }
-
- sw.WriteLine ("#endregion");
- AppendCustom (sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
-
- sw.Close ();
- gen_info.Writer = null;
- Statistics.ObjectCount++;
- }
-
- protected override void GenCtors (GenerationInfo gen_info)
- {
- if (!Elem.HasAttribute("parent"))
- return;
-
- if (!DisableGTypeCtor) {
- gen_info.Writer.WriteLine("\t\t[Obsolete]");
- gen_info.Writer.WriteLine("\t\tprotected " + Name + "(GLib.GType gtype) : base(gtype) {}");
- }
- gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
- if (ctors.Count == 0 && !DisableVoidCtor) {
- gen_info.Writer.WriteLine();
- gen_info.Writer.WriteLine("\t\tprotected " + Name + "() : base(IntPtr.Zero)");
- gen_info.Writer.WriteLine("\t\t{");
- gen_info.Writer.WriteLine("\t\t\tCreateNativeObject (new string [0], new GLib.Value [0]);");
- gen_info.Writer.WriteLine("\t\t}");
- }
- gen_info.Writer.WriteLine();
-
- base.GenCtors (gen_info);
- }
-
- protected void GenChildProperties (GenerationInfo gen_info)
- {
- if (childprops.Count == 0)
- return;
-
- StreamWriter sw = gen_info.Writer;
-
- ObjectGen child_ancestor = Parent as ObjectGen;
- while (child_ancestor.CName != "GtkContainer" &&
- child_ancestor.childprops.Count == 0)
- child_ancestor = child_ancestor.Parent as ObjectGen;
-
- sw.WriteLine ("\t\tpublic class " + Name + "Child : " + child_ancestor.NS + "." + child_ancestor.Name + "." + child_ancestor.Name + "Child {");
- sw.WriteLine ("\t\t\tprotected internal " + Name + "Child (Gtk.Container parent, Gtk.Widget child) : base (parent, child) {}");
- sw.WriteLine ("");
-
- foreach (ChildProperty prop in childprops.Values)
- prop.Generate (gen_info, "\t\t\t", null);
-
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("");
-
- sw.WriteLine ("\t\tpublic override Gtk.Container.ContainerChild this [Gtk.Widget child] {");
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn new " + Name + "Child (this, child);");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("");
-
- }
-
- private void GenVMGlue (GenerationInfo gen_info, XmlElement elem)
- {
- StreamWriter sw = gen_info.GlueWriter;
-
- string vm_name = elem.GetAttribute ("cname");
- string method = gen_info.GluelibName + "_" + NS + Name + "_override_" + vm_name;
- sw.WriteLine ();
- sw.WriteLine ("void " + method + " (GType type, gpointer cb);");
- sw.WriteLine ();
- sw.WriteLine ("void");
- sw.WriteLine (method + " (GType type, gpointer cb)");
- sw.WriteLine ("{");
- sw.WriteLine ("\t{0} *klass = ({0} *) g_type_class_peek (type);", NS + Name + "Class");
- sw.WriteLine ("\tklass->" + vm_name + " = cb;");
- sw.WriteLine ("}");
- }
-
- static bool vmhdrs_needed = true;
-
- private void GenVirtualMethods (GenerationInfo gen_info)
- {
- if (vmhdrs_needed) {
- gen_info.GlueWriter.WriteLine ("#include <glib-object.h>");
- gen_info.GlueWriter.WriteLine ("#include \"vmglueheaders.h\"");
- gen_info.GlueWriter.WriteLine ();
- vmhdrs_needed = false;
- }
-
- foreach (XmlElement elem in vm_nodes) {
- GenVMGlue (gen_info, elem);
- }
- }
-
- /* Keep this in sync with the one in glib/GType.cs */
- private static string GetExpected (string cname)
- {
- for (int i = 1; i < cname.Length; i++) {
- if (Char.IsUpper (cname[i])) {
- if (i == 1 && cname[0] == 'G')
- return "GLib." + cname.Substring (1);
- else
- return cname.Substring (0, i) + "." + cname.Substring (i);
- }
- }
-
- throw new ArgumentException ("cname doesn't follow the NamespaceType capitalization style: " + cname);
- }
-
- private static bool NeedsMap (Hashtable objs, string assembly_name)
- {
- foreach (string key in objs.Keys)
- if (GetExpected (key) != ((string) objs[key]))
- return true;
-
- return false;
- }
-
- private static string Studlify (string name)
- {
- string result = "";
-
- string[] subs = name.Split ('-');
- foreach (string sub in subs)
- result += Char.ToUpper (sub[0]) + sub.Substring (1);
-
- return result;
- }
-
- public static void GenerateMappers ()
- {
- foreach (string dir in dirs.Keys) {
-
- DirectoryInfo di = dirs[dir] as DirectoryInfo;
-
- if (!NeedsMap (di.objects, di.assembly_name))
- continue;
-
- GenerationInfo gen_info = new GenerationInfo (dir, di.assembly_name);
-
- GenerateMapper (di, gen_info);
- }
- }
-
- private static void GenerateMapper (DirectoryInfo dir_info, GenerationInfo gen_info)
- {
- StreamWriter sw = gen_info.OpenStream ("ObjectManager");
-
- sw.WriteLine ("namespace GtkSharp." + Studlify (dir_info.assembly_name) + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tpublic class ObjectManager {");
- sw.WriteLine ();
- sw.WriteLine ("\t\tstatic bool initialized = false;");
- sw.WriteLine ("\t\t// Call this method from the appropriate module init function.");
- sw.WriteLine ("\t\tpublic static void Initialize ()");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (initialized)");
- sw.WriteLine ("\t\t\t\treturn;");
- sw.WriteLine ("");
- sw.WriteLine ("\t\t\tinitialized = true;");
-
- foreach (string key in dir_info.objects.Keys) {
- if (GetExpected(key) != ((string) dir_info.objects[key]))
- sw.WriteLine ("\t\t\tGLib.GType.Register ({0}.GType, typeof ({0}));", dir_info.objects [key]);
- }
-
- sw.WriteLine ("\t\t}");
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- }
- }
-}
-
+// GtkSharp.Generation.ObjectGen.cs - The Object Generatable.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Text;
+ using System.Xml;
+
+ public class ObjectGen : ObjectBase {
+
+ private ArrayList custom_attrs = new ArrayList();
+ private ArrayList strings = new ArrayList();
+ private ArrayList vm_nodes = new ArrayList();
+ private Hashtable childprops = new Hashtable();
+ private static Hashtable dirs = new Hashtable ();
+
+ public ObjectGen (XmlElement ns, XmlElement elem) : base (ns, elem)
+ {
+ foreach (XmlNode node in elem.ChildNodes) {
+ string name;
+
+ if (!(node is XmlElement)) continue;
+ XmlElement member = (XmlElement) node;
+
+ switch (node.Name) {
+ case "callback":
+ Statistics.IgnoreCount++;
+ break;
+
+ case "custom-attribute":
+ custom_attrs.Add (member.InnerXml);
+ break;
+
+ case "virtual_method":
+ Statistics.IgnoreCount++;
+ break;
+
+ case "static-string":
+ strings.Add (node);
+ break;
+
+ case "childprop":
+ name = member.GetAttribute ("name");
+ while (childprops.ContainsKey (name))
+ name += "mangled";
+ childprops.Add (name, new ChildProperty (member, this));
+ break;
+
+ default:
+ if (!IsNodeNameHandled (node.Name))
+ Console.WriteLine ("Unexpected node " + node.Name + " in " + CName);
+ break;
+ }
+ }
+ }
+
+ public override bool Validate ()
+ {
+ ArrayList invalids = new ArrayList ();
+
+ foreach (ChildProperty prop in childprops.Values) {
+ if (!prop.Validate ()) {
+ Console.WriteLine ("in Object " + QualifiedName);
+ invalids.Add (prop);
+ }
+ }
+ foreach (ChildProperty prop in invalids)
+ childprops.Remove (prop);
+
+ return base.Validate ();
+ }
+
+ private bool DisableVoidCtor {
+ get {
+ return Elem.HasAttribute ("disable_void_ctor");
+ }
+ }
+
+ private bool DisableGTypeCtor {
+ get {
+ return Elem.HasAttribute ("disable_gtype_ctor");
+ }
+ }
+
+ private class DirectoryInfo {
+ public string assembly_name;
+ public Hashtable objects;
+
+ public DirectoryInfo (string assembly_name) {
+ this.assembly_name = assembly_name;
+ objects = new Hashtable ();
+ }
+ }
+
+ private static DirectoryInfo GetDirectoryInfo (string dir, string assembly_name)
+ {
+ DirectoryInfo result;
+
+ if (dirs.ContainsKey (dir)) {
+ result = dirs [dir] as DirectoryInfo;
+ if (result.assembly_name != assembly_name) {
+ Console.WriteLine ("Can't put multiple assemblies in one directory.");
+ return null;
+ }
+
+ return result;
+ }
+
+ result = new DirectoryInfo (assembly_name);
+ dirs.Add (dir, result);
+
+ return result;
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ string asm_name = gen_info.AssemblyName.Length == 0 ? NS.ToLower () + "-sharp" : gen_info.AssemblyName;
+ DirectoryInfo di = GetDirectoryInfo (gen_info.Dir, asm_name);
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Collections;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ SymbolTable table = SymbolTable.Table;
+
+ sw.WriteLine ("#region Autogenerated code");
+ if (IsDeprecated)
+ sw.WriteLine ("\t[Obsolete]");
+ foreach (string attr in custom_attrs)
+ sw.WriteLine ("\t" + attr);
+ sw.Write ("\t{0} {1}class " + Name, IsInternal ? "internal" : "public", IsAbstract ? "abstract " : "");
+ string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
+ if (cs_parent != "") {
+ di.objects.Add (CName, QualifiedName);
+ sw.Write (" : " + cs_parent);
+ }
+ foreach (string iface in interfaces) {
+ if (Parent != null && Parent.Implements (iface))
+ continue;
+ sw.Write (", " + table.GetCSType (iface));
+ }
+ foreach (string iface in managed_interfaces) {
+ if (Parent != null && Parent.Implements (iface))
+ continue;
+ sw.Write (", " + iface);
+ }
+ sw.WriteLine (" {");
+ sw.WriteLine ();
+
+ GenCtors (gen_info);
+ GenProperties (gen_info, null);
+ GenFields (gen_info);
+ GenChildProperties (gen_info);
+
+ bool has_sigs = (sigs != null && sigs.Count > 0);
+ if (!has_sigs) {
+ foreach (string iface in interfaces) {
+ ClassBase igen = table.GetClassGen (iface);
+ if (igen != null && igen.Signals != null) {
+ has_sigs = true;
+ break;
+ }
+ }
+ }
+
+ if (has_sigs && Elem.HasAttribute("parent")) {
+ GenSignals (gen_info, null);
+ }
+
+ if (vm_nodes.Count > 0) {
+ if (gen_info.GlueEnabled) {
+ GenVirtualMethods (gen_info);
+ } else {
+ Statistics.VMIgnored = true;
+ Statistics.ThrottledCount += vm_nodes.Count;
+ }
+ }
+
+ GenMethods (gen_info, null, null);
+
+ if (interfaces.Count != 0) {
+ Hashtable all_methods = new Hashtable ();
+ foreach (Method m in Methods.Values)
+ all_methods[m.Name] = m;
+ Hashtable collisions = new Hashtable ();
+ foreach (string iface in interfaces) {
+ ClassBase igen = table.GetClassGen (iface);
+ foreach (Method m in igen.Methods.Values) {
+ Method collision = all_methods[m.Name] as Method;
+ if (collision != null && collision.Signature.Types == m.Signature.Types)
+ collisions[m.Name] = true;
+ else
+ all_methods[m.Name] = m;
+ }
+ }
+
+ foreach (string iface in interfaces) {
+ if (Parent != null && Parent.Implements (iface))
+ continue;
+ ClassBase igen = table.GetClassGen (iface);
+ igen.GenMethods (gen_info, collisions, this);
+ igen.GenProperties (gen_info, this);
+ igen.GenSignals (gen_info, this);
+ }
+ }
+
+ foreach (XmlElement str in strings) {
+ sw.Write ("\t\tpublic static string " + str.GetAttribute ("name"));
+ sw.WriteLine (" {\n\t\t\t get { return \"" + str.GetAttribute ("value") + "\"; }\n\t\t}");
+ }
+
+ if (cs_parent != String.Empty && GetExpected (CName) != QualifiedName) {
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstatic " + Name + " ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGtkSharp." + Studlify (asm_name) + ".ObjectManager.Initialize ();");
+ sw.WriteLine ("\t\t}");
+ }
+
+ sw.WriteLine ("#endregion");
+ AppendCustom (sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.ObjectCount++;
+ }
+
+ protected override void GenCtors (GenerationInfo gen_info)
+ {
+ if (!Elem.HasAttribute("parent"))
+ return;
+
+ if (!DisableGTypeCtor) {
+ gen_info.Writer.WriteLine("\t\t[Obsolete]");
+ gen_info.Writer.WriteLine("\t\tprotected " + Name + "(GLib.GType gtype) : base(gtype) {}");
+ }
+ gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
+ if (ctors.Count == 0 && !DisableVoidCtor) {
+ gen_info.Writer.WriteLine();
+ gen_info.Writer.WriteLine("\t\tprotected " + Name + "() : base(IntPtr.Zero)");
+ gen_info.Writer.WriteLine("\t\t{");
+ gen_info.Writer.WriteLine("\t\t\tCreateNativeObject (new string [0], new GLib.Value [0]);");
+ gen_info.Writer.WriteLine("\t\t}");
+ }
+ gen_info.Writer.WriteLine();
+
+ base.GenCtors (gen_info);
+ }
+
+ protected void GenChildProperties (GenerationInfo gen_info)
+ {
+ if (childprops.Count == 0)
+ return;
+
+ StreamWriter sw = gen_info.Writer;
+
+ ObjectGen child_ancestor = Parent as ObjectGen;
+ while (child_ancestor.CName != "GtkContainer" &&
+ child_ancestor.childprops.Count == 0)
+ child_ancestor = child_ancestor.Parent as ObjectGen;
+
+ sw.WriteLine ("\t\tpublic class " + Name + "Child : " + child_ancestor.NS + "." + child_ancestor.Name + "." + child_ancestor.Name + "Child {");
+ sw.WriteLine ("\t\t\tprotected internal " + Name + "Child (Gtk.Container parent, Gtk.Widget child) : base (parent, child) {}");
+ sw.WriteLine ("");
+
+ foreach (ChildProperty prop in childprops.Values)
+ prop.Generate (gen_info, "\t\t\t", null);
+
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("");
+
+ sw.WriteLine ("\t\tpublic override Gtk.Container.ContainerChild this [Gtk.Widget child] {");
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn new " + Name + "Child (this, child);");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("");
+
+ }
+
+ private void GenVMGlue (GenerationInfo gen_info, XmlElement elem)
+ {
+ StreamWriter sw = gen_info.GlueWriter;
+
+ string vm_name = elem.GetAttribute ("cname");
+ string method = gen_info.GluelibName + "_" + NS + Name + "_override_" + vm_name;
+ sw.WriteLine ();
+ sw.WriteLine ("void " + method + " (GType type, gpointer cb);");
+ sw.WriteLine ();
+ sw.WriteLine ("void");
+ sw.WriteLine (method + " (GType type, gpointer cb)");
+ sw.WriteLine ("{");
+ sw.WriteLine ("\t{0} *klass = ({0} *) g_type_class_peek (type);", NS + Name + "Class");
+ sw.WriteLine ("\tklass->" + vm_name + " = cb;");
+ sw.WriteLine ("}");
+ }
+
+ static bool vmhdrs_needed = true;
+
+ private void GenVirtualMethods (GenerationInfo gen_info)
+ {
+ if (vmhdrs_needed) {
+ gen_info.GlueWriter.WriteLine ("#include <glib-object.h>");
+ gen_info.GlueWriter.WriteLine ("#include \"vmglueheaders.h\"");
+ gen_info.GlueWriter.WriteLine ();
+ vmhdrs_needed = false;
+ }
+
+ foreach (XmlElement elem in vm_nodes) {
+ GenVMGlue (gen_info, elem);
+ }
+ }
+
+ /* Keep this in sync with the one in glib/GType.cs */
+ private static string GetExpected (string cname)
+ {
+ for (int i = 1; i < cname.Length; i++) {
+ if (Char.IsUpper (cname[i])) {
+ if (i == 1 && cname[0] == 'G')
+ return "GLib." + cname.Substring (1);
+ else
+ return cname.Substring (0, i) + "." + cname.Substring (i);
+ }
+ }
+
+ throw new ArgumentException ("cname doesn't follow the NamespaceType capitalization style: " + cname);
+ }
+
+ private static bool NeedsMap (Hashtable objs, string assembly_name)
+ {
+ foreach (string key in objs.Keys)
+ if (GetExpected (key) != ((string) objs[key]))
+ return true;
+
+ return false;
+ }
+
+ private static string Studlify (string name)
+ {
+ string result = "";
+
+ string[] subs = name.Split ('-');
+ foreach (string sub in subs)
+ result += Char.ToUpper (sub[0]) + sub.Substring (1);
+
+ return result;
+ }
+
+ public static void GenerateMappers ()
+ {
+ foreach (string dir in dirs.Keys) {
+
+ DirectoryInfo di = dirs[dir] as DirectoryInfo;
+
+ if (!NeedsMap (di.objects, di.assembly_name))
+ continue;
+
+ GenerationInfo gen_info = new GenerationInfo (dir, di.assembly_name);
+
+ GenerateMapper (di, gen_info);
+ }
+ }
+
+ private static void GenerateMapper (DirectoryInfo dir_info, GenerationInfo gen_info)
+ {
+ StreamWriter sw = gen_info.OpenStream ("ObjectManager");
+
+ sw.WriteLine ("namespace GtkSharp." + Studlify (dir_info.assembly_name) + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic class ObjectManager {");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstatic bool initialized = false;");
+ sw.WriteLine ("\t\t// Call this method from the appropriate module init function.");
+ sw.WriteLine ("\t\tpublic static void Initialize ()");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (initialized)");
+ sw.WriteLine ("\t\t\t\treturn;");
+ sw.WriteLine ("");
+ sw.WriteLine ("\t\t\tinitialized = true;");
+
+ foreach (string key in dir_info.objects.Keys) {
+ if (GetExpected(key) != ((string) dir_info.objects[key]))
+ sw.WriteLine ("\t\t\tGLib.GType.Register ({0}.GType, typeof ({0}));", dir_info.objects [key]);
+ }
+
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/OpaqueGen.cs b/lib/unique-sharp/generator/OpaqueGen.cs
index 2f77e62..89e6b1f 100644
--- a/lib/unique-sharp/generator/OpaqueGen.cs
+++ b/lib/unique-sharp/generator/OpaqueGen.cs
@@ -1,74 +1,74 @@
-// GtkSharp.Generation.OpaqueGen.cs - The Opaque Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class OpaqueGen : HandleBase {
-
- public OpaqueGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override string FromNative(string var, bool owned)
- {
- return var + " == IntPtr.Zero ? null : (" + QualifiedName + ") GLib.Opaque.GetOpaque (" + var + ", typeof (" + QualifiedName + "), " + (owned ? "true" : "false") + ")";
- }
-
- private bool DisableRawCtor {
- get {
- return Elem.HasAttribute ("disable_raw_ctor");
- }
- }
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
-
- sw.WriteLine ("namespace " + NS + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
- sw.WriteLine ("\tusing System.Collections;");
- sw.WriteLine ("\tusing System.Runtime.InteropServices;");
- sw.WriteLine ();
-
- sw.WriteLine ("#region Autogenerated code");
-
- SymbolTable table = SymbolTable.Table;
-
- Method ref_, unref, dispose;
- GetSpecialMethods (out ref_, out unref, out dispose);
-
- if (IsDeprecated)
- sw.WriteLine ("\t[Obsolete]");
- sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
- string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
- if (cs_parent != "")
- sw.Write (" : " + cs_parent);
- else
- sw.Write (" : GLib.Opaque");
+// GtkSharp.Generation.OpaqueGen.cs - The Opaque Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class OpaqueGen : HandleBase {
+
+ public OpaqueGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override string FromNative(string var, bool owned)
+ {
+ return var + " == IntPtr.Zero ? null : (" + QualifiedName + ") GLib.Opaque.GetOpaque (" + var + ", typeof (" + QualifiedName + "), " + (owned ? "true" : "false") + ")";
+ }
+
+ private bool DisableRawCtor {
+ get {
+ return Elem.HasAttribute ("disable_raw_ctor");
+ }
+ }
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+
+ sw.WriteLine ("namespace " + NS + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+ sw.WriteLine ("\tusing System.Collections;");
+ sw.WriteLine ("\tusing System.Runtime.InteropServices;");
+ sw.WriteLine ();
+
+ sw.WriteLine ("#region Autogenerated code");
+
+ SymbolTable table = SymbolTable.Table;
+
+ Method ref_, unref, dispose;
+ GetSpecialMethods (out ref_, out unref, out dispose);
+
+ if (IsDeprecated)
+ sw.WriteLine ("\t[Obsolete]");
+ sw.Write ("\t{0} class " + Name, IsInternal ? "internal" : "public");
+ string cs_parent = table.GetCSType(Elem.GetAttribute("parent"));
+ if (cs_parent != "")
+ sw.Write (" : " + cs_parent);
+ else
+ sw.Write (" : GLib.Opaque");
foreach (string iface in managed_interfaces) {
if (Parent != null && Parent.Implements (iface))
@@ -76,162 +76,162 @@ namespace GtkSharp.Generation {
sw.Write (", " + iface);
}
- sw.WriteLine (" {");
- sw.WriteLine ();
-
- GenFields (gen_info);
- GenMethods (gen_info, null, null);
- GenCtors (gen_info);
-
- if (ref_ != null) {
- ref_.GenerateImport (sw);
- sw.WriteLine ("\t\tprotected override void Ref (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (!Owned) {");
- sw.WriteLine ("\t\t\t\t" + ref_.CName + " (raw);");
- sw.WriteLine ("\t\t\t\tOwned = true;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
-
- if (ref_.IsDeprecated) {
- sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
- if (ref_.ReturnType == "void")
- sw.WriteLine ("\t\tpublic void Ref () {}");
- else
- sw.WriteLine ("\t\tpublic " + Name + " Ref () { return this; }");
- sw.WriteLine ();
- }
- }
-
- bool finalizer_needed = false;
-
- if (unref != null) {
- unref.GenerateImport (sw);
- sw.WriteLine ("\t\tprotected override void Unref (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (Owned) {");
- sw.WriteLine ("\t\t\t\t" + unref.CName + " (raw);");
- sw.WriteLine ("\t\t\t\tOwned = false;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
-
- if (unref.IsDeprecated) {
- sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
- sw.WriteLine ("\t\tpublic void Unref () {}");
- sw.WriteLine ();
- }
- finalizer_needed = true;
- }
-
- if (dispose != null) {
- dispose.GenerateImport (sw);
- sw.WriteLine ("\t\tprotected override void Free (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\t" + dispose.CName + " (raw);");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
-
- if (dispose.IsDeprecated) {
- sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now freed automatically\")]");
- sw.WriteLine ("\t\tpublic void " + dispose.Name + " () {}");
- sw.WriteLine ();
- }
- finalizer_needed = true;
- }
-
- if (finalizer_needed) {
- sw.WriteLine ("\t\tclass FinalizerInfo {");
- sw.WriteLine ("\t\t\tIntPtr handle;");
- sw.WriteLine ();
- sw.WriteLine ("\t\t\tpublic FinalizerInfo (IntPtr handle)");
- sw.WriteLine ("\t\t\t{");
- sw.WriteLine ("\t\t\t\tthis.handle = handle;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\t\tpublic bool Handler ()");
- sw.WriteLine ("\t\t\t{");
- if (dispose != null)
- sw.WriteLine ("\t\t\t\t{0} (handle);", dispose.CName);
- else if (unref != null)
- sw.WriteLine ("\t\t\t\t{0} (handle);", unref.CName);
- sw.WriteLine ("\t\t\t\treturn false;");
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- sw.WriteLine ("\t\t~{0} ()", Name);
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (!Owned)");
- sw.WriteLine ("\t\t\t\treturn;");
- sw.WriteLine ("\t\t\tFinalizerInfo info = new FinalizerInfo (Handle);");
- sw.WriteLine ("\t\t\tGLib.Timeout.Add (50, new GLib.TimeoutHandler (info.Handler));");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-
-#if false
- Method copy = Methods ["Copy"] as Method;
- if (copy != null && copy.Parameters.Count == 0) {
- sw.WriteLine ("\t\tprotected override GLib.Opaque Copy (IntPtr raw)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tGLib.Opaque result = new " + QualifiedName + " (" + copy.CName + " (raw));");
- sw.WriteLine ("\t\t\tresult.Owned = true;");
- sw.WriteLine ("\t\t\treturn result;");
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
-#endif
- sw.WriteLine ("#endregion");
-
- AppendCustom(sw, gen_info.CustomDir);
-
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
-
- sw.Close ();
- gen_info.Writer = null;
- Statistics.OpaqueCount++;
- }
-
- void GetSpecialMethods (out Method ref_, out Method unref, out Method dispose)
- {
- ref_ = CheckSpecialMethod (GetMethod ("Ref"));
- unref = CheckSpecialMethod (GetMethod ("Unref"));
-
- dispose = GetMethod ("Free");
- if (dispose == null) {
- dispose = GetMethod ("Destroy");
- if (dispose == null)
- dispose = GetMethod ("Dispose");
- }
- dispose = CheckSpecialMethod (dispose);
- }
-
- Method CheckSpecialMethod (Method method)
- {
- if (method == null)
- return null;
- if (method.ReturnType != "void" &&
- method.ReturnType != QualifiedName)
- return null;
- if (method.Signature.ToString () != "")
- return null;
-
- methods.Remove (method.Name);
- return method;
- }
-
- protected override void GenCtors (GenerationInfo gen_info)
- {
- if (!DisableRawCtor) {
- gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
- gen_info.Writer.WriteLine();
- }
-
- base.GenCtors (gen_info);
- }
-
- }
-}
-
+ sw.WriteLine (" {");
+ sw.WriteLine ();
+
+ GenFields (gen_info);
+ GenMethods (gen_info, null, null);
+ GenCtors (gen_info);
+
+ if (ref_ != null) {
+ ref_.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Ref (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (!Owned) {");
+ sw.WriteLine ("\t\t\t\t" + ref_.CName + " (raw);");
+ sw.WriteLine ("\t\t\t\tOwned = true;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (ref_.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
+ if (ref_.ReturnType == "void")
+ sw.WriteLine ("\t\tpublic void Ref () {}");
+ else
+ sw.WriteLine ("\t\tpublic " + Name + " Ref () { return this; }");
+ sw.WriteLine ();
+ }
+ }
+
+ bool finalizer_needed = false;
+
+ if (unref != null) {
+ unref.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Unref (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (Owned) {");
+ sw.WriteLine ("\t\t\t\t" + unref.CName + " (raw);");
+ sw.WriteLine ("\t\t\t\tOwned = false;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (unref.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now refcounted automatically\")]");
+ sw.WriteLine ("\t\tpublic void Unref () {}");
+ sw.WriteLine ();
+ }
+ finalizer_needed = true;
+ }
+
+ if (dispose != null) {
+ dispose.GenerateImport (sw);
+ sw.WriteLine ("\t\tprotected override void Free (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\t" + dispose.CName + " (raw);");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+
+ if (dispose.IsDeprecated) {
+ sw.WriteLine ("\t\t[Obsolete(\"" + QualifiedName + " is now freed automatically\")]");
+ sw.WriteLine ("\t\tpublic void " + dispose.Name + " () {}");
+ sw.WriteLine ();
+ }
+ finalizer_needed = true;
+ }
+
+ if (finalizer_needed) {
+ sw.WriteLine ("\t\tclass FinalizerInfo {");
+ sw.WriteLine ("\t\t\tIntPtr handle;");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t\tpublic FinalizerInfo (IntPtr handle)");
+ sw.WriteLine ("\t\t\t{");
+ sw.WriteLine ("\t\t\t\tthis.handle = handle;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t\tpublic bool Handler ()");
+ sw.WriteLine ("\t\t\t{");
+ if (dispose != null)
+ sw.WriteLine ("\t\t\t\t{0} (handle);", dispose.CName);
+ else if (unref != null)
+ sw.WriteLine ("\t\t\t\t{0} (handle);", unref.CName);
+ sw.WriteLine ("\t\t\t\treturn false;");
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\t~{0} ()", Name);
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (!Owned)");
+ sw.WriteLine ("\t\t\t\treturn;");
+ sw.WriteLine ("\t\t\tFinalizerInfo info = new FinalizerInfo (Handle);");
+ sw.WriteLine ("\t\t\tGLib.Timeout.Add (50, new GLib.TimeoutHandler (info.Handler));");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+
+#if false
+ Method copy = Methods ["Copy"] as Method;
+ if (copy != null && copy.Parameters.Count == 0) {
+ sw.WriteLine ("\t\tprotected override GLib.Opaque Copy (IntPtr raw)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tGLib.Opaque result = new " + QualifiedName + " (" + copy.CName + " (raw));");
+ sw.WriteLine ("\t\t\tresult.Owned = true;");
+ sw.WriteLine ("\t\t\treturn result;");
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+#endif
+ sw.WriteLine ("#endregion");
+
+ AppendCustom(sw, gen_info.CustomDir);
+
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.OpaqueCount++;
+ }
+
+ void GetSpecialMethods (out Method ref_, out Method unref, out Method dispose)
+ {
+ ref_ = CheckSpecialMethod (GetMethod ("Ref"));
+ unref = CheckSpecialMethod (GetMethod ("Unref"));
+
+ dispose = GetMethod ("Free");
+ if (dispose == null) {
+ dispose = GetMethod ("Destroy");
+ if (dispose == null)
+ dispose = GetMethod ("Dispose");
+ }
+ dispose = CheckSpecialMethod (dispose);
+ }
+
+ Method CheckSpecialMethod (Method method)
+ {
+ if (method == null)
+ return null;
+ if (method.ReturnType != "void" &&
+ method.ReturnType != QualifiedName)
+ return null;
+ if (method.Signature.ToString () != "")
+ return null;
+
+ methods.Remove (method.Name);
+ return method;
+ }
+
+ protected override void GenCtors (GenerationInfo gen_info)
+ {
+ if (!DisableRawCtor) {
+ gen_info.Writer.WriteLine("\t\tpublic " + Name + "(IntPtr raw) : base(raw) {}");
+ gen_info.Writer.WriteLine();
+ }
+
+ base.GenCtors (gen_info);
+ }
+
+ }
+}
+
diff --git a/lib/unique-sharp/generator/Parameters.cs b/lib/unique-sharp/generator/Parameters.cs
index 75dd68f..c399c6e 100644
--- a/lib/unique-sharp/generator/Parameters.cs
+++ b/lib/unique-sharp/generator/Parameters.cs
@@ -1,728 +1,728 @@
-// GtkSharp.Generation.Parameters.cs - The Parameters Generation Class.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Parameter {
-
- private XmlElement elem;
-
- public Parameter (XmlElement e)
- {
- elem = e;
- }
-
- string call_name;
- public string CallName {
- get {
- if (call_name == null)
- return Name;
- else
- return call_name;
- }
- set {
- call_name = value;
- }
- }
-
- public string CType {
- get {
- string type = elem.GetAttribute("type");
- if (type == "void*")
- type = "gpointer";
- return type;
- }
- }
-
- public string CSType {
- get {
- string cstype = SymbolTable.Table.GetCSType( elem.GetAttribute("type"));
- if (cstype == "void")
- cstype = "System.IntPtr";
- if (IsArray) {
- if (IsParams)
- cstype = "params " + cstype;
- cstype += "[]";
- cstype = cstype.Replace ("ref ", "");
- }
- return cstype;
- }
- }
-
- public IGeneratable Generatable {
- get {
- return SymbolTable.Table[CType];
- }
- }
-
- public bool IsArray {
- get {
- return elem.HasAttribute("array") || elem.HasAttribute("null_term_array");
- }
- }
-
- public bool IsEllipsis {
- get {
- return elem.HasAttribute("ellipsis");
- }
- }
-
- public bool IsCount {
- get {
-
- if (Name.StartsWith("n_"))
- switch (CSType) {
- case "int":
- case "uint":
- case "long":
- case "ulong":
- case "short":
- case "ushort":
- return true;
- default:
- return false;
- }
- else
- return false;
- }
- }
-
- public bool IsDestroyNotify {
- get {
- return CType == "GDestroyNotify";
- }
- }
-
- public bool IsLength {
- get {
-
- if (Name.EndsWith("len") || Name.EndsWith("length"))
- switch (CSType) {
- case "int":
- case "uint":
- case "long":
- case "ulong":
- case "short":
- case "ushort":
- return true;
- default:
- return false;
- }
- else
- return false;
- }
- }
-
- public bool IsParams {
- get {
- return elem.HasAttribute("params");
- }
- }
-
- public bool IsString {
- get {
- return (CSType == "string");
- }
- }
-
- public bool IsUserData {
- get {
- return CSType == "IntPtr" && (Name.EndsWith ("data") || Name.EndsWith ("data_or_owner"));
- }
- }
-
- public virtual string MarshalType {
- get {
- string type = SymbolTable.Table.GetMarshalType( elem.GetAttribute("type"));
- if (type == "void" || Generatable is IManualMarshaler)
- type = "IntPtr";
- if (IsArray) {
- type += "[]";
- type = type.Replace ("ref ", "");
- }
- return type;
- }
- }
-
- public string Name {
- get {
- return SymbolTable.Table.MangleName (elem.GetAttribute("name"));
- }
- }
-
- public bool Owned {
- get {
- return elem.GetAttribute ("owned") == "true";
- }
- }
-
- public virtual string NativeSignature {
- get {
- string sig = MarshalType + " " + Name;
- if (PassAs != String.Empty)
- sig = PassAs + " " + sig;
- return sig;
- }
- }
-
- public string PropertyName {
- get {
- return elem.GetAttribute("property_name");
- }
- }
-
- string pass_as;
-
- public string PassAs {
- get {
- if (pass_as != null)
- return pass_as;
-
- if (elem.HasAttribute ("pass_as"))
- return elem.GetAttribute ("pass_as");
-
- if (IsArray || CSType.EndsWith ("IntPtr"))
- return "";
-
- if (CType.EndsWith ("*") && (Generatable is SimpleGen || Generatable is EnumGen))
- return "out";
-
- return "";
- }
- set {
- pass_as = value;
- }
- }
-
- string scope;
- public string Scope {
- get {
- if (scope == null)
- scope = elem.GetAttribute ("scope");
- return scope;
- }
- set {
- scope = value;
- }
- }
-
- public virtual string[] Prepare {
- get {
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler) {
- string result = "IntPtr native_" + CallName;
- if (PassAs != "out")
- result += " = " + (gen as IManualMarshaler).AllocNative (CallName);
- return new string [] { result + ";" };
- } else if (PassAs == "out" && CSType != MarshalType)
- return new string [] { gen.MarshalType + " native_" + CallName + ";" };
-
- return new string [0];
- }
- }
-
- public virtual string CallString {
- get {
- string call_parm;
-
- IGeneratable gen = Generatable;
- if (gen is CallbackGen)
- return SymbolTable.Table.CallByName (CType, CallName + "_wrapper");
- else if (PassAs != String.Empty) {
- call_parm = PassAs + " ";
- if (CSType != MarshalType)
- call_parm += "native_";
- call_parm += CallName;
- } else if (gen is IManualMarshaler)
- call_parm = "native_" + CallName;
- else
- call_parm = SymbolTable.Table.CallByName(CType, CallName);
-
- return call_parm;
- }
- }
-
- public virtual string[] Finish {
- get {
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler) {
- string[] result = new string [PassAs == "ref" ? 2 : 1];
- int i = 0;
- if (PassAs != String.Empty)
- result [i++] = CallName + " = " + Generatable.FromNative ("native_" + CallName) + ";";
- if (PassAs != "out")
- result [i] = (gen as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
- return result;
- } else if (PassAs != String.Empty && MarshalType != CSType)
- return new string [] { CallName + " = " + gen.FromNative ("native_" + CallName) + ";" };
- return new string [0];
- }
- }
-
- public string FromNative (string var)
- {
- if (Generatable == null)
- return String.Empty;
- else if (Generatable is HandleBase)
- return ((HandleBase)Generatable).FromNative (var, Owned);
- else
- return Generatable.FromNative (var);
- }
-
- public string StudlyName {
- get {
- string name = elem.GetAttribute("name");
- string[] segs = name.Split('_');
- string studly = "";
- foreach (string s in segs) {
- if (s.Trim () == "")
- continue;
- studly += (s.Substring(0,1).ToUpper() + s.Substring(1));
- }
- return studly;
-
- }
- }
- }
-
- public class ArrayParameter : Parameter {
-
- bool null_terminated;
-
- public ArrayParameter (XmlElement elem) : base (elem)
- {
- null_terminated = elem.HasAttribute ("null_term_array");
- }
-
- public override string MarshalType {
- get {
- if (Generatable is StructBase)
- return CSType;
- else
- return base.MarshalType;
- }
- }
-
- bool NullTerminated {
- get {
- return null_terminated;
- }
- }
-
- public override string[] Prepare {
- get {
- if (CSType == MarshalType)
- return new string [0];
-
- ArrayList result = new ArrayList ();
- result.Add (String.Format ("int cnt_{0} = {0} == null ? 0 : {0}.Length;", CallName));
- result.Add (String.Format ("{0}[] native_{1} = new {0} [cnt_{1}" + (NullTerminated ? " + 1" : "") + "];", MarshalType.TrimEnd('[', ']'), CallName));
- result.Add (String.Format ("for (int i = 0; i < cnt_{0}; i++)", CallName));
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler)
- result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, (gen as IManualMarshaler).AllocNative (CallName + "[i]")));
- else
- result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, gen.CallByName (CallName + "[i]")));
-
- if (NullTerminated)
- result.Add (String.Format ("native_{0} [cnt_{0}] = IntPtr.Zero;", CallName));
- return (string[]) result.ToArray (typeof (string));
- }
- }
-
- public override string CallString {
- get {
- if (CSType != MarshalType)
- return "native_" + CallName;
- else
- return CallName;
- }
- }
-
- public override string[] Finish {
- get {
- if (CSType == MarshalType)
- return new string [0];
-
- IGeneratable gen = Generatable;
- if (gen is IManualMarshaler) {
- string [] result = new string [4];
- result [0] = "for (int i = 0; i < native_" + CallName + ".Length" + (NullTerminated ? " - 1" : "") + "; i++) {";
- result [1] = "\t" + CallName + " [i] = " + Generatable.FromNative ("native_" + CallName + "[i]") + ";";
- result [2] = "\t" + (gen as IManualMarshaler).ReleaseNative ("native_" + CallName + "[i]") + ";";
- result [3] = "}";
- return result;
- }
-
- return new string [0];
- }
- }
- }
-
- public class ArrayCountPair : ArrayParameter {
-
- XmlElement count_elem;
- bool invert;
-
- public ArrayCountPair (XmlElement array_elem, XmlElement count_elem, bool invert) : base (array_elem)
- {
- this.count_elem = count_elem;
- this.invert = invert;
- }
-
- string CountNativeType {
- get {
- return SymbolTable.Table.GetMarshalType(count_elem.GetAttribute("type"));
- }
- }
-
- string CountType {
- get {
- return SymbolTable.Table.GetCSType(count_elem.GetAttribute("type"));
- }
- }
-
- string CountCast {
- get {
- if (CountType == "int")
- return String.Empty;
- else
- return "(" + CountType + ") ";
- }
- }
-
- string CountName {
- get {
- return SymbolTable.Table.MangleName (count_elem.GetAttribute("name"));
- }
- }
-
- string CallCount (string name)
- {
- string result = CountCast + "(" + name + " == null ? 0 : " + name + ".Length)";
- IGeneratable gen = SymbolTable.Table[count_elem.GetAttribute("type")];
- return gen.CallByName (result);
- }
-
- public override string CallString {
- get {
- if (invert)
- return CallCount (CallName) + ", " + base.CallString;
- else
- return base.CallString + ", " + CallCount (CallName);
- }
- }
-
- public override string NativeSignature {
- get {
- if (invert)
- return CountNativeType + " " + CountName + ", " + MarshalType + " " + Name;
- else
- return MarshalType + " " + Name + ", " + CountNativeType + " " + CountName;
- }
- }
- }
-
- public class ErrorParameter : Parameter {
-
- public ErrorParameter (XmlElement elem) : base (elem)
- {
- PassAs = "out";
- }
-
- public override string CallString {
- get {
- return "out error";
- }
- }
- }
-
- public class StructParameter : Parameter {
-
- public StructParameter (XmlElement elem) : base (elem) {}
-
- public override string MarshalType {
- get {
- return "IntPtr";
- }
- }
-
- public override string[] Prepare {
- get {
- if (PassAs == "out")
- return new string [] { "IntPtr native_" + CallName + " = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + Generatable.QualifiedName + ")));"};
- else
- return new string [] { "IntPtr native_" + CallName + " = " + (Generatable as IManualMarshaler).AllocNative (CallName) + ";"};
- }
- }
-
- public override string CallString {
- get {
- return "native_" + CallName;
- }
- }
-
- public override string[] Finish {
- get {
- string[] result = new string [2];
- result [0] = CallName + " = " + FromNative ("native_" + CallName) + ";";
- result [1] = (Generatable as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
- return result;
- }
- }
-
- public override string NativeSignature {
- get {
- return "IntPtr " + CallName;
- }
- }
- }
-
- public class Parameters : IEnumerable {
-
- ArrayList param_list = new ArrayList ();
- XmlElement elem;
-
- public Parameters (XmlElement elem)
- {
- if (elem == null)
- valid = true;
- this.elem = elem;
- }
-
- public int Count {
- get {
- return param_list.Count;
- }
- }
-
- public int VisibleCount {
- get {
- int visible = 0;
- foreach (Parameter p in this) {
- if (!IsHidden (p))
- visible++;
- }
- return visible;
- }
- }
-
- public Parameter this [int idx] {
- get {
- return param_list [idx] as Parameter;
- }
- }
-
- public bool IsHidden (Parameter p)
- {
- int idx = param_list.IndexOf (p);
-
- if (idx > 0 && p.IsLength && p.PassAs == String.Empty && this [idx - 1].IsString)
- return true;
-
- if (p.IsCount && ((idx > 0 && this [idx - 1].IsArray) ||
- (idx < Count - 1 && this [idx + 1].IsArray)))
- return true;
-
- if (p.CType == "GError**")
- return true;
-
- if (HasCB || HideData) {
- if (p.IsUserData && (idx == Count - 1))
- return true;
- if (p.IsUserData && (idx == Count - 2) && this [Count - 1] is ErrorParameter)
- return true;
- if (p.IsUserData && idx > 0 &&
- this [idx - 1].Generatable is CallbackGen)
- return true;
- if (p.IsDestroyNotify && (idx == Count - 1) &&
- this [idx - 1].IsUserData)
- return true;
- }
-
- return false;
- }
-
- bool has_cb;
- public bool HasCB {
- get { return has_cb; }
- set { has_cb = value; }
- }
-
- public bool HasOutParam {
- get {
- foreach (Parameter p in this)
- if (p.PassAs == "out")
- return true;
- return false;
- }
- }
-
- bool hide_data;
- public bool HideData {
- get { return hide_data; }
- set { hide_data = value; }
- }
-
- bool is_static;
- public bool Static {
- get { return is_static; }
- set { is_static = value; }
- }
-
- void Clear ()
- {
- elem = null;
- param_list.Clear ();
- param_list = null;
- }
-
- public IEnumerator GetEnumerator ()
- {
- return param_list.GetEnumerator ();
- }
-
- bool valid = false;
-
- public bool Validate ()
- {
- if (valid)
- return true;
-
- if (elem == null)
- return false;
-
- for (int i = 0; i < elem.ChildNodes.Count; i++) {
- XmlElement parm = elem.ChildNodes [i] as XmlElement;
- if (parm == null || parm.Name != "parameter")
- continue;
- Parameter p = new Parameter (parm);
-
- if (p.IsEllipsis) {
- Console.Write("Ellipsis parameter ");
- Clear ();
- return false;
- }
-
- if ((p.CSType == "") || (p.Name == "") ||
- (p.MarshalType == "") || (SymbolTable.Table.CallByName(p.CType, p.Name) == "")) {
- Console.Write("Name: " + p.Name + " Type: " + p.CType + " ");
- Clear ();
- return false;
- }
-
- IGeneratable gen = p.Generatable;
-
- if (p.IsArray) {
- p = new ArrayParameter (parm);
- if (i < elem.ChildNodes.Count - 1) {
- XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
- if (next != null || next.Name == "parameter") {
- Parameter c = new Parameter (next);
- if (c.IsCount) {
- p = new ArrayCountPair (parm, next, false);
- i++;
- }
- }
- }
- } else if (p.IsCount && i < elem.ChildNodes.Count - 1) {
- XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
- if (next != null || next.Name == "parameter") {
- Parameter a = new Parameter (next);
- if (a.IsArray) {
- p = new ArrayCountPair (next, parm, true);
- i++;
- }
- }
- } else if (p.CType == "GError**")
- p = new ErrorParameter (parm);
- else if (gen is StructBase || gen is ByRefGen) {
- p = new StructParameter (parm);
- } else if (gen is CallbackGen) {
- has_cb = true;
- }
- param_list.Add (p);
- }
-
- if (has_cb && Count > 2 && this [Count - 3].Generatable is CallbackGen && this [Count - 2].IsUserData && this [Count - 1].IsDestroyNotify)
- this [Count - 3].Scope = "notified";
-
- valid = true;
- return true;
- }
-
- public bool IsAccessor {
- get {
- return VisibleCount == 1 && AccessorParam.PassAs == "out";
- }
- }
-
- public Parameter AccessorParam {
- get {
- foreach (Parameter p in this) {
- if (!IsHidden (p))
- return p;
- }
- return null;
- }
- }
-
- public string AccessorReturnType {
- get {
- Parameter p = AccessorParam;
- if (p != null)
- return p.CSType;
- else
- return null;
- }
- }
-
- public string AccessorName {
- get {
- Parameter p = AccessorParam;
- if (p != null)
- return p.Name;
- else
- return null;
- }
- }
-
- public string ImportSignature {
- get {
- if (Count == 0)
- return String.Empty;
-
- string[] result = new string [Count];
- for (int i = 0; i < Count; i++)
- result [i] = this [i].NativeSignature;
-
- return String.Join (", ", result);
- }
- }
- }
-}
-
+// GtkSharp.Generation.Parameters.cs - The Parameters Generation Class.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Parameter {
+
+ private XmlElement elem;
+
+ public Parameter (XmlElement e)
+ {
+ elem = e;
+ }
+
+ string call_name;
+ public string CallName {
+ get {
+ if (call_name == null)
+ return Name;
+ else
+ return call_name;
+ }
+ set {
+ call_name = value;
+ }
+ }
+
+ public string CType {
+ get {
+ string type = elem.GetAttribute("type");
+ if (type == "void*")
+ type = "gpointer";
+ return type;
+ }
+ }
+
+ public string CSType {
+ get {
+ string cstype = SymbolTable.Table.GetCSType( elem.GetAttribute("type"));
+ if (cstype == "void")
+ cstype = "System.IntPtr";
+ if (IsArray) {
+ if (IsParams)
+ cstype = "params " + cstype;
+ cstype += "[]";
+ cstype = cstype.Replace ("ref ", "");
+ }
+ return cstype;
+ }
+ }
+
+ public IGeneratable Generatable {
+ get {
+ return SymbolTable.Table[CType];
+ }
+ }
+
+ public bool IsArray {
+ get {
+ return elem.HasAttribute("array") || elem.HasAttribute("null_term_array");
+ }
+ }
+
+ public bool IsEllipsis {
+ get {
+ return elem.HasAttribute("ellipsis");
+ }
+ }
+
+ public bool IsCount {
+ get {
+
+ if (Name.StartsWith("n_"))
+ switch (CSType) {
+ case "int":
+ case "uint":
+ case "long":
+ case "ulong":
+ case "short":
+ case "ushort":
+ return true;
+ default:
+ return false;
+ }
+ else
+ return false;
+ }
+ }
+
+ public bool IsDestroyNotify {
+ get {
+ return CType == "GDestroyNotify";
+ }
+ }
+
+ public bool IsLength {
+ get {
+
+ if (Name.EndsWith("len") || Name.EndsWith("length"))
+ switch (CSType) {
+ case "int":
+ case "uint":
+ case "long":
+ case "ulong":
+ case "short":
+ case "ushort":
+ return true;
+ default:
+ return false;
+ }
+ else
+ return false;
+ }
+ }
+
+ public bool IsParams {
+ get {
+ return elem.HasAttribute("params");
+ }
+ }
+
+ public bool IsString {
+ get {
+ return (CSType == "string");
+ }
+ }
+
+ public bool IsUserData {
+ get {
+ return CSType == "IntPtr" && (Name.EndsWith ("data") || Name.EndsWith ("data_or_owner"));
+ }
+ }
+
+ public virtual string MarshalType {
+ get {
+ string type = SymbolTable.Table.GetMarshalType( elem.GetAttribute("type"));
+ if (type == "void" || Generatable is IManualMarshaler)
+ type = "IntPtr";
+ if (IsArray) {
+ type += "[]";
+ type = type.Replace ("ref ", "");
+ }
+ return type;
+ }
+ }
+
+ public string Name {
+ get {
+ return SymbolTable.Table.MangleName (elem.GetAttribute("name"));
+ }
+ }
+
+ public bool Owned {
+ get {
+ return elem.GetAttribute ("owned") == "true";
+ }
+ }
+
+ public virtual string NativeSignature {
+ get {
+ string sig = MarshalType + " " + Name;
+ if (PassAs != String.Empty)
+ sig = PassAs + " " + sig;
+ return sig;
+ }
+ }
+
+ public string PropertyName {
+ get {
+ return elem.GetAttribute("property_name");
+ }
+ }
+
+ string pass_as;
+
+ public string PassAs {
+ get {
+ if (pass_as != null)
+ return pass_as;
+
+ if (elem.HasAttribute ("pass_as"))
+ return elem.GetAttribute ("pass_as");
+
+ if (IsArray || CSType.EndsWith ("IntPtr"))
+ return "";
+
+ if (CType.EndsWith ("*") && (Generatable is SimpleGen || Generatable is EnumGen))
+ return "out";
+
+ return "";
+ }
+ set {
+ pass_as = value;
+ }
+ }
+
+ string scope;
+ public string Scope {
+ get {
+ if (scope == null)
+ scope = elem.GetAttribute ("scope");
+ return scope;
+ }
+ set {
+ scope = value;
+ }
+ }
+
+ public virtual string[] Prepare {
+ get {
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler) {
+ string result = "IntPtr native_" + CallName;
+ if (PassAs != "out")
+ result += " = " + (gen as IManualMarshaler).AllocNative (CallName);
+ return new string [] { result + ";" };
+ } else if (PassAs == "out" && CSType != MarshalType)
+ return new string [] { gen.MarshalType + " native_" + CallName + ";" };
+
+ return new string [0];
+ }
+ }
+
+ public virtual string CallString {
+ get {
+ string call_parm;
+
+ IGeneratable gen = Generatable;
+ if (gen is CallbackGen)
+ return SymbolTable.Table.CallByName (CType, CallName + "_wrapper");
+ else if (PassAs != String.Empty) {
+ call_parm = PassAs + " ";
+ if (CSType != MarshalType)
+ call_parm += "native_";
+ call_parm += CallName;
+ } else if (gen is IManualMarshaler)
+ call_parm = "native_" + CallName;
+ else
+ call_parm = SymbolTable.Table.CallByName(CType, CallName);
+
+ return call_parm;
+ }
+ }
+
+ public virtual string[] Finish {
+ get {
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler) {
+ string[] result = new string [PassAs == "ref" ? 2 : 1];
+ int i = 0;
+ if (PassAs != String.Empty)
+ result [i++] = CallName + " = " + Generatable.FromNative ("native_" + CallName) + ";";
+ if (PassAs != "out")
+ result [i] = (gen as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
+ return result;
+ } else if (PassAs != String.Empty && MarshalType != CSType)
+ return new string [] { CallName + " = " + gen.FromNative ("native_" + CallName) + ";" };
+ return new string [0];
+ }
+ }
+
+ public string FromNative (string var)
+ {
+ if (Generatable == null)
+ return String.Empty;
+ else if (Generatable is HandleBase)
+ return ((HandleBase)Generatable).FromNative (var, Owned);
+ else
+ return Generatable.FromNative (var);
+ }
+
+ public string StudlyName {
+ get {
+ string name = elem.GetAttribute("name");
+ string[] segs = name.Split('_');
+ string studly = "";
+ foreach (string s in segs) {
+ if (s.Trim () == "")
+ continue;
+ studly += (s.Substring(0,1).ToUpper() + s.Substring(1));
+ }
+ return studly;
+
+ }
+ }
+ }
+
+ public class ArrayParameter : Parameter {
+
+ bool null_terminated;
+
+ public ArrayParameter (XmlElement elem) : base (elem)
+ {
+ null_terminated = elem.HasAttribute ("null_term_array");
+ }
+
+ public override string MarshalType {
+ get {
+ if (Generatable is StructBase)
+ return CSType;
+ else
+ return base.MarshalType;
+ }
+ }
+
+ bool NullTerminated {
+ get {
+ return null_terminated;
+ }
+ }
+
+ public override string[] Prepare {
+ get {
+ if (CSType == MarshalType)
+ return new string [0];
+
+ ArrayList result = new ArrayList ();
+ result.Add (String.Format ("int cnt_{0} = {0} == null ? 0 : {0}.Length;", CallName));
+ result.Add (String.Format ("{0}[] native_{1} = new {0} [cnt_{1}" + (NullTerminated ? " + 1" : "") + "];", MarshalType.TrimEnd('[', ']'), CallName));
+ result.Add (String.Format ("for (int i = 0; i < cnt_{0}; i++)", CallName));
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler)
+ result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, (gen as IManualMarshaler).AllocNative (CallName + "[i]")));
+ else
+ result.Add (String.Format ("\tnative_{0} [i] = {1};", CallName, gen.CallByName (CallName + "[i]")));
+
+ if (NullTerminated)
+ result.Add (String.Format ("native_{0} [cnt_{0}] = IntPtr.Zero;", CallName));
+ return (string[]) result.ToArray (typeof (string));
+ }
+ }
+
+ public override string CallString {
+ get {
+ if (CSType != MarshalType)
+ return "native_" + CallName;
+ else
+ return CallName;
+ }
+ }
+
+ public override string[] Finish {
+ get {
+ if (CSType == MarshalType)
+ return new string [0];
+
+ IGeneratable gen = Generatable;
+ if (gen is IManualMarshaler) {
+ string [] result = new string [4];
+ result [0] = "for (int i = 0; i < native_" + CallName + ".Length" + (NullTerminated ? " - 1" : "") + "; i++) {";
+ result [1] = "\t" + CallName + " [i] = " + Generatable.FromNative ("native_" + CallName + "[i]") + ";";
+ result [2] = "\t" + (gen as IManualMarshaler).ReleaseNative ("native_" + CallName + "[i]") + ";";
+ result [3] = "}";
+ return result;
+ }
+
+ return new string [0];
+ }
+ }
+ }
+
+ public class ArrayCountPair : ArrayParameter {
+
+ XmlElement count_elem;
+ bool invert;
+
+ public ArrayCountPair (XmlElement array_elem, XmlElement count_elem, bool invert) : base (array_elem)
+ {
+ this.count_elem = count_elem;
+ this.invert = invert;
+ }
+
+ string CountNativeType {
+ get {
+ return SymbolTable.Table.GetMarshalType(count_elem.GetAttribute("type"));
+ }
+ }
+
+ string CountType {
+ get {
+ return SymbolTable.Table.GetCSType(count_elem.GetAttribute("type"));
+ }
+ }
+
+ string CountCast {
+ get {
+ if (CountType == "int")
+ return String.Empty;
+ else
+ return "(" + CountType + ") ";
+ }
+ }
+
+ string CountName {
+ get {
+ return SymbolTable.Table.MangleName (count_elem.GetAttribute("name"));
+ }
+ }
+
+ string CallCount (string name)
+ {
+ string result = CountCast + "(" + name + " == null ? 0 : " + name + ".Length)";
+ IGeneratable gen = SymbolTable.Table[count_elem.GetAttribute("type")];
+ return gen.CallByName (result);
+ }
+
+ public override string CallString {
+ get {
+ if (invert)
+ return CallCount (CallName) + ", " + base.CallString;
+ else
+ return base.CallString + ", " + CallCount (CallName);
+ }
+ }
+
+ public override string NativeSignature {
+ get {
+ if (invert)
+ return CountNativeType + " " + CountName + ", " + MarshalType + " " + Name;
+ else
+ return MarshalType + " " + Name + ", " + CountNativeType + " " + CountName;
+ }
+ }
+ }
+
+ public class ErrorParameter : Parameter {
+
+ public ErrorParameter (XmlElement elem) : base (elem)
+ {
+ PassAs = "out";
+ }
+
+ public override string CallString {
+ get {
+ return "out error";
+ }
+ }
+ }
+
+ public class StructParameter : Parameter {
+
+ public StructParameter (XmlElement elem) : base (elem) {}
+
+ public override string MarshalType {
+ get {
+ return "IntPtr";
+ }
+ }
+
+ public override string[] Prepare {
+ get {
+ if (PassAs == "out")
+ return new string [] { "IntPtr native_" + CallName + " = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + Generatable.QualifiedName + ")));"};
+ else
+ return new string [] { "IntPtr native_" + CallName + " = " + (Generatable as IManualMarshaler).AllocNative (CallName) + ";"};
+ }
+ }
+
+ public override string CallString {
+ get {
+ return "native_" + CallName;
+ }
+ }
+
+ public override string[] Finish {
+ get {
+ string[] result = new string [2];
+ result [0] = CallName + " = " + FromNative ("native_" + CallName) + ";";
+ result [1] = (Generatable as IManualMarshaler).ReleaseNative ("native_" + CallName) + ";";
+ return result;
+ }
+ }
+
+ public override string NativeSignature {
+ get {
+ return "IntPtr " + CallName;
+ }
+ }
+ }
+
+ public class Parameters : IEnumerable {
+
+ ArrayList param_list = new ArrayList ();
+ XmlElement elem;
+
+ public Parameters (XmlElement elem)
+ {
+ if (elem == null)
+ valid = true;
+ this.elem = elem;
+ }
+
+ public int Count {
+ get {
+ return param_list.Count;
+ }
+ }
+
+ public int VisibleCount {
+ get {
+ int visible = 0;
+ foreach (Parameter p in this) {
+ if (!IsHidden (p))
+ visible++;
+ }
+ return visible;
+ }
+ }
+
+ public Parameter this [int idx] {
+ get {
+ return param_list [idx] as Parameter;
+ }
+ }
+
+ public bool IsHidden (Parameter p)
+ {
+ int idx = param_list.IndexOf (p);
+
+ if (idx > 0 && p.IsLength && p.PassAs == String.Empty && this [idx - 1].IsString)
+ return true;
+
+ if (p.IsCount && ((idx > 0 && this [idx - 1].IsArray) ||
+ (idx < Count - 1 && this [idx + 1].IsArray)))
+ return true;
+
+ if (p.CType == "GError**")
+ return true;
+
+ if (HasCB || HideData) {
+ if (p.IsUserData && (idx == Count - 1))
+ return true;
+ if (p.IsUserData && (idx == Count - 2) && this [Count - 1] is ErrorParameter)
+ return true;
+ if (p.IsUserData && idx > 0 &&
+ this [idx - 1].Generatable is CallbackGen)
+ return true;
+ if (p.IsDestroyNotify && (idx == Count - 1) &&
+ this [idx - 1].IsUserData)
+ return true;
+ }
+
+ return false;
+ }
+
+ bool has_cb;
+ public bool HasCB {
+ get { return has_cb; }
+ set { has_cb = value; }
+ }
+
+ public bool HasOutParam {
+ get {
+ foreach (Parameter p in this)
+ if (p.PassAs == "out")
+ return true;
+ return false;
+ }
+ }
+
+ bool hide_data;
+ public bool HideData {
+ get { return hide_data; }
+ set { hide_data = value; }
+ }
+
+ bool is_static;
+ public bool Static {
+ get { return is_static; }
+ set { is_static = value; }
+ }
+
+ void Clear ()
+ {
+ elem = null;
+ param_list.Clear ();
+ param_list = null;
+ }
+
+ public IEnumerator GetEnumerator ()
+ {
+ return param_list.GetEnumerator ();
+ }
+
+ bool valid = false;
+
+ public bool Validate ()
+ {
+ if (valid)
+ return true;
+
+ if (elem == null)
+ return false;
+
+ for (int i = 0; i < elem.ChildNodes.Count; i++) {
+ XmlElement parm = elem.ChildNodes [i] as XmlElement;
+ if (parm == null || parm.Name != "parameter")
+ continue;
+ Parameter p = new Parameter (parm);
+
+ if (p.IsEllipsis) {
+ Console.Write("Ellipsis parameter ");
+ Clear ();
+ return false;
+ }
+
+ if ((p.CSType == "") || (p.Name == "") ||
+ (p.MarshalType == "") || (SymbolTable.Table.CallByName(p.CType, p.Name) == "")) {
+ Console.Write("Name: " + p.Name + " Type: " + p.CType + " ");
+ Clear ();
+ return false;
+ }
+
+ IGeneratable gen = p.Generatable;
+
+ if (p.IsArray) {
+ p = new ArrayParameter (parm);
+ if (i < elem.ChildNodes.Count - 1) {
+ XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
+ if (next != null || next.Name == "parameter") {
+ Parameter c = new Parameter (next);
+ if (c.IsCount) {
+ p = new ArrayCountPair (parm, next, false);
+ i++;
+ }
+ }
+ }
+ } else if (p.IsCount && i < elem.ChildNodes.Count - 1) {
+ XmlElement next = elem.ChildNodes [i + 1] as XmlElement;
+ if (next != null || next.Name == "parameter") {
+ Parameter a = new Parameter (next);
+ if (a.IsArray) {
+ p = new ArrayCountPair (next, parm, true);
+ i++;
+ }
+ }
+ } else if (p.CType == "GError**")
+ p = new ErrorParameter (parm);
+ else if (gen is StructBase || gen is ByRefGen) {
+ p = new StructParameter (parm);
+ } else if (gen is CallbackGen) {
+ has_cb = true;
+ }
+ param_list.Add (p);
+ }
+
+ if (has_cb && Count > 2 && this [Count - 3].Generatable is CallbackGen && this [Count - 2].IsUserData && this [Count - 1].IsDestroyNotify)
+ this [Count - 3].Scope = "notified";
+
+ valid = true;
+ return true;
+ }
+
+ public bool IsAccessor {
+ get {
+ return VisibleCount == 1 && AccessorParam.PassAs == "out";
+ }
+ }
+
+ public Parameter AccessorParam {
+ get {
+ foreach (Parameter p in this) {
+ if (!IsHidden (p))
+ return p;
+ }
+ return null;
+ }
+ }
+
+ public string AccessorReturnType {
+ get {
+ Parameter p = AccessorParam;
+ if (p != null)
+ return p.CSType;
+ else
+ return null;
+ }
+ }
+
+ public string AccessorName {
+ get {
+ Parameter p = AccessorParam;
+ if (p != null)
+ return p.Name;
+ else
+ return null;
+ }
+ }
+
+ public string ImportSignature {
+ get {
+ if (Count == 0)
+ return String.Empty;
+
+ string[] result = new string [Count];
+ for (int i = 0; i < Count; i++)
+ result [i] = this [i].NativeSignature;
+
+ return String.Join (", ", result);
+ }
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/Parser.cs b/lib/unique-sharp/generator/Parser.cs
index 61e3714..5d65890 100644
--- a/lib/unique-sharp/generator/Parser.cs
+++ b/lib/unique-sharp/generator/Parser.cs
@@ -1,170 +1,170 @@
-// GtkSharp.Generation.Parser.cs - The XML Parsing engine.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003 Ximian Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Parser {
-
- private XmlDocument Load (string filename)
- {
- XmlDocument doc = new XmlDocument ();
-
- try {
- Stream stream = File.OpenRead (filename);
- doc.Load (stream);
- stream.Close ();
- } catch (XmlException e) {
- Console.WriteLine ("Invalid XML file.");
- Console.WriteLine (e);
- doc = null;
- }
-
- return doc;
- }
-
- public IGeneratable[] Parse (string filename)
- {
- XmlDocument doc = Load (filename);
- if (doc == null)
- return null;
-
- XmlElement root = doc.DocumentElement;
-
- if ((root == null) || !root.HasChildNodes) {
- Console.WriteLine ("No Namespaces found.");
- return null;
- }
-
- ArrayList gens = new ArrayList ();
-
- foreach (XmlNode child in root.ChildNodes) {
- XmlElement elem = child as XmlElement;
- if (elem == null)
- continue;
-
- switch (child.Name) {
- case "namespace":
- gens.AddRange (ParseNamespace (elem));
- break;
- case "symbol":
- gens.Add (ParseSymbol (elem));
- break;
- default:
- Console.WriteLine ("Parser::Parse - Unexpected child node: " + child.Name);
- break;
- }
- }
-
- return (IGeneratable[]) gens.ToArray (typeof (IGeneratable));
- }
-
- private ArrayList ParseNamespace (XmlElement ns)
- {
- ArrayList result = new ArrayList ();
-
- foreach (XmlNode def in ns.ChildNodes) {
-
- XmlElement elem = def as XmlElement;
- if (elem == null)
- continue;
-
- if (elem.HasAttribute("hidden"))
- continue;
-
- bool is_opaque = false;
- if (elem.GetAttribute ("opaque") == "true" ||
- elem.GetAttribute ("opaque") == "1")
- is_opaque = true;
-
- switch (def.Name) {
- case "alias":
- string aname = elem.GetAttribute("cname");
- string atype = elem.GetAttribute("type");
- if ((aname == "") || (atype == ""))
- continue;
- result.Add (new AliasGen (aname, atype));
- break;
- case "boxed":
- result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new BoxedGen (ns, elem) as object);
- break;
- case "callback":
- result.Add (new CallbackGen (ns, elem));
- break;
- case "enum":
- result.Add (new EnumGen (ns, elem));
- break;
- case "interface":
- result.Add (new InterfaceGen (ns, elem));
- break;
- case "object":
- result.Add (new ObjectGen (ns, elem));
- break;
- case "class":
- result.Add (new ClassGen (ns, elem));
- break;
- case "struct":
- result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new StructGen (ns, elem) as object);
- break;
- default:
- Console.WriteLine ("Parser::ParseNamespace - Unexpected node: " + def.Name);
- break;
- }
- }
-
- return result;
- }
-
- private IGeneratable ParseSymbol (XmlElement symbol)
- {
- string type = symbol.GetAttribute ("type");
- string cname = symbol.GetAttribute ("cname");
- string name = symbol.GetAttribute ("name");
- IGeneratable result = null;
-
- if (type == "simple") {
- if (symbol.HasAttribute ("default_value"))
- result = new SimpleGen (cname, name, symbol.GetAttribute ("default_value"));
- else {
- Console.WriteLine ("Simple type element " + cname + " has no specified default value");
- result = new SimpleGen (cname, name, String.Empty);
- }
- } else if (type == "manual")
- result = new ManualGen (cname, name);
- else if (type == "alias")
- result = new AliasGen (cname, name);
- else if (type == "marshal") {
- string mtype = symbol.GetAttribute ("marshal_type");
- string call = symbol.GetAttribute ("call_fmt");
- string from = symbol.GetAttribute ("from_fmt");
- result = new MarshalGen (cname, name, mtype, call, from);
- } else
- Console.WriteLine ("Parser::ParseSymbol - Unexpected symbol type " + type);
-
- return result;
- }
- }
-}
+// GtkSharp.Generation.Parser.cs - The XML Parsing engine.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003 Ximian Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Parser {
+
+ private XmlDocument Load (string filename)
+ {
+ XmlDocument doc = new XmlDocument ();
+
+ try {
+ Stream stream = File.OpenRead (filename);
+ doc.Load (stream);
+ stream.Close ();
+ } catch (XmlException e) {
+ Console.WriteLine ("Invalid XML file.");
+ Console.WriteLine (e);
+ doc = null;
+ }
+
+ return doc;
+ }
+
+ public IGeneratable[] Parse (string filename)
+ {
+ XmlDocument doc = Load (filename);
+ if (doc == null)
+ return null;
+
+ XmlElement root = doc.DocumentElement;
+
+ if ((root == null) || !root.HasChildNodes) {
+ Console.WriteLine ("No Namespaces found.");
+ return null;
+ }
+
+ ArrayList gens = new ArrayList ();
+
+ foreach (XmlNode child in root.ChildNodes) {
+ XmlElement elem = child as XmlElement;
+ if (elem == null)
+ continue;
+
+ switch (child.Name) {
+ case "namespace":
+ gens.AddRange (ParseNamespace (elem));
+ break;
+ case "symbol":
+ gens.Add (ParseSymbol (elem));
+ break;
+ default:
+ Console.WriteLine ("Parser::Parse - Unexpected child node: " + child.Name);
+ break;
+ }
+ }
+
+ return (IGeneratable[]) gens.ToArray (typeof (IGeneratable));
+ }
+
+ private ArrayList ParseNamespace (XmlElement ns)
+ {
+ ArrayList result = new ArrayList ();
+
+ foreach (XmlNode def in ns.ChildNodes) {
+
+ XmlElement elem = def as XmlElement;
+ if (elem == null)
+ continue;
+
+ if (elem.HasAttribute("hidden"))
+ continue;
+
+ bool is_opaque = false;
+ if (elem.GetAttribute ("opaque") == "true" ||
+ elem.GetAttribute ("opaque") == "1")
+ is_opaque = true;
+
+ switch (def.Name) {
+ case "alias":
+ string aname = elem.GetAttribute("cname");
+ string atype = elem.GetAttribute("type");
+ if ((aname == "") || (atype == ""))
+ continue;
+ result.Add (new AliasGen (aname, atype));
+ break;
+ case "boxed":
+ result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new BoxedGen (ns, elem) as object);
+ break;
+ case "callback":
+ result.Add (new CallbackGen (ns, elem));
+ break;
+ case "enum":
+ result.Add (new EnumGen (ns, elem));
+ break;
+ case "interface":
+ result.Add (new InterfaceGen (ns, elem));
+ break;
+ case "object":
+ result.Add (new ObjectGen (ns, elem));
+ break;
+ case "class":
+ result.Add (new ClassGen (ns, elem));
+ break;
+ case "struct":
+ result.Add (is_opaque ? new OpaqueGen (ns, elem) as object : new StructGen (ns, elem) as object);
+ break;
+ default:
+ Console.WriteLine ("Parser::ParseNamespace - Unexpected node: " + def.Name);
+ break;
+ }
+ }
+
+ return result;
+ }
+
+ private IGeneratable ParseSymbol (XmlElement symbol)
+ {
+ string type = symbol.GetAttribute ("type");
+ string cname = symbol.GetAttribute ("cname");
+ string name = symbol.GetAttribute ("name");
+ IGeneratable result = null;
+
+ if (type == "simple") {
+ if (symbol.HasAttribute ("default_value"))
+ result = new SimpleGen (cname, name, symbol.GetAttribute ("default_value"));
+ else {
+ Console.WriteLine ("Simple type element " + cname + " has no specified default value");
+ result = new SimpleGen (cname, name, String.Empty);
+ }
+ } else if (type == "manual")
+ result = new ManualGen (cname, name);
+ else if (type == "alias")
+ result = new AliasGen (cname, name);
+ else if (type == "marshal") {
+ string mtype = symbol.GetAttribute ("marshal_type");
+ string call = symbol.GetAttribute ("call_fmt");
+ string from = symbol.GetAttribute ("from_fmt");
+ result = new MarshalGen (cname, name, mtype, call, from);
+ } else
+ Console.WriteLine ("Parser::ParseSymbol - Unexpected symbol type " + type);
+
+ return result;
+ }
+ }
+}
diff --git a/lib/unique-sharp/generator/Property.cs b/lib/unique-sharp/generator/Property.cs
index fbf940b..6920e3c 100644
--- a/lib/unique-sharp/generator/Property.cs
+++ b/lib/unique-sharp/generator/Property.cs
@@ -1,193 +1,193 @@
-// GtkSharp.Generation.Property.cs - The Property Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Property : PropertyBase {
-
- public Property (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
-
- public bool Validate ()
- {
- if (CSType == "" && !Hidden) {
- Console.Write("Property has unknown Type {0} ", CType);
- Statistics.ThrottledCount++;
- return false;
- }
-
- return true;
- }
-
- bool Readable {
- get {
- return elem.GetAttribute ("readable") == "true";
- }
- }
-
- bool Writable {
- get {
- return elem.GetAttribute ("writeable") == "true" &&
- !elem.HasAttribute ("construct-only");
- }
- }
-
- bool IsDeprecated {
- get {
- return !container_type.IsDeprecated &&
- (elem.GetAttribute ("deprecated") == "1" ||
- elem.GetAttribute ("deprecated") == "true");
- }
- }
-
- protected virtual string PropertyAttribute (string qpname) {
- return "[GLib.Property (" + qpname + ")]";
- }
-
- protected virtual string RawGetter (string qpname) {
- return "GetProperty (" + qpname + ")";
- }
-
- protected virtual string RawSetter (string qpname) {
- return "SetProperty(" + qpname + ", val)";
- }
-
- public void GenerateDecl (StreamWriter sw, string indent)
- {
- if (Hidden || (!Readable && !Writable))
- return;
-
- string name = Name;
- if (name == container_type.Name)
- name += "Prop";
-
- sw.WriteLine (indent + CSType + " " + name + " {");
- sw.Write (indent + "\t");
- if (Readable || Getter != null)
- sw.Write ("get; ");
- if (Writable || Setter != null)
- sw.Write ("set;");
- sw.WriteLine ();
- sw.WriteLine (indent + "}");
- }
-
- public void Generate (GenerationInfo gen_info, string indent, ClassBase implementor)
- {
- SymbolTable table = SymbolTable.Table;
- StreamWriter sw = gen_info.Writer;
-
- if (Hidden || (!Readable && !Writable))
- return;
-
- string modifiers = "";
-
- if (IsNew || (container_type.Parent != null && container_type.Parent.GetPropertyRecursively (Name) != null))
- modifiers = "new ";
- else if (implementor != null && implementor.Parent != null && implementor.Parent.GetPropertyRecursively (Name) != null)
- modifiers = "new ";
-
- string name = Name;
- if (name == container_type.Name) {
- name += "Prop";
- }
- string qpname = "\"" + CName + "\"";
-
- string v_type = "";
- if (table.IsInterface (CType)) {
- v_type = "(GLib.Object)";
- } else if (table.IsOpaque (CType)) {
- v_type = "(GLib.Opaque)";
- } else if (table.IsEnum (CType)) {
- v_type = "(Enum)";
- }
-
- GenerateImports (gen_info, indent);
-
- if (IsDeprecated ||
- (Getter != null && Getter.IsDeprecated) ||
- (Setter != null && Setter.IsDeprecated))
- sw.WriteLine (indent + "[Obsolete]");
- sw.WriteLine (indent + PropertyAttribute (qpname));
- sw.WriteLine (indent + "public " + modifiers + CSType + " " + name + " {");
- indent += "\t";
-
- if (Getter != null) {
- sw.Write(indent + "get ");
- Getter.GenerateBody(gen_info, implementor, "\t");
- sw.WriteLine();
- } else if (Readable) {
- sw.WriteLine(indent + "get {");
- sw.WriteLine(indent + "\tGLib.Value val = " + RawGetter (qpname) + ";");
- if (table.IsOpaque (CType) || table.IsBoxed (CType)) {
- sw.WriteLine(indent + "\t" + CSType + " ret = (" + CSType + ") val;");
- } else if (table.IsInterface (CType)) {
- // Do we have to dispose the GLib.Object from the GLib.Value?
- sw.WriteLine (indent + "\t{0} ret = {0}Adapter.GetObject ((GLib.Object) val);", CSType);
- } else {
- sw.Write(indent + "\t" + CSType + " ret = ");
- sw.Write ("(" + CSType + ") ");
- if (v_type != "") {
- sw.Write(v_type + " ");
- }
- sw.WriteLine("val;");
- }
-
- sw.WriteLine(indent + "\tval.Dispose ();");
- sw.WriteLine(indent + "\treturn ret;");
- sw.WriteLine(indent + "}");
- }
-
- if (Setter != null) {
- sw.Write(indent + "set ");
- Setter.GenerateBody(gen_info, implementor, "\t");
- sw.WriteLine();
- } else if (Writable) {
- sw.WriteLine(indent + "set {");
- sw.Write(indent + "\tGLib.Value val = ");
- if (table.IsBoxed (CType)) {
- sw.WriteLine("(GLib.Value) value;");
- } else if (table.IsOpaque (CType)) {
- sw.WriteLine("new GLib.Value(value, \"{0}\");", CType);
- } else {
- sw.Write("new GLib.Value(");
- if (v_type != "" && !(table.IsObject (CType) || table.IsInterface (CType) || table.IsOpaque (CType))) {
- sw.Write(v_type + " ");
- }
- sw.WriteLine("value);");
- }
- sw.WriteLine(indent + "\t" + RawSetter (qpname) + ";");
- sw.WriteLine(indent + "\tval.Dispose ();");
- sw.WriteLine(indent + "}");
- }
-
- sw.WriteLine(indent.Substring (1) + "}");
- sw.WriteLine();
-
- Statistics.PropCount++;
- }
- }
-}
-
+// GtkSharp.Generation.Property.cs - The Property Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Property : PropertyBase {
+
+ public Property (XmlElement elem, ClassBase container_type) : base (elem, container_type) {}
+
+ public bool Validate ()
+ {
+ if (CSType == "" && !Hidden) {
+ Console.Write("Property has unknown Type {0} ", CType);
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ return true;
+ }
+
+ bool Readable {
+ get {
+ return elem.GetAttribute ("readable") == "true";
+ }
+ }
+
+ bool Writable {
+ get {
+ return elem.GetAttribute ("writeable") == "true" &&
+ !elem.HasAttribute ("construct-only");
+ }
+ }
+
+ bool IsDeprecated {
+ get {
+ return !container_type.IsDeprecated &&
+ (elem.GetAttribute ("deprecated") == "1" ||
+ elem.GetAttribute ("deprecated") == "true");
+ }
+ }
+
+ protected virtual string PropertyAttribute (string qpname) {
+ return "[GLib.Property (" + qpname + ")]";
+ }
+
+ protected virtual string RawGetter (string qpname) {
+ return "GetProperty (" + qpname + ")";
+ }
+
+ protected virtual string RawSetter (string qpname) {
+ return "SetProperty(" + qpname + ", val)";
+ }
+
+ public void GenerateDecl (StreamWriter sw, string indent)
+ {
+ if (Hidden || (!Readable && !Writable))
+ return;
+
+ string name = Name;
+ if (name == container_type.Name)
+ name += "Prop";
+
+ sw.WriteLine (indent + CSType + " " + name + " {");
+ sw.Write (indent + "\t");
+ if (Readable || Getter != null)
+ sw.Write ("get; ");
+ if (Writable || Setter != null)
+ sw.Write ("set;");
+ sw.WriteLine ();
+ sw.WriteLine (indent + "}");
+ }
+
+ public void Generate (GenerationInfo gen_info, string indent, ClassBase implementor)
+ {
+ SymbolTable table = SymbolTable.Table;
+ StreamWriter sw = gen_info.Writer;
+
+ if (Hidden || (!Readable && !Writable))
+ return;
+
+ string modifiers = "";
+
+ if (IsNew || (container_type.Parent != null && container_type.Parent.GetPropertyRecursively (Name) != null))
+ modifiers = "new ";
+ else if (implementor != null && implementor.Parent != null && implementor.Parent.GetPropertyRecursively (Name) != null)
+ modifiers = "new ";
+
+ string name = Name;
+ if (name == container_type.Name) {
+ name += "Prop";
+ }
+ string qpname = "\"" + CName + "\"";
+
+ string v_type = "";
+ if (table.IsInterface (CType)) {
+ v_type = "(GLib.Object)";
+ } else if (table.IsOpaque (CType)) {
+ v_type = "(GLib.Opaque)";
+ } else if (table.IsEnum (CType)) {
+ v_type = "(Enum)";
+ }
+
+ GenerateImports (gen_info, indent);
+
+ if (IsDeprecated ||
+ (Getter != null && Getter.IsDeprecated) ||
+ (Setter != null && Setter.IsDeprecated))
+ sw.WriteLine (indent + "[Obsolete]");
+ sw.WriteLine (indent + PropertyAttribute (qpname));
+ sw.WriteLine (indent + "public " + modifiers + CSType + " " + name + " {");
+ indent += "\t";
+
+ if (Getter != null) {
+ sw.Write(indent + "get ");
+ Getter.GenerateBody(gen_info, implementor, "\t");
+ sw.WriteLine();
+ } else if (Readable) {
+ sw.WriteLine(indent + "get {");
+ sw.WriteLine(indent + "\tGLib.Value val = " + RawGetter (qpname) + ";");
+ if (table.IsOpaque (CType) || table.IsBoxed (CType)) {
+ sw.WriteLine(indent + "\t" + CSType + " ret = (" + CSType + ") val;");
+ } else if (table.IsInterface (CType)) {
+ // Do we have to dispose the GLib.Object from the GLib.Value?
+ sw.WriteLine (indent + "\t{0} ret = {0}Adapter.GetObject ((GLib.Object) val);", CSType);
+ } else {
+ sw.Write(indent + "\t" + CSType + " ret = ");
+ sw.Write ("(" + CSType + ") ");
+ if (v_type != "") {
+ sw.Write(v_type + " ");
+ }
+ sw.WriteLine("val;");
+ }
+
+ sw.WriteLine(indent + "\tval.Dispose ();");
+ sw.WriteLine(indent + "\treturn ret;");
+ sw.WriteLine(indent + "}");
+ }
+
+ if (Setter != null) {
+ sw.Write(indent + "set ");
+ Setter.GenerateBody(gen_info, implementor, "\t");
+ sw.WriteLine();
+ } else if (Writable) {
+ sw.WriteLine(indent + "set {");
+ sw.Write(indent + "\tGLib.Value val = ");
+ if (table.IsBoxed (CType)) {
+ sw.WriteLine("(GLib.Value) value;");
+ } else if (table.IsOpaque (CType)) {
+ sw.WriteLine("new GLib.Value(value, \"{0}\");", CType);
+ } else {
+ sw.Write("new GLib.Value(");
+ if (v_type != "" && !(table.IsObject (CType) || table.IsInterface (CType) || table.IsOpaque (CType))) {
+ sw.Write(v_type + " ");
+ }
+ sw.WriteLine("value);");
+ }
+ sw.WriteLine(indent + "\t" + RawSetter (qpname) + ";");
+ sw.WriteLine(indent + "\tval.Dispose ();");
+ sw.WriteLine(indent + "}");
+ }
+
+ sw.WriteLine(indent.Substring (1) + "}");
+ sw.WriteLine();
+
+ Statistics.PropCount++;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/ReturnValue.cs b/lib/unique-sharp/generator/ReturnValue.cs
index 4ace994..dce6a6c 100644
--- a/lib/unique-sharp/generator/ReturnValue.cs
+++ b/lib/unique-sharp/generator/ReturnValue.cs
@@ -1,170 +1,170 @@
-// GtkSharp.Generation.ReturnValue.cs - The ReturnValue Generatable.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004-2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Xml;
-
- public class ReturnValue {
-
-
- bool is_null_term;
- bool is_array;
- bool elements_owned;
- bool owned;
- string ctype = String.Empty;
- string element_ctype = String.Empty;
-
- public ReturnValue (XmlElement elem)
- {
- if (elem != null) {
- is_null_term = elem.HasAttribute ("null_term_array");
- is_array = elem.HasAttribute ("array");
- elements_owned = elem.GetAttribute ("elements_owned") == "true";
- owned = elem.GetAttribute ("owned") == "true";
- ctype = elem.GetAttribute("type");
- element_ctype = elem.GetAttribute ("element_type");
- }
- }
-
- public string CType {
- get {
- return ctype;
- }
- }
-
- public string CSType {
- get {
- if (IGen == null)
- return String.Empty;
-
- if (ElementType != String.Empty)
- return ElementType + "[]";
-
- return IGen.QualifiedName + (is_array || is_null_term ? "[]" : String.Empty);
- }
- }
-
- public string DefaultValue {
- get {
- if (IGen == null)
- return String.Empty;
- return IGen.DefaultValue;
- }
- }
-
- string ElementType {
- get {
- if (element_ctype.Length > 0)
- return SymbolTable.Table.GetCSType (element_ctype);
-
- return String.Empty;
- }
- }
-
- IGeneratable igen;
- IGeneratable IGen {
- get {
- if (igen == null)
- igen = SymbolTable.Table [CType];
- return igen;
- }
- }
-
- public bool IsVoid {
- get {
- return CSType == "void";
- }
- }
-
- public string MarshalType {
- get {
- if (IGen == null)
- return String.Empty;
- else if (is_null_term)
- return "IntPtr";
- return IGen.MarshalReturnType + (is_array ? "[]" : String.Empty);
- }
- }
-
- public string ToNativeType {
- get {
- if (IGen == null)
- return String.Empty;
- else if (is_null_term)
- return "IntPtr"; //FIXME
- return IGen.ToNativeReturnType + (is_array ? "[]" : String.Empty);
- }
- }
-
- public string FromNative (string var)
- {
- if (IGen == null)
- return String.Empty;
-
- if (ElementType != String.Empty) {
- string args = (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
- if (IGen.QualifiedName == "GLib.PtrArray")
- return String.Format ("({0}[]) GLib.Marshaller.PtrArrayToArray ({1}, {2}, typeof({0}))", ElementType, var, args);
- else
- return String.Format ("({0}[]) GLib.Marshaller.ListPtrToArray ({1}, typeof({2}), {3}, typeof({0}))", ElementType, var, IGen.QualifiedName, args);
- } else if (IGen is HandleBase)
- return ((HandleBase)IGen).FromNative (var, owned);
- else if (is_null_term)
- return String.Format ("GLib.Marshaller.NullTermPtrToStringArray ({0}, {1})", var, owned ? "true" : "false");
- else
- return IGen.FromNativeReturn (var);
- }
-
- public string ToNative (string var)
- {
- if (IGen == null)
- return String.Empty;
-
- if (ElementType.Length > 0) {
- string args = ", typeof (" + ElementType + "), " + (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
- var = "new " + IGen.QualifiedName + "(" + var + args + ")";
- } else if (is_null_term)
- return String.Format ("GLib.Marshaller.StringArrayToNullTermPtr ({0})", var);
-
- if (IGen is IManualMarshaler)
- return (IGen as IManualMarshaler).AllocNative (var);
- else if (IGen is ObjectGen && owned)
- return var + " == null ? IntPtr.Zero : " + var + ".OwnedHandle";
- else if (IGen is OpaqueGen && owned)
- return var + " == null ? IntPtr.Zero : " + var + ".OwnedCopy";
- else
- return IGen.ToNativeReturn (var);
- }
-
- public bool Validate ()
- {
- if (MarshalType == "" || CSType == "") {
- Console.Write("rettype: " + CType);
- return false;
- }
-
- return true;
- }
- }
-}
-
+// GtkSharp.Generation.ReturnValue.cs - The ReturnValue Generatable.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Xml;
+
+ public class ReturnValue {
+
+
+ bool is_null_term;
+ bool is_array;
+ bool elements_owned;
+ bool owned;
+ string ctype = String.Empty;
+ string element_ctype = String.Empty;
+
+ public ReturnValue (XmlElement elem)
+ {
+ if (elem != null) {
+ is_null_term = elem.HasAttribute ("null_term_array");
+ is_array = elem.HasAttribute ("array");
+ elements_owned = elem.GetAttribute ("elements_owned") == "true";
+ owned = elem.GetAttribute ("owned") == "true";
+ ctype = elem.GetAttribute("type");
+ element_ctype = elem.GetAttribute ("element_type");
+ }
+ }
+
+ public string CType {
+ get {
+ return ctype;
+ }
+ }
+
+ public string CSType {
+ get {
+ if (IGen == null)
+ return String.Empty;
+
+ if (ElementType != String.Empty)
+ return ElementType + "[]";
+
+ return IGen.QualifiedName + (is_array || is_null_term ? "[]" : String.Empty);
+ }
+ }
+
+ public string DefaultValue {
+ get {
+ if (IGen == null)
+ return String.Empty;
+ return IGen.DefaultValue;
+ }
+ }
+
+ string ElementType {
+ get {
+ if (element_ctype.Length > 0)
+ return SymbolTable.Table.GetCSType (element_ctype);
+
+ return String.Empty;
+ }
+ }
+
+ IGeneratable igen;
+ IGeneratable IGen {
+ get {
+ if (igen == null)
+ igen = SymbolTable.Table [CType];
+ return igen;
+ }
+ }
+
+ public bool IsVoid {
+ get {
+ return CSType == "void";
+ }
+ }
+
+ public string MarshalType {
+ get {
+ if (IGen == null)
+ return String.Empty;
+ else if (is_null_term)
+ return "IntPtr";
+ return IGen.MarshalReturnType + (is_array ? "[]" : String.Empty);
+ }
+ }
+
+ public string ToNativeType {
+ get {
+ if (IGen == null)
+ return String.Empty;
+ else if (is_null_term)
+ return "IntPtr"; //FIXME
+ return IGen.ToNativeReturnType + (is_array ? "[]" : String.Empty);
+ }
+ }
+
+ public string FromNative (string var)
+ {
+ if (IGen == null)
+ return String.Empty;
+
+ if (ElementType != String.Empty) {
+ string args = (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
+ if (IGen.QualifiedName == "GLib.PtrArray")
+ return String.Format ("({0}[]) GLib.Marshaller.PtrArrayToArray ({1}, {2}, typeof({0}))", ElementType, var, args);
+ else
+ return String.Format ("({0}[]) GLib.Marshaller.ListPtrToArray ({1}, typeof({2}), {3}, typeof({0}))", ElementType, var, IGen.QualifiedName, args);
+ } else if (IGen is HandleBase)
+ return ((HandleBase)IGen).FromNative (var, owned);
+ else if (is_null_term)
+ return String.Format ("GLib.Marshaller.NullTermPtrToStringArray ({0}, {1})", var, owned ? "true" : "false");
+ else
+ return IGen.FromNativeReturn (var);
+ }
+
+ public string ToNative (string var)
+ {
+ if (IGen == null)
+ return String.Empty;
+
+ if (ElementType.Length > 0) {
+ string args = ", typeof (" + ElementType + "), " + (owned ? "true" : "false") + ", " + (elements_owned ? "true" : "false");
+ var = "new " + IGen.QualifiedName + "(" + var + args + ")";
+ } else if (is_null_term)
+ return String.Format ("GLib.Marshaller.StringArrayToNullTermPtr ({0})", var);
+
+ if (IGen is IManualMarshaler)
+ return (IGen as IManualMarshaler).AllocNative (var);
+ else if (IGen is ObjectGen && owned)
+ return var + " == null ? IntPtr.Zero : " + var + ".OwnedHandle";
+ else if (IGen is OpaqueGen && owned)
+ return var + " == null ? IntPtr.Zero : " + var + ".OwnedCopy";
+ else
+ return IGen.ToNativeReturn (var);
+ }
+
+ public bool Validate ()
+ {
+ if (MarshalType == "" || CSType == "") {
+ Console.Write("rettype: " + CType);
+ return false;
+ }
+
+ return true;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/Signal.cs b/lib/unique-sharp/generator/Signal.cs
index 32901c0..d01cfe6 100644
--- a/lib/unique-sharp/generator/Signal.cs
+++ b/lib/unique-sharp/generator/Signal.cs
@@ -1,587 +1,587 @@
-// GtkSharp.Generation.Signal.cs - The Signal Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2003-2005 Novell, Inc.
-// Copyright (c) 2007 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.IO;
- using System.Xml;
-
- public class Signal {
-
- bool marshaled;
- string name;
- XmlElement elem;
- ReturnValue retval;
- Parameters parms;
- ClassBase container_type;
-
- public Signal (XmlElement elem, ClassBase container_type)
- {
- this.elem = elem;
- name = elem.GetAttribute ("name");
- marshaled = elem.GetAttribute ("manual") == "true";
- retval = new ReturnValue (elem ["return-type"]);
- parms = new Parameters (elem["parameters"]);
- this.container_type = container_type;
- }
-
- bool Marshaled {
- get { return marshaled; }
- }
-
- public string Name {
- get {
- return name;
- }
- set {
- name = value;
- }
- }
-
- public bool Validate ()
- {
- if (Name == "") {
- Console.Write ("Nameless signal ");
- Statistics.ThrottledCount++;
- return false;
- }
-
- if (!parms.Validate () || !retval.Validate ()) {
- Console.Write (" in signal " + Name + " ");
- Statistics.ThrottledCount++;
- return false;
- }
-
- return true;
- }
-
- public void GenerateDecl (StreamWriter sw)
- {
- if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null))
- sw.Write("new ");
-
- sw.WriteLine ("\t\tevent " + EventHandlerQualifiedName + " " + Name + ";");
- }
-
- public string CName {
- get {
- return "\"" + elem.GetAttribute("cname") + "\"";
- }
- }
-
- string CallbackSig {
- get {
- string result = "";
- for (int i = 0; i < parms.Count; i++) {
- if (i > 0)
- result += ", ";
-
- Parameter p = parms [i];
- if (p.PassAs != "" && !(p.Generatable is StructBase))
- result += p.PassAs + " ";
- result += (p.MarshalType + " arg" + i);
- }
-
- return result;
- }
- }
-
- string CallbackName {
- get { return Name + "SignalCallback"; }
- }
-
- string DelegateName {
- get { return Name + "SignalDelegate"; }
- }
-
- private string EventArgsName {
- get {
- if (IsEventHandler)
- return "EventArgs";
- else
- return Name + "Args";
- }
- }
-
- private string EventArgsQualifiedName {
- get {
- if (IsEventHandler)
- return "System.EventArgs";
- else
- return container_type.NS + "." + Name + "Args";
- }
- }
-
- private string EventHandlerName {
- get {
- if (IsEventHandler)
- return "EventHandler";
- else if (SymbolTable.Table [container_type.NS + Name + "Handler"] != null)
- return Name + "EventHandler";
- else
- return Name + "Handler";
- }
- }
-
- private string EventHandlerQualifiedName {
- get {
- if (IsEventHandler)
- return "System.EventHandler";
- else
- return container_type.NS + "." + EventHandlerName;
- }
- }
-
- string ClassFieldName {
- get {
- return elem.HasAttribute ("field_name") ? elem.GetAttribute("field_name") : String.Empty;
- }
- }
-
- private bool HasOutParams {
- get {
- foreach (Parameter p in parms) {
- if (p.PassAs == "out")
- return true;
- }
- return false;
- }
- }
-
- private bool IsEventHandler {
- get {
- return retval.CSType == "void" && parms.Count == 1 && (parms [0].Generatable is ObjectGen || parms [0].Generatable is InterfaceGen);
- }
- }
-
- private bool IsVoid {
- get {
- return retval.CSType == "void";
- }
- }
-
- private string ReturnGType {
- get {
- IGeneratable igen = SymbolTable.Table [retval.CType];
-
- if (igen is ObjectGen)
- return "GLib.GType.Object";
- if (igen is BoxedGen)
- return retval.CSType + ".GType";
- if (igen is EnumGen)
- return retval.CSType + "GType.GType";
-
- switch (retval.CSType) {
- case "bool":
- return "GLib.GType.Boolean";
- case "string":
- return "GLib.GType.String";
- case "int":
- return "GLib.GType.Int";
- default:
- throw new Exception (retval.CSType);
- }
- }
- }
-
- public string GenArgsInitialization (StreamWriter sw)
- {
- if (parms.Count > 1)
- sw.WriteLine("\t\t\t\targs.Args = new object[" + (parms.Count - 1) + "];");
- string finish = "";
- for (int idx = 1; idx < parms.Count; idx++) {
- Parameter p = parms [idx];
- IGeneratable igen = p.Generatable;
- if (p.PassAs != "out") {
- if (igen is ManualGen) {
- sw.WriteLine("\t\t\t\tif (arg{0} == IntPtr.Zero)", idx);
- sw.WriteLine("\t\t\t\t\targs.Args[{0}] = null;", idx - 1);
- sw.WriteLine("\t\t\t\telse {");
- sw.WriteLine("\t\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
- sw.WriteLine("\t\t\t\t}");
- } else
- sw.WriteLine("\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
- }
- if (igen is StructBase && p.PassAs == "ref")
- finish += "\t\t\t\tif (arg" + idx + " != IntPtr.Zero) System.Runtime.InteropServices.Marshal.StructureToPtr (args.Args[" + (idx-1) + "], arg" + idx + ", false);\n";
- else if (p.PassAs != "")
- finish += "\t\t\t\targ" + idx + " = " + igen.ToNativeReturn ("((" + p.CSType + ")args.Args[" + (idx - 1) + "])") + ";\n";
- }
- return finish;
- }
-
- public void GenArgsCleanup (StreamWriter sw, string finish)
- {
- if (IsVoid && finish.Length == 0)
- return;
-
- sw.WriteLine("\n\t\t\ttry {");
- sw.Write (finish);
- if (!IsVoid) {
- if (retval.CSType == "bool") {
- sw.WriteLine ("\t\t\t\tif (args.RetVal == null)");
- sw.WriteLine ("\t\t\t\t\treturn false;");
- }
- sw.WriteLine("\t\t\t\treturn " + SymbolTable.Table.ToNativeReturn (retval.CType, "((" + retval.CSType + ")args.RetVal)") + ";");
- }
- sw.WriteLine("\t\t\t} catch (Exception) {");
- sw.WriteLine ("\t\t\t\tException ex = new Exception (\"args.RetVal or 'out' property unset or set to incorrect type in " + EventHandlerQualifiedName + " callback\");");
- sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (ex, true);");
-
- sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return.");
- sw.WriteLine ("\t\t\t\tthrow ex;");
- sw.WriteLine("\t\t\t}");
- }
-
- public void GenCallback (StreamWriter sw)
- {
- if (IsEventHandler)
- return;
-
- sw.WriteLine ("\t\t[GLib.CDeclCallback]");
- sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ", IntPtr gch);");
- sw.WriteLine ();
- sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ", IntPtr gch)");
- sw.WriteLine("\t\t{");
- sw.WriteLine("\t\t\t{0} args = new {0} ();", EventArgsQualifiedName);
- sw.WriteLine("\t\t\ttry {");
- sw.WriteLine("\t\t\t\tGLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;");
- sw.WriteLine("\t\t\t\tif (sig == null)");
- sw.WriteLine("\t\t\t\t\tthrow new Exception(\"Unknown signal GC handle received \" + gch);");
- sw.WriteLine();
- string finish = GenArgsInitialization (sw);
- sw.WriteLine("\t\t\t\t{0} handler = ({0}) sig.Handler;", EventHandlerQualifiedName);
- sw.WriteLine("\t\t\t\thandler (GLib.Object.GetObject (arg0), args);");
- sw.WriteLine("\t\t\t} catch (Exception e) {");
- sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, false);");
- sw.WriteLine("\t\t\t}");
- GenArgsCleanup (sw, finish);
- sw.WriteLine("\t\t}");
- sw.WriteLine();
- }
-
- private bool NeedNew (ClassBase implementor)
- {
- return elem.HasAttribute ("new_flag") ||
- (container_type != null && container_type.GetSignalRecursively (Name) != null) ||
- (implementor != null && implementor.GetSignalRecursively (Name) != null);
- }
-
- public void GenEventHandler (GenerationInfo gen_info)
- {
- if (IsEventHandler)
- return;
-
- string ns = container_type.NS;
-
- StreamWriter sw = gen_info.OpenStream (EventHandlerName);
-
- sw.WriteLine ("namespace " + ns + " {");
- sw.WriteLine ();
- sw.WriteLine ("\tusing System;");
-
- sw.WriteLine ();
- sw.WriteLine ("\tpublic delegate void " + EventHandlerName + "(object o, " + EventArgsName + " args);");
- sw.WriteLine ();
- sw.WriteLine ("\tpublic class " + EventArgsName + " : GLib.SignalArgs {");
- for (int i = 1; i < parms.Count; i++) {
- sw.WriteLine ("\t\tpublic " + parms[i].CSType + " " + parms[i].StudlyName + "{");
- if (parms[i].PassAs != "out") {
- sw.WriteLine ("\t\t\tget {");
- sw.WriteLine ("\t\t\t\treturn (" + parms[i].CSType + ") Args[" + (i - 1) + "];");
- sw.WriteLine ("\t\t\t}");
- }
- if (parms[i].PassAs != "") {
- sw.WriteLine ("\t\t\tset {");
- sw.WriteLine ("\t\t\t\tArgs[" + (i - 1) + "] = (" + parms[i].CSType + ")value;");
- sw.WriteLine ("\t\t\t}");
- }
- sw.WriteLine ("\t\t}");
- sw.WriteLine ();
- }
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- }
-
- private void GenVMDeclaration (StreamWriter sw, ClassBase implementor)
- {
- VMSignature vmsig = new VMSignature (parms);
- sw.WriteLine ("\t\t[GLib.DefaultSignalHandler(Type=typeof(" + (implementor != null ? implementor.QualifiedName : container_type.QualifiedName) + "), ConnectionMethod=\"Override" + Name +"\")]");
- sw.Write ("\t\tprotected ");
- if (NeedNew (implementor))
- sw.Write ("new ");
- sw.WriteLine ("virtual {0} {1} ({2})", retval.CSType, "On" + Name, vmsig.ToString ());
- }
-
- private string CastFromInt (string type)
- {
- return type != "int" ? "(" + type + ") " : "";
- }
-
- private string GlueCallString {
- get {
- string result = "Handle";
-
- for (int i = 1; i < parms.Count; i++) {
- Parameter p = parms [i];
- IGeneratable igen = p.Generatable;
-
- if (i > 1 && parms [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
- string string_name = parms [i - 1].Name;
- result += ", " + igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
- continue;
- }
-
- p.CallName = p.Name;
- string call_parm = p.CallString;
-
- if (p.IsUserData && parms.IsHidden (p) && !parms.HideData && (i == 1 || parms [i - 1].Scope != "notified")) {
- call_parm = "IntPtr.Zero";
- }
-
- result += ", " + call_parm;
- }
- return result;
- }
- }
-
- private string GlueSignature {
- get {
- string result = String.Empty;
- for (int i = 0; i < parms.Count; i++)
- result += parms[i].CType.Replace ("const-", "const ") + " " + parms[i].Name + (i == parms.Count-1 ? "" : ", ");
- return result;
- }
- }
-
- private string DefaultGlueValue {
- get {
- string val = retval.DefaultValue;
- switch (val) {
- case "null":
- return "NULL";
- case "false":
- return "FALSE";
- case "true":
- return "TRUE";
- default:
- return val;
- }
- }
- }
-
- private void GenGlueVirtualMethod (GenerationInfo gen_info)
- {
- StreamWriter glue = gen_info.GlueWriter;
- string glue_name = String.Format ("{0}sharp_{1}_base_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
- glue.WriteLine ("{0} {1} ({2});\n", retval.CType, glue_name, GlueSignature);
- glue.WriteLine ("{0}\n{1} ({2})", retval.CType, glue_name, GlueSignature);
- glue.WriteLine ("{");
- glue.WriteLine ("\t{0}Class *klass = ({0}Class *) get_threshold_class (G_OBJECT ({1}));", container_type.CName, parms[0].Name);
- glue.Write ("\tif (klass->{0})\n\t\t", ClassFieldName);
- if (!IsVoid)
- glue.Write ("return ");
- glue.Write ("(* klass->{0}) (", ClassFieldName);
- for (int i = 0; i < parms.Count; i++)
- glue.Write (parms[i].Name + (i == parms.Count - 1 ? "" : ", "));
- glue.WriteLine (");");
- if (!IsVoid)
- glue.WriteLine ("\treturn " + DefaultGlueValue + ";");
- glue.WriteLine ("}");
-
- StreamWriter sw = gen_info.Writer;
- sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
- sw.WriteLine ("\t\tstatic extern {0} {1} ({2});\n", retval.MarshalType, glue_name, parms.ImportSignature);
- GenVMDeclaration (sw, null);
- sw.WriteLine ("\t\t{");
- MethodBody body = new MethodBody (parms);
- body.Initialize (gen_info, false, false, String.Empty);
- sw.WriteLine ("\t\t\t{0}{1} ({2});", IsVoid ? "" : retval.MarshalType + " __ret = ", glue_name, GlueCallString);
- body.Finish (sw, "");
- if (!IsVoid)
- sw.WriteLine ("\t\t\treturn {0};", retval.FromNative ("__ret"));
- sw.WriteLine ("\t\t}\n");
- }
-
- private void GenChainVirtualMethod (StreamWriter sw, ClassBase implementor)
- {
- GenVMDeclaration (sw, implementor);
- sw.WriteLine ("\t\t{");
- if (IsVoid)
- sw.WriteLine ("\t\t\tGLib.Value ret = GLib.Value.Empty;");
- else
- sw.WriteLine ("\t\t\tGLib.Value ret = new GLib.Value (" + ReturnGType + ");");
-
- sw.WriteLine ("\t\t\tGLib.ValueArray inst_and_params = new GLib.ValueArray (" + parms.Count + ");");
- sw.WriteLine ("\t\t\tGLib.Value[] vals = new GLib.Value [" + parms.Count + "];");
- sw.WriteLine ("\t\t\tvals [0] = new GLib.Value (this);");
- sw.WriteLine ("\t\t\tinst_and_params.Append (vals [0]);");
- string cleanup = "";
- for (int i = 1; i < parms.Count; i++) {
- Parameter p = parms [i];
- if (p.PassAs != "") {
- if (SymbolTable.Table.IsBoxed (p.CType)) {
- if (p.PassAs == "ref")
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
- else
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value ((GLib.GType)typeof (" + p.CSType + "));");
- cleanup += "\t\t\t" + p.Name + " = (" + p.CSType + ") vals [" + i + "];\n";
- } else {
- if (p.PassAs == "ref")
- sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = GLib.Marshaller.StructureToPtrAlloc (" + p.Generatable.CallByName (p.Name) + ");");
- else
- sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + p.MarshalType + ")));");
-
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + "_ptr);");
- cleanup += "\t\t\t" + p.Name + " = " + p.FromNative ("(" + p.MarshalType + ") Marshal.PtrToStructure (" + p.Name + "_ptr, typeof (" + p.MarshalType + "))") + ";\n";
- cleanup += "\t\t\tMarshal.FreeHGlobal (" + p.Name + "_ptr);\n";
- }
- } else if (p.IsLength && parms [i - 1].IsString)
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (System.Text.Encoding.UTF8.GetByteCount (" + parms [i-1].Name + "));");
- else
- sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
-
- sw.WriteLine ("\t\t\tinst_and_params.Append (vals [" + i + "]);");
- }
-
- sw.WriteLine ("\t\t\tg_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);");
- if (cleanup != "")
- sw.WriteLine (cleanup);
- sw.WriteLine ("\t\t\tforeach (GLib.Value v in vals)");
- sw.WriteLine ("\t\t\t\tv.Dispose ();");
- if (!IsVoid) {
- IGeneratable igen = SymbolTable.Table [retval.CType];
- sw.WriteLine ("\t\t\t" + retval.CSType + " result = (" + (igen is EnumGen ? retval.CSType + ") (Enum" : retval.CSType) + ") ret;");
- sw.WriteLine ("\t\t\tret.Dispose ();");
- sw.WriteLine ("\t\t\treturn result;");
- }
- sw.WriteLine ("\t\t}\n");
- }
-
- private void GenDefaultHandlerDelegate (GenerationInfo gen_info, ClassBase implementor)
- {
- StreamWriter sw = gen_info.Writer;
- StreamWriter glue;
- bool use_glue = gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0;
- string glue_name = String.Empty;
- ManagedCallString call = new ManagedCallString (parms, true);
- sw.WriteLine ("\t\t[GLib.CDeclCallback]");
- sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "VMDelegate (" + parms.ImportSignature + ");\n");
-
- if (use_glue) {
- glue = gen_info.GlueWriter;
- glue_name = String.Format ("{0}sharp_{1}_override_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
- sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
- sw.WriteLine ("\t\tstatic extern void {0} (IntPtr gtype, {1}VMDelegate cb);\n", glue_name, Name);
- glue.WriteLine ("void {0} (GType gtype, gpointer cb);\n", glue_name);
- glue.WriteLine ("void\n{0} (GType gtype, gpointer cb)", glue_name);
- glue.WriteLine ("{");
- glue.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
- glue.WriteLine ("\tif (klass == NULL)");
- glue.WriteLine ("\t\tklass = g_type_class_ref (gtype);");
- glue.WriteLine ("\t(({0} *)klass)->{1} = cb;", container_type.CName + "Class", ClassFieldName);
- glue.WriteLine ("}\n");
- }
-
- sw.WriteLine ("\t\tstatic {0} {1};\n", Name + "VMDelegate", Name + "VMCallback");
- sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + Name.ToLower() + "_cb (" + parms.ImportSignature + ")");
- sw.WriteLine ("\t\t{");
- string unconditional = call.Unconditional ("\t\t\t");
- if (unconditional.Length > 0)
- sw.WriteLine (unconditional);
- sw.WriteLine ("\t\t\ttry {");
- sw.WriteLine ("\t\t\t\t{0} {1}_managed = GLib.Object.GetObject ({1}, false) as {0};", implementor != null ? implementor.Name : container_type.Name, parms[0].Name);
- sw.Write (call.Setup ("\t\t\t\t"));
- sw.Write ("\t\t\t\t{0}", IsVoid ? "" : retval.CSType == retval.ToNativeType ? "return " : retval.CSType + " raw_ret = ");
- sw.WriteLine ("{2}_managed.{0} ({1});", "On" + Name, call.ToString (), parms[0].Name);
- sw.Write (call.Finish ("\t\t\t\t"));
- if (!IsVoid && retval.CSType != retval.ToNativeType)
- sw.WriteLine ("\t\t\t\treturn {0};", SymbolTable.Table.ToNativeReturn (retval.CType, "raw_ret"));
- sw.WriteLine ("\t\t\t} catch (Exception e) {");
- bool fatal = HasOutParams || !IsVoid;
- sw.WriteLine ("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, " + (fatal ? "true" : "false") + ");");
- if (fatal) {
- sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return");
- sw.WriteLine ("\t\t\t\tthrow e;");
- }
- sw.WriteLine ("\t\t\t}");
- sw.WriteLine ("\t\t}\n");
- sw.WriteLine ("\t\tprivate static void Override" + Name + " (GLib.GType gtype)");
- sw.WriteLine ("\t\t{");
- sw.WriteLine ("\t\t\tif (" + Name + "VMCallback == null)");
- sw.WriteLine ("\t\t\t\t" + Name + "VMCallback = new " + Name + "VMDelegate (" + Name.ToLower() + "_cb);");
- if (use_glue)
- sw.WriteLine ("\t\t\t{0} (gtype.Val, {1}VMCallback);", glue_name, Name);
- else
- sw.WriteLine ("\t\t\tOverrideVirtualMethod (gtype, " + CName + ", " + Name + "VMCallback);");
- sw.WriteLine ("\t\t}\n");
- }
-
- public void GenEvent (StreamWriter sw, ClassBase implementor, string target)
- {
- string args_type = IsEventHandler ? "" : ", typeof (" + EventArgsQualifiedName + ")";
-
- if (Marshaled) {
- GenCallback (sw);
- args_type = ", new " + DelegateName + "(" + CallbackName + ")";
- }
-
- sw.WriteLine("\t\t[GLib.Signal("+ CName + ")]");
- sw.Write("\t\tpublic ");
- if (NeedNew (implementor))
- sw.Write("new ");
- sw.WriteLine("event " + EventHandlerQualifiedName + " " + Name + " {");
- sw.WriteLine("\t\t\tadd {");
- sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
- sw.WriteLine("\t\t\t\tsig.AddDelegate (value);");
- sw.WriteLine("\t\t\t}");
- sw.WriteLine("\t\t\tremove {");
- sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
- sw.WriteLine("\t\t\t\tsig.RemoveDelegate (value);");
- sw.WriteLine("\t\t\t}");
- sw.WriteLine("\t\t}");
- sw.WriteLine();
- }
-
- public void Generate (GenerationInfo gen_info, ClassBase implementor)
- {
- StreamWriter sw = gen_info.Writer;
-
- if (implementor == null)
- GenEventHandler (gen_info);
-
- GenDefaultHandlerDelegate (gen_info, implementor);
- if (gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0)
- GenGlueVirtualMethod (gen_info);
- else
- GenChainVirtualMethod (sw, implementor);
- GenEvent (sw, implementor, "this");
-
- Statistics.SignalCount++;
- }
- }
-}
-
+// GtkSharp.Generation.Signal.cs - The Signal Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2003-2005 Novell, Inc.
+// Copyright (c) 2007 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.IO;
+ using System.Xml;
+
+ public class Signal {
+
+ bool marshaled;
+ string name;
+ XmlElement elem;
+ ReturnValue retval;
+ Parameters parms;
+ ClassBase container_type;
+
+ public Signal (XmlElement elem, ClassBase container_type)
+ {
+ this.elem = elem;
+ name = elem.GetAttribute ("name");
+ marshaled = elem.GetAttribute ("manual") == "true";
+ retval = new ReturnValue (elem ["return-type"]);
+ parms = new Parameters (elem["parameters"]);
+ this.container_type = container_type;
+ }
+
+ bool Marshaled {
+ get { return marshaled; }
+ }
+
+ public string Name {
+ get {
+ return name;
+ }
+ set {
+ name = value;
+ }
+ }
+
+ public bool Validate ()
+ {
+ if (Name == "") {
+ Console.Write ("Nameless signal ");
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ if (!parms.Validate () || !retval.Validate ()) {
+ Console.Write (" in signal " + Name + " ");
+ Statistics.ThrottledCount++;
+ return false;
+ }
+
+ return true;
+ }
+
+ public void GenerateDecl (StreamWriter sw)
+ {
+ if (elem.HasAttribute("new_flag") || (container_type != null && container_type.GetSignalRecursively (Name) != null))
+ sw.Write("new ");
+
+ sw.WriteLine ("\t\tevent " + EventHandlerQualifiedName + " " + Name + ";");
+ }
+
+ public string CName {
+ get {
+ return "\"" + elem.GetAttribute("cname") + "\"";
+ }
+ }
+
+ string CallbackSig {
+ get {
+ string result = "";
+ for (int i = 0; i < parms.Count; i++) {
+ if (i > 0)
+ result += ", ";
+
+ Parameter p = parms [i];
+ if (p.PassAs != "" && !(p.Generatable is StructBase))
+ result += p.PassAs + " ";
+ result += (p.MarshalType + " arg" + i);
+ }
+
+ return result;
+ }
+ }
+
+ string CallbackName {
+ get { return Name + "SignalCallback"; }
+ }
+
+ string DelegateName {
+ get { return Name + "SignalDelegate"; }
+ }
+
+ private string EventArgsName {
+ get {
+ if (IsEventHandler)
+ return "EventArgs";
+ else
+ return Name + "Args";
+ }
+ }
+
+ private string EventArgsQualifiedName {
+ get {
+ if (IsEventHandler)
+ return "System.EventArgs";
+ else
+ return container_type.NS + "." + Name + "Args";
+ }
+ }
+
+ private string EventHandlerName {
+ get {
+ if (IsEventHandler)
+ return "EventHandler";
+ else if (SymbolTable.Table [container_type.NS + Name + "Handler"] != null)
+ return Name + "EventHandler";
+ else
+ return Name + "Handler";
+ }
+ }
+
+ private string EventHandlerQualifiedName {
+ get {
+ if (IsEventHandler)
+ return "System.EventHandler";
+ else
+ return container_type.NS + "." + EventHandlerName;
+ }
+ }
+
+ string ClassFieldName {
+ get {
+ return elem.HasAttribute ("field_name") ? elem.GetAttribute("field_name") : String.Empty;
+ }
+ }
+
+ private bool HasOutParams {
+ get {
+ foreach (Parameter p in parms) {
+ if (p.PassAs == "out")
+ return true;
+ }
+ return false;
+ }
+ }
+
+ private bool IsEventHandler {
+ get {
+ return retval.CSType == "void" && parms.Count == 1 && (parms [0].Generatable is ObjectGen || parms [0].Generatable is InterfaceGen);
+ }
+ }
+
+ private bool IsVoid {
+ get {
+ return retval.CSType == "void";
+ }
+ }
+
+ private string ReturnGType {
+ get {
+ IGeneratable igen = SymbolTable.Table [retval.CType];
+
+ if (igen is ObjectGen)
+ return "GLib.GType.Object";
+ if (igen is BoxedGen)
+ return retval.CSType + ".GType";
+ if (igen is EnumGen)
+ return retval.CSType + "GType.GType";
+
+ switch (retval.CSType) {
+ case "bool":
+ return "GLib.GType.Boolean";
+ case "string":
+ return "GLib.GType.String";
+ case "int":
+ return "GLib.GType.Int";
+ default:
+ throw new Exception (retval.CSType);
+ }
+ }
+ }
+
+ public string GenArgsInitialization (StreamWriter sw)
+ {
+ if (parms.Count > 1)
+ sw.WriteLine("\t\t\t\targs.Args = new object[" + (parms.Count - 1) + "];");
+ string finish = "";
+ for (int idx = 1; idx < parms.Count; idx++) {
+ Parameter p = parms [idx];
+ IGeneratable igen = p.Generatable;
+ if (p.PassAs != "out") {
+ if (igen is ManualGen) {
+ sw.WriteLine("\t\t\t\tif (arg{0} == IntPtr.Zero)", idx);
+ sw.WriteLine("\t\t\t\t\targs.Args[{0}] = null;", idx - 1);
+ sw.WriteLine("\t\t\t\telse {");
+ sw.WriteLine("\t\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
+ sw.WriteLine("\t\t\t\t}");
+ } else
+ sw.WriteLine("\t\t\t\targs.Args[" + (idx - 1) + "] = " + p.FromNative ("arg" + idx) + ";");
+ }
+ if (igen is StructBase && p.PassAs == "ref")
+ finish += "\t\t\t\tif (arg" + idx + " != IntPtr.Zero) System.Runtime.InteropServices.Marshal.StructureToPtr (args.Args[" + (idx-1) + "], arg" + idx + ", false);\n";
+ else if (p.PassAs != "")
+ finish += "\t\t\t\targ" + idx + " = " + igen.ToNativeReturn ("((" + p.CSType + ")args.Args[" + (idx - 1) + "])") + ";\n";
+ }
+ return finish;
+ }
+
+ public void GenArgsCleanup (StreamWriter sw, string finish)
+ {
+ if (IsVoid && finish.Length == 0)
+ return;
+
+ sw.WriteLine("\n\t\t\ttry {");
+ sw.Write (finish);
+ if (!IsVoid) {
+ if (retval.CSType == "bool") {
+ sw.WriteLine ("\t\t\t\tif (args.RetVal == null)");
+ sw.WriteLine ("\t\t\t\t\treturn false;");
+ }
+ sw.WriteLine("\t\t\t\treturn " + SymbolTable.Table.ToNativeReturn (retval.CType, "((" + retval.CSType + ")args.RetVal)") + ";");
+ }
+ sw.WriteLine("\t\t\t} catch (Exception) {");
+ sw.WriteLine ("\t\t\t\tException ex = new Exception (\"args.RetVal or 'out' property unset or set to incorrect type in " + EventHandlerQualifiedName + " callback\");");
+ sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (ex, true);");
+
+ sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return.");
+ sw.WriteLine ("\t\t\t\tthrow ex;");
+ sw.WriteLine("\t\t\t}");
+ }
+
+ public void GenCallback (StreamWriter sw)
+ {
+ if (IsEventHandler)
+ return;
+
+ sw.WriteLine ("\t\t[GLib.CDeclCallback]");
+ sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + DelegateName + " (" + CallbackSig + ", IntPtr gch);");
+ sw.WriteLine ();
+ sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + CallbackName + " (" + CallbackSig + ", IntPtr gch)");
+ sw.WriteLine("\t\t{");
+ sw.WriteLine("\t\t\t{0} args = new {0} ();", EventArgsQualifiedName);
+ sw.WriteLine("\t\t\ttry {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = ((GCHandle) gch).Target as GLib.Signal;");
+ sw.WriteLine("\t\t\t\tif (sig == null)");
+ sw.WriteLine("\t\t\t\t\tthrow new Exception(\"Unknown signal GC handle received \" + gch);");
+ sw.WriteLine();
+ string finish = GenArgsInitialization (sw);
+ sw.WriteLine("\t\t\t\t{0} handler = ({0}) sig.Handler;", EventHandlerQualifiedName);
+ sw.WriteLine("\t\t\t\thandler (GLib.Object.GetObject (arg0), args);");
+ sw.WriteLine("\t\t\t} catch (Exception e) {");
+ sw.WriteLine("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, false);");
+ sw.WriteLine("\t\t\t}");
+ GenArgsCleanup (sw, finish);
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+ }
+
+ private bool NeedNew (ClassBase implementor)
+ {
+ return elem.HasAttribute ("new_flag") ||
+ (container_type != null && container_type.GetSignalRecursively (Name) != null) ||
+ (implementor != null && implementor.GetSignalRecursively (Name) != null);
+ }
+
+ public void GenEventHandler (GenerationInfo gen_info)
+ {
+ if (IsEventHandler)
+ return;
+
+ string ns = container_type.NS;
+
+ StreamWriter sw = gen_info.OpenStream (EventHandlerName);
+
+ sw.WriteLine ("namespace " + ns + " {");
+ sw.WriteLine ();
+ sw.WriteLine ("\tusing System;");
+
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic delegate void " + EventHandlerName + "(object o, " + EventArgsName + " args);");
+ sw.WriteLine ();
+ sw.WriteLine ("\tpublic class " + EventArgsName + " : GLib.SignalArgs {");
+ for (int i = 1; i < parms.Count; i++) {
+ sw.WriteLine ("\t\tpublic " + parms[i].CSType + " " + parms[i].StudlyName + "{");
+ if (parms[i].PassAs != "out") {
+ sw.WriteLine ("\t\t\tget {");
+ sw.WriteLine ("\t\t\t\treturn (" + parms[i].CSType + ") Args[" + (i - 1) + "];");
+ sw.WriteLine ("\t\t\t}");
+ }
+ if (parms[i].PassAs != "") {
+ sw.WriteLine ("\t\t\tset {");
+ sw.WriteLine ("\t\t\t\tArgs[" + (i - 1) + "] = (" + parms[i].CSType + ")value;");
+ sw.WriteLine ("\t\t\t}");
+ }
+ sw.WriteLine ("\t\t}");
+ sw.WriteLine ();
+ }
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ }
+
+ private void GenVMDeclaration (StreamWriter sw, ClassBase implementor)
+ {
+ VMSignature vmsig = new VMSignature (parms);
+ sw.WriteLine ("\t\t[GLib.DefaultSignalHandler(Type=typeof(" + (implementor != null ? implementor.QualifiedName : container_type.QualifiedName) + "), ConnectionMethod=\"Override" + Name +"\")]");
+ sw.Write ("\t\tprotected ");
+ if (NeedNew (implementor))
+ sw.Write ("new ");
+ sw.WriteLine ("virtual {0} {1} ({2})", retval.CSType, "On" + Name, vmsig.ToString ());
+ }
+
+ private string CastFromInt (string type)
+ {
+ return type != "int" ? "(" + type + ") " : "";
+ }
+
+ private string GlueCallString {
+ get {
+ string result = "Handle";
+
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+ IGeneratable igen = p.Generatable;
+
+ if (i > 1 && parms [i - 1].IsString && p.IsLength && p.PassAs == String.Empty) {
+ string string_name = parms [i - 1].Name;
+ result += ", " + igen.CallByName (CastFromInt (p.CSType) + "System.Text.Encoding.UTF8.GetByteCount (" + string_name + ")");
+ continue;
+ }
+
+ p.CallName = p.Name;
+ string call_parm = p.CallString;
+
+ if (p.IsUserData && parms.IsHidden (p) && !parms.HideData && (i == 1 || parms [i - 1].Scope != "notified")) {
+ call_parm = "IntPtr.Zero";
+ }
+
+ result += ", " + call_parm;
+ }
+ return result;
+ }
+ }
+
+ private string GlueSignature {
+ get {
+ string result = String.Empty;
+ for (int i = 0; i < parms.Count; i++)
+ result += parms[i].CType.Replace ("const-", "const ") + " " + parms[i].Name + (i == parms.Count-1 ? "" : ", ");
+ return result;
+ }
+ }
+
+ private string DefaultGlueValue {
+ get {
+ string val = retval.DefaultValue;
+ switch (val) {
+ case "null":
+ return "NULL";
+ case "false":
+ return "FALSE";
+ case "true":
+ return "TRUE";
+ default:
+ return val;
+ }
+ }
+ }
+
+ private void GenGlueVirtualMethod (GenerationInfo gen_info)
+ {
+ StreamWriter glue = gen_info.GlueWriter;
+ string glue_name = String.Format ("{0}sharp_{1}_base_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
+ glue.WriteLine ("{0} {1} ({2});\n", retval.CType, glue_name, GlueSignature);
+ glue.WriteLine ("{0}\n{1} ({2})", retval.CType, glue_name, GlueSignature);
+ glue.WriteLine ("{");
+ glue.WriteLine ("\t{0}Class *klass = ({0}Class *) get_threshold_class (G_OBJECT ({1}));", container_type.CName, parms[0].Name);
+ glue.Write ("\tif (klass->{0})\n\t\t", ClassFieldName);
+ if (!IsVoid)
+ glue.Write ("return ");
+ glue.Write ("(* klass->{0}) (", ClassFieldName);
+ for (int i = 0; i < parms.Count; i++)
+ glue.Write (parms[i].Name + (i == parms.Count - 1 ? "" : ", "));
+ glue.WriteLine (");");
+ if (!IsVoid)
+ glue.WriteLine ("\treturn " + DefaultGlueValue + ";");
+ glue.WriteLine ("}");
+
+ StreamWriter sw = gen_info.Writer;
+ sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
+ sw.WriteLine ("\t\tstatic extern {0} {1} ({2});\n", retval.MarshalType, glue_name, parms.ImportSignature);
+ GenVMDeclaration (sw, null);
+ sw.WriteLine ("\t\t{");
+ MethodBody body = new MethodBody (parms);
+ body.Initialize (gen_info, false, false, String.Empty);
+ sw.WriteLine ("\t\t\t{0}{1} ({2});", IsVoid ? "" : retval.MarshalType + " __ret = ", glue_name, GlueCallString);
+ body.Finish (sw, "");
+ if (!IsVoid)
+ sw.WriteLine ("\t\t\treturn {0};", retval.FromNative ("__ret"));
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ private void GenChainVirtualMethod (StreamWriter sw, ClassBase implementor)
+ {
+ GenVMDeclaration (sw, implementor);
+ sw.WriteLine ("\t\t{");
+ if (IsVoid)
+ sw.WriteLine ("\t\t\tGLib.Value ret = GLib.Value.Empty;");
+ else
+ sw.WriteLine ("\t\t\tGLib.Value ret = new GLib.Value (" + ReturnGType + ");");
+
+ sw.WriteLine ("\t\t\tGLib.ValueArray inst_and_params = new GLib.ValueArray (" + parms.Count + ");");
+ sw.WriteLine ("\t\t\tGLib.Value[] vals = new GLib.Value [" + parms.Count + "];");
+ sw.WriteLine ("\t\t\tvals [0] = new GLib.Value (this);");
+ sw.WriteLine ("\t\t\tinst_and_params.Append (vals [0]);");
+ string cleanup = "";
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+ if (p.PassAs != "") {
+ if (SymbolTable.Table.IsBoxed (p.CType)) {
+ if (p.PassAs == "ref")
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
+ else
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value ((GLib.GType)typeof (" + p.CSType + "));");
+ cleanup += "\t\t\t" + p.Name + " = (" + p.CSType + ") vals [" + i + "];\n";
+ } else {
+ if (p.PassAs == "ref")
+ sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = GLib.Marshaller.StructureToPtrAlloc (" + p.Generatable.CallByName (p.Name) + ");");
+ else
+ sw.WriteLine ("\t\t\tIntPtr " + p.Name + "_ptr = Marshal.AllocHGlobal (Marshal.SizeOf (typeof (" + p.MarshalType + ")));");
+
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + "_ptr);");
+ cleanup += "\t\t\t" + p.Name + " = " + p.FromNative ("(" + p.MarshalType + ") Marshal.PtrToStructure (" + p.Name + "_ptr, typeof (" + p.MarshalType + "))") + ";\n";
+ cleanup += "\t\t\tMarshal.FreeHGlobal (" + p.Name + "_ptr);\n";
+ }
+ } else if (p.IsLength && parms [i - 1].IsString)
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (System.Text.Encoding.UTF8.GetByteCount (" + parms [i-1].Name + "));");
+ else
+ sw.WriteLine ("\t\t\tvals [" + i + "] = new GLib.Value (" + p.Name + ");");
+
+ sw.WriteLine ("\t\t\tinst_and_params.Append (vals [" + i + "]);");
+ }
+
+ sw.WriteLine ("\t\t\tg_signal_chain_from_overridden (inst_and_params.ArrayPtr, ref ret);");
+ if (cleanup != "")
+ sw.WriteLine (cleanup);
+ sw.WriteLine ("\t\t\tforeach (GLib.Value v in vals)");
+ sw.WriteLine ("\t\t\t\tv.Dispose ();");
+ if (!IsVoid) {
+ IGeneratable igen = SymbolTable.Table [retval.CType];
+ sw.WriteLine ("\t\t\t" + retval.CSType + " result = (" + (igen is EnumGen ? retval.CSType + ") (Enum" : retval.CSType) + ") ret;");
+ sw.WriteLine ("\t\t\tret.Dispose ();");
+ sw.WriteLine ("\t\t\treturn result;");
+ }
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ private void GenDefaultHandlerDelegate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ StreamWriter sw = gen_info.Writer;
+ StreamWriter glue;
+ bool use_glue = gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0;
+ string glue_name = String.Empty;
+ ManagedCallString call = new ManagedCallString (parms, true);
+ sw.WriteLine ("\t\t[GLib.CDeclCallback]");
+ sw.WriteLine ("\t\tdelegate " + retval.ToNativeType + " " + Name + "VMDelegate (" + parms.ImportSignature + ");\n");
+
+ if (use_glue) {
+ glue = gen_info.GlueWriter;
+ glue_name = String.Format ("{0}sharp_{1}_override_{2}", container_type.NS.ToLower ().Replace (".", "_"), container_type.Name.ToLower (), ClassFieldName);
+ sw.WriteLine ("\t\t[DllImport (\"{0}\")]", gen_info.GluelibName);
+ sw.WriteLine ("\t\tstatic extern void {0} (IntPtr gtype, {1}VMDelegate cb);\n", glue_name, Name);
+ glue.WriteLine ("void {0} (GType gtype, gpointer cb);\n", glue_name);
+ glue.WriteLine ("void\n{0} (GType gtype, gpointer cb)", glue_name);
+ glue.WriteLine ("{");
+ glue.WriteLine ("\tGObjectClass *klass = g_type_class_peek (gtype);");
+ glue.WriteLine ("\tif (klass == NULL)");
+ glue.WriteLine ("\t\tklass = g_type_class_ref (gtype);");
+ glue.WriteLine ("\t(({0} *)klass)->{1} = cb;", container_type.CName + "Class", ClassFieldName);
+ glue.WriteLine ("}\n");
+ }
+
+ sw.WriteLine ("\t\tstatic {0} {1};\n", Name + "VMDelegate", Name + "VMCallback");
+ sw.WriteLine ("\t\tstatic " + retval.ToNativeType + " " + Name.ToLower() + "_cb (" + parms.ImportSignature + ")");
+ sw.WriteLine ("\t\t{");
+ string unconditional = call.Unconditional ("\t\t\t");
+ if (unconditional.Length > 0)
+ sw.WriteLine (unconditional);
+ sw.WriteLine ("\t\t\ttry {");
+ sw.WriteLine ("\t\t\t\t{0} {1}_managed = GLib.Object.GetObject ({1}, false) as {0};", implementor != null ? implementor.Name : container_type.Name, parms[0].Name);
+ sw.Write (call.Setup ("\t\t\t\t"));
+ sw.Write ("\t\t\t\t{0}", IsVoid ? "" : retval.CSType == retval.ToNativeType ? "return " : retval.CSType + " raw_ret = ");
+ sw.WriteLine ("{2}_managed.{0} ({1});", "On" + Name, call.ToString (), parms[0].Name);
+ sw.Write (call.Finish ("\t\t\t\t"));
+ if (!IsVoid && retval.CSType != retval.ToNativeType)
+ sw.WriteLine ("\t\t\t\treturn {0};", SymbolTable.Table.ToNativeReturn (retval.CType, "raw_ret"));
+ sw.WriteLine ("\t\t\t} catch (Exception e) {");
+ bool fatal = HasOutParams || !IsVoid;
+ sw.WriteLine ("\t\t\t\tGLib.ExceptionManager.RaiseUnhandledException (e, " + (fatal ? "true" : "false") + ");");
+ if (fatal) {
+ sw.WriteLine ("\t\t\t\t// NOTREACHED: above call doesn't return");
+ sw.WriteLine ("\t\t\t\tthrow e;");
+ }
+ sw.WriteLine ("\t\t\t}");
+ sw.WriteLine ("\t\t}\n");
+ sw.WriteLine ("\t\tprivate static void Override" + Name + " (GLib.GType gtype)");
+ sw.WriteLine ("\t\t{");
+ sw.WriteLine ("\t\t\tif (" + Name + "VMCallback == null)");
+ sw.WriteLine ("\t\t\t\t" + Name + "VMCallback = new " + Name + "VMDelegate (" + Name.ToLower() + "_cb);");
+ if (use_glue)
+ sw.WriteLine ("\t\t\t{0} (gtype.Val, {1}VMCallback);", glue_name, Name);
+ else
+ sw.WriteLine ("\t\t\tOverrideVirtualMethod (gtype, " + CName + ", " + Name + "VMCallback);");
+ sw.WriteLine ("\t\t}\n");
+ }
+
+ public void GenEvent (StreamWriter sw, ClassBase implementor, string target)
+ {
+ string args_type = IsEventHandler ? "" : ", typeof (" + EventArgsQualifiedName + ")";
+
+ if (Marshaled) {
+ GenCallback (sw);
+ args_type = ", new " + DelegateName + "(" + CallbackName + ")";
+ }
+
+ sw.WriteLine("\t\t[GLib.Signal("+ CName + ")]");
+ sw.Write("\t\tpublic ");
+ if (NeedNew (implementor))
+ sw.Write("new ");
+ sw.WriteLine("event " + EventHandlerQualifiedName + " " + Name + " {");
+ sw.WriteLine("\t\t\tadd {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
+ sw.WriteLine("\t\t\t\tsig.AddDelegate (value);");
+ sw.WriteLine("\t\t\t}");
+ sw.WriteLine("\t\t\tremove {");
+ sw.WriteLine("\t\t\t\tGLib.Signal sig = GLib.Signal.Lookup (" + target + ", " + CName + args_type + ");");
+ sw.WriteLine("\t\t\t\tsig.RemoveDelegate (value);");
+ sw.WriteLine("\t\t\t}");
+ sw.WriteLine("\t\t}");
+ sw.WriteLine();
+ }
+
+ public void Generate (GenerationInfo gen_info, ClassBase implementor)
+ {
+ StreamWriter sw = gen_info.Writer;
+
+ if (implementor == null)
+ GenEventHandler (gen_info);
+
+ GenDefaultHandlerDelegate (gen_info, implementor);
+ if (gen_info.GlueEnabled && implementor == null && ClassFieldName.Length > 0)
+ GenGlueVirtualMethod (gen_info);
+ else
+ GenChainVirtualMethod (sw, implementor);
+ GenEvent (sw, implementor, "this");
+
+ Statistics.SignalCount++;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/Signature.cs b/lib/unique-sharp/generator/Signature.cs
index 1b01234..ff9f4bd 100644
--- a/lib/unique-sharp/generator/Signature.cs
+++ b/lib/unique-sharp/generator/Signature.cs
@@ -1,123 +1,123 @@
-// GtkSharp.Generation.Signature.cs - The Signature Generation Class.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.Xml;
-
- public class Signature {
-
- private ArrayList parms = new ArrayList ();
-
- public Signature (Parameters parms)
- {
- foreach (Parameter p in parms) {
- if (!parms.IsHidden (p))
- this.parms.Add (p);
- }
- }
-
- public override string ToString ()
- {
- if (parms.Count == 0)
- return "";
-
- string[] result = new string [parms.Count];
- int i = 0;
-
- foreach (Parameter p in parms) {
- result [i] = p.PassAs != "" ? p.PassAs + " " : "";
- result [i++] += p.CSType + " " + p.Name;
- }
-
- return String.Join (", ", result);
- }
-
- public string Types {
- get {
- if (parms.Count == 0)
- return "";
-
- string[] result = new string [parms.Count];
- int i = 0;
-
- foreach (Parameter p in parms)
- result [i++] = p.CSType;
-
- return String.Join (":", result);
- }
- }
-
- public bool IsAccessor {
- get {
- int count = 0;
- foreach (Parameter p in parms) {
- if (p.PassAs == "out")
- count++;
-
- if (count > 1)
- return false;
- }
- return count == 1;
- }
- }
-
- public string AccessorType {
- get {
- foreach (Parameter p in parms)
- if (p.PassAs == "out")
- return p.CSType;
-
- return null;
- }
- }
-
- public string AccessorName {
- get {
- foreach (Parameter p in parms)
- if (p.PassAs == "out")
- return p.Name;
-
- return null;
- }
- }
-
- public string AsAccessor {
- get {
- string[] result = new string [parms.Count - 1];
- int i = 0;
-
- foreach (Parameter p in parms) {
- if (p.PassAs == "out")
- continue;
-
- result [i] = p.PassAs != "" ? p.PassAs + " " : "";
- result [i++] += p.CSType + " " + p.Name;
- }
-
- return String.Join (", ", result);
- }
- }
- }
-}
-
+// GtkSharp.Generation.Signature.cs - The Signature Generation Class.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.Xml;
+
+ public class Signature {
+
+ private ArrayList parms = new ArrayList ();
+
+ public Signature (Parameters parms)
+ {
+ foreach (Parameter p in parms) {
+ if (!parms.IsHidden (p))
+ this.parms.Add (p);
+ }
+ }
+
+ public override string ToString ()
+ {
+ if (parms.Count == 0)
+ return "";
+
+ string[] result = new string [parms.Count];
+ int i = 0;
+
+ foreach (Parameter p in parms) {
+ result [i] = p.PassAs != "" ? p.PassAs + " " : "";
+ result [i++] += p.CSType + " " + p.Name;
+ }
+
+ return String.Join (", ", result);
+ }
+
+ public string Types {
+ get {
+ if (parms.Count == 0)
+ return "";
+
+ string[] result = new string [parms.Count];
+ int i = 0;
+
+ foreach (Parameter p in parms)
+ result [i++] = p.CSType;
+
+ return String.Join (":", result);
+ }
+ }
+
+ public bool IsAccessor {
+ get {
+ int count = 0;
+ foreach (Parameter p in parms) {
+ if (p.PassAs == "out")
+ count++;
+
+ if (count > 1)
+ return false;
+ }
+ return count == 1;
+ }
+ }
+
+ public string AccessorType {
+ get {
+ foreach (Parameter p in parms)
+ if (p.PassAs == "out")
+ return p.CSType;
+
+ return null;
+ }
+ }
+
+ public string AccessorName {
+ get {
+ foreach (Parameter p in parms)
+ if (p.PassAs == "out")
+ return p.Name;
+
+ return null;
+ }
+ }
+
+ public string AsAccessor {
+ get {
+ string[] result = new string [parms.Count - 1];
+ int i = 0;
+
+ foreach (Parameter p in parms) {
+ if (p.PassAs == "out")
+ continue;
+
+ result [i] = p.PassAs != "" ? p.PassAs + " " : "";
+ result [i++] += p.CSType + " " + p.Name;
+ }
+
+ return String.Join (", ", result);
+ }
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/SimpleBase.cs b/lib/unique-sharp/generator/SimpleBase.cs
index 38bfbe3..2637b2b 100644
--- a/lib/unique-sharp/generator/SimpleBase.cs
+++ b/lib/unique-sharp/generator/SimpleBase.cs
@@ -1,121 +1,121 @@
-// GtkSharp.Generation.SimpleBase.cs - base class for marshaling non-generated types.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public abstract class SimpleBase : IGeneratable {
-
- string type;
- string ctype;
- string ns = String.Empty;
- string default_value = String.Empty;
-
- public SimpleBase (string ctype, string type, string default_value)
- {
- string[] toks = type.Split('.');
- this.ctype = ctype;
- this.type = toks[toks.Length - 1];
- if (toks.Length > 2)
- this.ns = String.Join (".", toks, 0, toks.Length - 1);
- else if (toks.Length == 2)
- this.ns = toks[0];
- this.default_value = default_value;
- }
-
- public string CName {
- get {
- return ctype;
- }
- }
-
- public string Name {
- get {
- return type;
- }
- }
-
- public string QualifiedName {
- get {
- return ns == String.Empty ? type : ns + "." + type;
- }
- }
-
- public virtual string MarshalType {
- get {
- return QualifiedName;
- }
- }
-
- public virtual string MarshalReturnType {
- get {
- return MarshalType;
- }
- }
-
- public virtual string DefaultValue {
- get {
- return default_value;
- }
- }
-
- public virtual string ToNativeReturnType {
- get {
- return MarshalType;
- }
- }
-
- public virtual string CallByName (string var)
- {
- return var;
- }
-
- public virtual string FromNative(string var)
- {
- return var;
- }
-
- public virtual string FromNativeReturn(string var)
- {
- return FromNative (var);
- }
-
- public virtual string ToNativeReturn(string var)
- {
- return CallByName (var);
- }
-
- public bool Validate ()
- {
- return true;
- }
-
- public void Generate ()
- {
- }
-
- public void Generate (GenerationInfo gen_info)
- {
- }
- }
-}
-
+// GtkSharp.Generation.SimpleBase.cs - base class for marshaling non-generated types.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public abstract class SimpleBase : IGeneratable {
+
+ string type;
+ string ctype;
+ string ns = String.Empty;
+ string default_value = String.Empty;
+
+ public SimpleBase (string ctype, string type, string default_value)
+ {
+ string[] toks = type.Split('.');
+ this.ctype = ctype;
+ this.type = toks[toks.Length - 1];
+ if (toks.Length > 2)
+ this.ns = String.Join (".", toks, 0, toks.Length - 1);
+ else if (toks.Length == 2)
+ this.ns = toks[0];
+ this.default_value = default_value;
+ }
+
+ public string CName {
+ get {
+ return ctype;
+ }
+ }
+
+ public string Name {
+ get {
+ return type;
+ }
+ }
+
+ public string QualifiedName {
+ get {
+ return ns == String.Empty ? type : ns + "." + type;
+ }
+ }
+
+ public virtual string MarshalType {
+ get {
+ return QualifiedName;
+ }
+ }
+
+ public virtual string MarshalReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ public virtual string DefaultValue {
+ get {
+ return default_value;
+ }
+ }
+
+ public virtual string ToNativeReturnType {
+ get {
+ return MarshalType;
+ }
+ }
+
+ public virtual string CallByName (string var)
+ {
+ return var;
+ }
+
+ public virtual string FromNative(string var)
+ {
+ return var;
+ }
+
+ public virtual string FromNativeReturn(string var)
+ {
+ return FromNative (var);
+ }
+
+ public virtual string ToNativeReturn(string var)
+ {
+ return CallByName (var);
+ }
+
+ public bool Validate ()
+ {
+ return true;
+ }
+
+ public void Generate ()
+ {
+ }
+
+ public void Generate (GenerationInfo gen_info)
+ {
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/SimpleGen.cs b/lib/unique-sharp/generator/SimpleGen.cs
index b382135..14554ab 100644
--- a/lib/unique-sharp/generator/SimpleGen.cs
+++ b/lib/unique-sharp/generator/SimpleGen.cs
@@ -1,31 +1,31 @@
-// GtkSharp.Generation.SimpleGen.cs - The Simple type Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2003 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
-
- public class SimpleGen : SimpleBase {
- public SimpleGen (string ctype, string type, string default_value) : base (ctype, type, default_value) {}
-
- }
-}
-
+// GtkSharp.Generation.SimpleGen.cs - The Simple type Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2003 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+
+ public class SimpleGen : SimpleBase {
+ public SimpleGen (string ctype, string type, string default_value) : base (ctype, type, default_value) {}
+
+ }
+}
+
diff --git a/lib/unique-sharp/generator/Statistics.cs b/lib/unique-sharp/generator/Statistics.cs
index 4545765..f634185 100644
--- a/lib/unique-sharp/generator/Statistics.cs
+++ b/lib/unique-sharp/generator/Statistics.cs
@@ -1,197 +1,197 @@
-// Statistics.cs : Generation statistics class implementation
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2002 Mike Kestner
-// Copyright (c) 2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
-
- public class Statistics {
-
- static int cbs = 0;
- static int enums = 0;
- static int objects = 0;
- static int structs = 0;
- static int boxed = 0;
- static int opaques = 0;
- static int interfaces = 0;
- static int methods = 0;
- static int ctors = 0;
- static int props = 0;
- static int sigs = 0;
- static int throttled = 0;
- static int ignored = 0;
- static bool vm_ignored = false;
-
- public static int CBCount {
- get {
- return cbs;
- }
- set {
- cbs = value;
- }
- }
-
- public static int EnumCount {
- get {
- return enums;
- }
- set {
- enums = value;
- }
- }
-
- public static int ObjectCount {
- get {
- return objects;
- }
- set {
- objects = value;
- }
- }
-
- public static int StructCount {
- get {
- return structs;
- }
- set {
- structs = value;
- }
- }
-
- public static int BoxedCount {
- get {
- return boxed;
- }
- set {
- boxed = value;
- }
- }
-
- public static int OpaqueCount {
- get {
- return opaques;
- }
- set {
- opaques = value;
- }
- }
-
- public static int CtorCount {
- get {
- return ctors;
- }
- set {
- ctors = value;
- }
- }
-
- public static int MethodCount {
- get {
- return methods;
- }
- set {
- methods = value;
- }
- }
-
- public static int PropCount {
- get {
- return props;
- }
- set {
- props = value;
- }
- }
-
- public static int SignalCount {
- get {
- return sigs;
- }
- set {
- sigs = value;
- }
- }
-
- public static int IFaceCount {
- get {
- return interfaces;
- }
- set {
- interfaces = value;
- }
- }
-
- public static int ThrottledCount {
- get {
- return throttled;
- }
- set {
- throttled = value;
- }
- }
-
- public static int IgnoreCount {
- get {
- return ignored;
- }
- set {
- ignored = value;
- }
- }
-
- public static bool VMIgnored {
- get {
- return vm_ignored;
- }
- set {
- if (value)
- vm_ignored = value;
- }
- }
-
- public static void Report()
- {
- if (VMIgnored) {
- Console.WriteLine();
- Console.WriteLine("Warning: Generation throttled for Virtual Methods.");
- Console.WriteLine(" Consider regenerating with --gluelib-name and --glue-filename.");
- }
- Console.WriteLine();
- Console.WriteLine("Generation Summary:");
- Console.Write(" Enums: " + enums);
- Console.Write(" Structs: " + structs);
- Console.Write(" Boxed: " + boxed);
- Console.Write(" Opaques: " + opaques);
- Console.Write(" Interfaces: " + interfaces);
- Console.Write(" Objects: " + objects);
- Console.WriteLine(" Callbacks: " + cbs);
- Console.Write(" Properties: " + props);
- Console.Write(" Signals: " + sigs);
- Console.Write(" Methods: " + methods);
- Console.Write(" Constructors: " + ctors);
- Console.WriteLine(" Throttled: " + throttled);
- Console.WriteLine("Total Nodes: " + (enums+structs+boxed+opaques+interfaces+cbs+objects+props+sigs+methods+ctors+throttled));
- Console.WriteLine();
- }
- }
-}
+// Statistics.cs : Generation statistics class implementation
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2002 Mike Kestner
+// Copyright (c) 2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+
+ public class Statistics {
+
+ static int cbs = 0;
+ static int enums = 0;
+ static int objects = 0;
+ static int structs = 0;
+ static int boxed = 0;
+ static int opaques = 0;
+ static int interfaces = 0;
+ static int methods = 0;
+ static int ctors = 0;
+ static int props = 0;
+ static int sigs = 0;
+ static int throttled = 0;
+ static int ignored = 0;
+ static bool vm_ignored = false;
+
+ public static int CBCount {
+ get {
+ return cbs;
+ }
+ set {
+ cbs = value;
+ }
+ }
+
+ public static int EnumCount {
+ get {
+ return enums;
+ }
+ set {
+ enums = value;
+ }
+ }
+
+ public static int ObjectCount {
+ get {
+ return objects;
+ }
+ set {
+ objects = value;
+ }
+ }
+
+ public static int StructCount {
+ get {
+ return structs;
+ }
+ set {
+ structs = value;
+ }
+ }
+
+ public static int BoxedCount {
+ get {
+ return boxed;
+ }
+ set {
+ boxed = value;
+ }
+ }
+
+ public static int OpaqueCount {
+ get {
+ return opaques;
+ }
+ set {
+ opaques = value;
+ }
+ }
+
+ public static int CtorCount {
+ get {
+ return ctors;
+ }
+ set {
+ ctors = value;
+ }
+ }
+
+ public static int MethodCount {
+ get {
+ return methods;
+ }
+ set {
+ methods = value;
+ }
+ }
+
+ public static int PropCount {
+ get {
+ return props;
+ }
+ set {
+ props = value;
+ }
+ }
+
+ public static int SignalCount {
+ get {
+ return sigs;
+ }
+ set {
+ sigs = value;
+ }
+ }
+
+ public static int IFaceCount {
+ get {
+ return interfaces;
+ }
+ set {
+ interfaces = value;
+ }
+ }
+
+ public static int ThrottledCount {
+ get {
+ return throttled;
+ }
+ set {
+ throttled = value;
+ }
+ }
+
+ public static int IgnoreCount {
+ get {
+ return ignored;
+ }
+ set {
+ ignored = value;
+ }
+ }
+
+ public static bool VMIgnored {
+ get {
+ return vm_ignored;
+ }
+ set {
+ if (value)
+ vm_ignored = value;
+ }
+ }
+
+ public static void Report()
+ {
+ if (VMIgnored) {
+ Console.WriteLine();
+ Console.WriteLine("Warning: Generation throttled for Virtual Methods.");
+ Console.WriteLine(" Consider regenerating with --gluelib-name and --glue-filename.");
+ }
+ Console.WriteLine();
+ Console.WriteLine("Generation Summary:");
+ Console.Write(" Enums: " + enums);
+ Console.Write(" Structs: " + structs);
+ Console.Write(" Boxed: " + boxed);
+ Console.Write(" Opaques: " + opaques);
+ Console.Write(" Interfaces: " + interfaces);
+ Console.Write(" Objects: " + objects);
+ Console.WriteLine(" Callbacks: " + cbs);
+ Console.Write(" Properties: " + props);
+ Console.Write(" Signals: " + sigs);
+ Console.Write(" Methods: " + methods);
+ Console.Write(" Constructors: " + ctors);
+ Console.WriteLine(" Throttled: " + throttled);
+ Console.WriteLine("Total Nodes: " + (enums+structs+boxed+opaques+interfaces+cbs+objects+props+sigs+methods+ctors+throttled));
+ Console.WriteLine();
+ }
+ }
+}
diff --git a/lib/unique-sharp/generator/StructGen.cs b/lib/unique-sharp/generator/StructGen.cs
index 4d615ad..f759703 100644
--- a/lib/unique-sharp/generator/StructGen.cs
+++ b/lib/unique-sharp/generator/StructGen.cs
@@ -1,53 +1,53 @@
-// GtkSharp.Generation.StructGen.cs - The Structure Generatable.
-//
-// Author: Mike Kestner <mkestner speakeasy net>
-//
-// Copyright (c) 2001 Mike Kestner
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.IO;
- using System.Xml;
-
- public class StructGen : StructBase {
-
- public StructGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
-
- public override void Generate (GenerationInfo gen_info)
- {
- gen_info.CurrentType = Name;
-
- StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
- base.Generate (gen_info);
- if (GetMethod ("GetType") == null && GetMethod ("GetGType") == null) {
- sw.WriteLine ("\t\tprivate static GLib.GType GType {");
- sw.WriteLine ("\t\t\tget { return GLib.GType.Pointer; }");
- sw.WriteLine ("\t\t}");
- }
- sw.WriteLine ("#endregion");
- AppendCustom (sw, gen_info.CustomDir);
- sw.WriteLine ("\t}");
- sw.WriteLine ("}");
- sw.Close ();
- gen_info.Writer = null;
- Statistics.StructCount++;
- }
- }
-}
-
+// GtkSharp.Generation.StructGen.cs - The Structure Generatable.
+//
+// Author: Mike Kestner <mkestner speakeasy net>
+//
+// Copyright (c) 2001 Mike Kestner
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.IO;
+ using System.Xml;
+
+ public class StructGen : StructBase {
+
+ public StructGen (XmlElement ns, XmlElement elem) : base (ns, elem) {}
+
+ public override void Generate (GenerationInfo gen_info)
+ {
+ gen_info.CurrentType = Name;
+
+ StreamWriter sw = gen_info.Writer = gen_info.OpenStream (Name);
+ base.Generate (gen_info);
+ if (GetMethod ("GetType") == null && GetMethod ("GetGType") == null) {
+ sw.WriteLine ("\t\tprivate static GLib.GType GType {");
+ sw.WriteLine ("\t\t\tget { return GLib.GType.Pointer; }");
+ sw.WriteLine ("\t\t}");
+ }
+ sw.WriteLine ("#endregion");
+ AppendCustom (sw, gen_info.CustomDir);
+ sw.WriteLine ("\t}");
+ sw.WriteLine ("}");
+ sw.Close ();
+ gen_info.Writer = null;
+ Statistics.StructCount++;
+ }
+ }
+}
+
diff --git a/lib/unique-sharp/generator/SymbolTable.cs b/lib/unique-sharp/generator/SymbolTable.cs
index e10b51f..2d139fe 100644
--- a/lib/unique-sharp/generator/SymbolTable.cs
+++ b/lib/unique-sharp/generator/SymbolTable.cs
@@ -1,412 +1,412 @@
-// GtkSharp.Generation.SymbolTable.cs - The Symbol Table Class.
-//
-// Author: Mike Kestner <mkestner novell com>
-//
-// Copyright (c) 2001-2003 Mike Kestner
-// Copyright (c) 2004-2005 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
-
- public class SymbolTable {
-
- static SymbolTable table = null;
-
- Hashtable types = new Hashtable ();
-
- public static SymbolTable Table {
- get {
- if (table == null)
- table = new SymbolTable ();
-
- return table;
- }
- }
-
- public SymbolTable ()
- {
- // Simple easily mapped types
- AddType (new SimpleGen ("void", "void", String.Empty));
- AddType (new SimpleGen ("gpointer", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("gboolean", "bool", "false"));
- AddType (new SimpleGen ("gint", "int", "0"));
- AddType (new SimpleGen ("guint", "uint", "0"));
- AddType (new SimpleGen ("int", "int", "0"));
- AddType (new SimpleGen ("unsigned", "uint", "0"));
- AddType (new SimpleGen ("unsigned int", "uint", "0"));
- AddType (new SimpleGen ("unsigned-int", "uint", "0"));
- AddType (new SimpleGen ("gshort", "short", "0"));
- AddType (new SimpleGen ("gushort", "ushort", "0"));
- AddType (new SimpleGen ("short", "short", "0"));
- AddType (new SimpleGen ("guchar", "byte", "0"));
- AddType (new SimpleGen ("unsigned char", "byte", "0"));
- AddType (new SimpleGen ("unsigned-char", "byte", "0"));
- AddType (new SimpleGen ("guint1", "bool", "false"));
- AddType (new SimpleGen ("uint1", "bool", "false"));
- AddType (new SimpleGen ("gint8", "sbyte", "0"));
- AddType (new SimpleGen ("guint8", "byte", "0"));
- AddType (new SimpleGen ("gint16", "short", "0"));
- AddType (new SimpleGen ("guint16", "ushort", "0"));
- AddType (new SimpleGen ("gint32", "int", "0"));
- AddType (new SimpleGen ("guint32", "uint", "0"));
- AddType (new SimpleGen ("gint64", "long", "0"));
- AddType (new SimpleGen ("guint64", "ulong", "0"));
- AddType (new SimpleGen ("long long", "long", "0"));
- AddType (new SimpleGen ("gfloat", "float", "0.0"));
- AddType (new SimpleGen ("float", "float", "0.0"));
- AddType (new SimpleGen ("gdouble", "double", "0.0"));
- AddType (new SimpleGen ("double", "double", "0.0"));
- AddType (new SimpleGen ("goffset", "long", "0"));
- AddType (new SimpleGen ("GQuark", "int", "0"));
-
- // platform specific integer types.
-#if WIN64LONGS
- AddType (new SimpleGen ("long", "int", "0"));
- AddType (new SimpleGen ("glong", "int", "0"));
- AddType (new SimpleGen ("ulong", "uint", "0"));
- AddType (new SimpleGen ("gulong", "uint", "0"));
- AddType (new SimpleGen ("unsigned long", "uint", "0"));
-#else
- AddType (new LPGen ("long"));
- AddType (new LPGen ("glong"));
- AddType (new LPUGen ("ulong"));
- AddType (new LPUGen ("gulong"));
- AddType (new LPUGen ("unsigned long"));
-#endif
-
- AddType (new LPGen ("ssize_t"));
- AddType (new LPGen ("gssize"));
- AddType (new LPUGen ("size_t"));
- AddType (new LPUGen ("gsize"));
-
-#if OFF_T_8
- AddType (new AliasGen ("off_t", "long"));
-#else
- AddType (new LPGen ("off_t"));
-#endif
-
- // string types
- AddType (new ConstStringGen ("const-gchar"));
- AddType (new ConstStringGen ("const-xmlChar"));
- AddType (new ConstStringGen ("const-char"));
- AddType (new ConstFilenameGen ("const-gfilename"));
- AddType (new MarshalGen ("gfilename", "string", "IntPtr", "GLib.Marshaller.StringToFilenamePtr({0})", "GLib.Marshaller.FilenamePtrToStringGFree({0})"));
- AddType (new MarshalGen ("gchar", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
- AddType (new MarshalGen ("char", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
- AddType (new SimpleGen ("GStrv", "string[]", "null"));
-
- // manually wrapped types requiring more complex marshaling
- AddType (new ManualGen ("GInitiallyUnowned", "GLib.InitiallyUnowned", "GLib.Object.GetObject ({0})"));
- AddType (new ManualGen ("GObject", "GLib.Object", "GLib.Object.GetObject ({0})"));
- AddType (new ManualGen ("GList", "GLib.List"));
- AddType (new ManualGen ("GPtrArray", "GLib.PtrArray"));
- AddType (new ManualGen ("GSList", "GLib.SList"));
- AddType (new MarshalGen ("gunichar", "char", "uint", "GLib.Marshaller.CharToGUnichar ({0})", "GLib.Marshaller.GUnicharToChar ({0})"));
- AddType (new MarshalGen ("time_t", "System.DateTime", "IntPtr", "GLib.Marshaller.DateTimeTotime_t ({0})", "GLib.Marshaller.time_tToDateTime ({0})"));
- AddType (new MarshalGen ("GString", "string", "IntPtr", "new GLib.GString ({0}).Handle", "GLib.GString.PtrToString ({0})"));
- AddType (new MarshalGen ("GType", "GLib.GType", "IntPtr", "{0}.Val", "new GLib.GType({0})"));
- AddType (new ByRefGen ("GValue", "GLib.Value"));
- AddType (new SimpleGen ("GDestroyNotify", "GLib.DestroyNotify", "null"));
-
- // FIXME: These ought to be handled properly.
- AddType (new SimpleGen ("GC", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GError", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GMemChunk", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GTimeVal", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GClosure", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GArray", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GByteArray", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GData", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GIOChannel", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GTypeModule", "GLib.Object", "null"));
- AddType (new SimpleGen ("GHashTable", "System.IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("va_list", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("GParamSpec", "IntPtr", "IntPtr.Zero"));
- AddType (new SimpleGen ("gconstpointer", "IntPtr", "IntPtr.Zero"));
- }
-
- public void AddType (IGeneratable gen)
- {
- types [gen.CName] = gen;
- }
-
- public void AddTypes (IGeneratable[] gens)
- {
- foreach (IGeneratable gen in gens)
- types [gen.CName] = gen;
- }
-
- public int Count {
- get
- {
- return types.Count;
- }
- }
-
- public IEnumerable Generatables {
- get {
- return types.Values;
- }
- }
-
- public IGeneratable this [string ctype] {
- get {
- return DeAlias (ctype) as IGeneratable;
- }
- }
-
- private bool IsConstString (string type)
- {
- switch (type) {
- case "const-gchar":
- case "const-char":
- case "const-xmlChar":
- case "const-gfilename":
- return true;
- default:
- return false;
- }
- }
-
- private string Trim(string type)
- {
- // HACK: If we don't detect this here, there is no
- // way of indicating it in the symbol table
- if (type == "void*" || type == "const-void*") return "gpointer";
-
- string trim_type = type.TrimEnd('*');
-
- if (IsConstString (trim_type))
- return trim_type;
-
- if (trim_type.StartsWith("const-")) return trim_type.Substring(6);
- return trim_type;
- }
-
- private object DeAlias (string type)
- {
- type = Trim (type);
- while (types [type] is AliasGen) {
- IGeneratable igen = types [type] as AliasGen;
- types [type] = types [igen.Name];
- type = igen.Name;
- }
-
- return types [type];
- }
-
- public string FromNativeReturn(string c_type, string val)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.FromNativeReturn (val);
- }
-
- public string ToNativeReturn(string c_type, string val)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.ToNativeReturn (val);
- }
-
- public string FromNative(string c_type, string val)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.FromNative (val);
- }
-
- public string GetCSType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.QualifiedName;
- }
-
- public string GetName(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.Name;
- }
-
- public string GetMarshalReturnType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.MarshalReturnType;
- }
-
- public string GetToNativeReturnType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.ToNativeReturnType;
- }
-
- public string GetMarshalType(string c_type)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.MarshalType;
- }
-
- public string CallByName(string c_type, string var_name)
- {
- IGeneratable gen = this[c_type];
- if (gen == null)
- return "";
- return gen.CallByName(var_name);
- }
-
- public bool IsOpaque(string c_type)
- {
- if (this[c_type] is OpaqueGen)
- return true;
-
- return false;
- }
-
- public bool IsBoxed(string c_type)
- {
- if (this[c_type] is BoxedGen)
- return true;
-
- return false;
- }
-
- public bool IsStruct(string c_type)
- {
- if (this[c_type] is StructGen)
- return true;
-
- return false;
- }
-
- public bool IsEnum(string c_type)
- {
- if (this[c_type] is EnumGen)
- return true;
-
- return false;
- }
-
- public bool IsEnumFlags(string c_type)
- {
- EnumGen gen = this [c_type] as EnumGen;
- return (gen != null && gen.Elem.GetAttribute ("type") == "flags");
- }
-
- public bool IsInterface(string c_type)
- {
- if (this[c_type] is InterfaceGen)
- return true;
-
- return false;
- }
-
- public ClassBase GetClassGen(string c_type)
- {
- return this[c_type] as ClassBase;
- }
-
- public bool IsObject(string c_type)
- {
- if (this[c_type] is ObjectGen)
- return true;
-
- return false;
- }
-
- public bool IsCallback(string c_type)
- {
- if (this[c_type] is CallbackGen)
- return true;
-
- return false;
- }
-
- public bool IsManuallyWrapped(string c_type)
- {
- if (this[c_type] is ManualGen)
- return true;
-
- return false;
- }
-
- public string MangleName(string name)
- {
- switch (name) {
- case "string":
- return "str1ng";
- case "event":
- return "evnt";
- case "null":
- return "is_null";
- case "object":
- return "objekt";
- case "params":
- return "parms";
- case "ref":
- return "reference";
- case "in":
- return "in_param";
- case "out":
- return "out_param";
- case "fixed":
- return "mfixed";
- case "byte":
- return "_byte";
- case "new":
- return "_new";
- case "base":
- return "_base";
- case "lock":
- return "_lock";
- case "callback":
- return "cb";
- case "readonly":
- return "read_only";
- case "interface":
- return "iface";
- case "internal":
- return "_internal";
- case "where":
- return "wh3r3";
- case "foreach":
- return "for_each";
- case "remove":
- return "_remove";
- default:
- break;
- }
-
- return name;
- }
- }
-}
+// GtkSharp.Generation.SymbolTable.cs - The Symbol Table Class.
+//
+// Author: Mike Kestner <mkestner novell com>
+//
+// Copyright (c) 2001-2003 Mike Kestner
+// Copyright (c) 2004-2005 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+
+ public class SymbolTable {
+
+ static SymbolTable table = null;
+
+ Hashtable types = new Hashtable ();
+
+ public static SymbolTable Table {
+ get {
+ if (table == null)
+ table = new SymbolTable ();
+
+ return table;
+ }
+ }
+
+ public SymbolTable ()
+ {
+ // Simple easily mapped types
+ AddType (new SimpleGen ("void", "void", String.Empty));
+ AddType (new SimpleGen ("gpointer", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("gboolean", "bool", "false"));
+ AddType (new SimpleGen ("gint", "int", "0"));
+ AddType (new SimpleGen ("guint", "uint", "0"));
+ AddType (new SimpleGen ("int", "int", "0"));
+ AddType (new SimpleGen ("unsigned", "uint", "0"));
+ AddType (new SimpleGen ("unsigned int", "uint", "0"));
+ AddType (new SimpleGen ("unsigned-int", "uint", "0"));
+ AddType (new SimpleGen ("gshort", "short", "0"));
+ AddType (new SimpleGen ("gushort", "ushort", "0"));
+ AddType (new SimpleGen ("short", "short", "0"));
+ AddType (new SimpleGen ("guchar", "byte", "0"));
+ AddType (new SimpleGen ("unsigned char", "byte", "0"));
+ AddType (new SimpleGen ("unsigned-char", "byte", "0"));
+ AddType (new SimpleGen ("guint1", "bool", "false"));
+ AddType (new SimpleGen ("uint1", "bool", "false"));
+ AddType (new SimpleGen ("gint8", "sbyte", "0"));
+ AddType (new SimpleGen ("guint8", "byte", "0"));
+ AddType (new SimpleGen ("gint16", "short", "0"));
+ AddType (new SimpleGen ("guint16", "ushort", "0"));
+ AddType (new SimpleGen ("gint32", "int", "0"));
+ AddType (new SimpleGen ("guint32", "uint", "0"));
+ AddType (new SimpleGen ("gint64", "long", "0"));
+ AddType (new SimpleGen ("guint64", "ulong", "0"));
+ AddType (new SimpleGen ("long long", "long", "0"));
+ AddType (new SimpleGen ("gfloat", "float", "0.0"));
+ AddType (new SimpleGen ("float", "float", "0.0"));
+ AddType (new SimpleGen ("gdouble", "double", "0.0"));
+ AddType (new SimpleGen ("double", "double", "0.0"));
+ AddType (new SimpleGen ("goffset", "long", "0"));
+ AddType (new SimpleGen ("GQuark", "int", "0"));
+
+ // platform specific integer types.
+#if WIN64LONGS
+ AddType (new SimpleGen ("long", "int", "0"));
+ AddType (new SimpleGen ("glong", "int", "0"));
+ AddType (new SimpleGen ("ulong", "uint", "0"));
+ AddType (new SimpleGen ("gulong", "uint", "0"));
+ AddType (new SimpleGen ("unsigned long", "uint", "0"));
+#else
+ AddType (new LPGen ("long"));
+ AddType (new LPGen ("glong"));
+ AddType (new LPUGen ("ulong"));
+ AddType (new LPUGen ("gulong"));
+ AddType (new LPUGen ("unsigned long"));
+#endif
+
+ AddType (new LPGen ("ssize_t"));
+ AddType (new LPGen ("gssize"));
+ AddType (new LPUGen ("size_t"));
+ AddType (new LPUGen ("gsize"));
+
+#if OFF_T_8
+ AddType (new AliasGen ("off_t", "long"));
+#else
+ AddType (new LPGen ("off_t"));
+#endif
+
+ // string types
+ AddType (new ConstStringGen ("const-gchar"));
+ AddType (new ConstStringGen ("const-xmlChar"));
+ AddType (new ConstStringGen ("const-char"));
+ AddType (new ConstFilenameGen ("const-gfilename"));
+ AddType (new MarshalGen ("gfilename", "string", "IntPtr", "GLib.Marshaller.StringToFilenamePtr({0})", "GLib.Marshaller.FilenamePtrToStringGFree({0})"));
+ AddType (new MarshalGen ("gchar", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
+ AddType (new MarshalGen ("char", "string", "IntPtr", "GLib.Marshaller.StringToPtrGStrdup({0})", "GLib.Marshaller.PtrToStringGFree({0})"));
+ AddType (new SimpleGen ("GStrv", "string[]", "null"));
+
+ // manually wrapped types requiring more complex marshaling
+ AddType (new ManualGen ("GInitiallyUnowned", "GLib.InitiallyUnowned", "GLib.Object.GetObject ({0})"));
+ AddType (new ManualGen ("GObject", "GLib.Object", "GLib.Object.GetObject ({0})"));
+ AddType (new ManualGen ("GList", "GLib.List"));
+ AddType (new ManualGen ("GPtrArray", "GLib.PtrArray"));
+ AddType (new ManualGen ("GSList", "GLib.SList"));
+ AddType (new MarshalGen ("gunichar", "char", "uint", "GLib.Marshaller.CharToGUnichar ({0})", "GLib.Marshaller.GUnicharToChar ({0})"));
+ AddType (new MarshalGen ("time_t", "System.DateTime", "IntPtr", "GLib.Marshaller.DateTimeTotime_t ({0})", "GLib.Marshaller.time_tToDateTime ({0})"));
+ AddType (new MarshalGen ("GString", "string", "IntPtr", "new GLib.GString ({0}).Handle", "GLib.GString.PtrToString ({0})"));
+ AddType (new MarshalGen ("GType", "GLib.GType", "IntPtr", "{0}.Val", "new GLib.GType({0})"));
+ AddType (new ByRefGen ("GValue", "GLib.Value"));
+ AddType (new SimpleGen ("GDestroyNotify", "GLib.DestroyNotify", "null"));
+
+ // FIXME: These ought to be handled properly.
+ AddType (new SimpleGen ("GC", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GError", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GMemChunk", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GTimeVal", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GClosure", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GArray", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GByteArray", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GData", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GIOChannel", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GTypeModule", "GLib.Object", "null"));
+ AddType (new SimpleGen ("GHashTable", "System.IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("va_list", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("GParamSpec", "IntPtr", "IntPtr.Zero"));
+ AddType (new SimpleGen ("gconstpointer", "IntPtr", "IntPtr.Zero"));
+ }
+
+ public void AddType (IGeneratable gen)
+ {
+ types [gen.CName] = gen;
+ }
+
+ public void AddTypes (IGeneratable[] gens)
+ {
+ foreach (IGeneratable gen in gens)
+ types [gen.CName] = gen;
+ }
+
+ public int Count {
+ get
+ {
+ return types.Count;
+ }
+ }
+
+ public IEnumerable Generatables {
+ get {
+ return types.Values;
+ }
+ }
+
+ public IGeneratable this [string ctype] {
+ get {
+ return DeAlias (ctype) as IGeneratable;
+ }
+ }
+
+ private bool IsConstString (string type)
+ {
+ switch (type) {
+ case "const-gchar":
+ case "const-char":
+ case "const-xmlChar":
+ case "const-gfilename":
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ private string Trim(string type)
+ {
+ // HACK: If we don't detect this here, there is no
+ // way of indicating it in the symbol table
+ if (type == "void*" || type == "const-void*") return "gpointer";
+
+ string trim_type = type.TrimEnd('*');
+
+ if (IsConstString (trim_type))
+ return trim_type;
+
+ if (trim_type.StartsWith("const-")) return trim_type.Substring(6);
+ return trim_type;
+ }
+
+ private object DeAlias (string type)
+ {
+ type = Trim (type);
+ while (types [type] is AliasGen) {
+ IGeneratable igen = types [type] as AliasGen;
+ types [type] = types [igen.Name];
+ type = igen.Name;
+ }
+
+ return types [type];
+ }
+
+ public string FromNativeReturn(string c_type, string val)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.FromNativeReturn (val);
+ }
+
+ public string ToNativeReturn(string c_type, string val)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.ToNativeReturn (val);
+ }
+
+ public string FromNative(string c_type, string val)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.FromNative (val);
+ }
+
+ public string GetCSType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.QualifiedName;
+ }
+
+ public string GetName(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.Name;
+ }
+
+ public string GetMarshalReturnType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.MarshalReturnType;
+ }
+
+ public string GetToNativeReturnType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.ToNativeReturnType;
+ }
+
+ public string GetMarshalType(string c_type)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.MarshalType;
+ }
+
+ public string CallByName(string c_type, string var_name)
+ {
+ IGeneratable gen = this[c_type];
+ if (gen == null)
+ return "";
+ return gen.CallByName(var_name);
+ }
+
+ public bool IsOpaque(string c_type)
+ {
+ if (this[c_type] is OpaqueGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsBoxed(string c_type)
+ {
+ if (this[c_type] is BoxedGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsStruct(string c_type)
+ {
+ if (this[c_type] is StructGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsEnum(string c_type)
+ {
+ if (this[c_type] is EnumGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsEnumFlags(string c_type)
+ {
+ EnumGen gen = this [c_type] as EnumGen;
+ return (gen != null && gen.Elem.GetAttribute ("type") == "flags");
+ }
+
+ public bool IsInterface(string c_type)
+ {
+ if (this[c_type] is InterfaceGen)
+ return true;
+
+ return false;
+ }
+
+ public ClassBase GetClassGen(string c_type)
+ {
+ return this[c_type] as ClassBase;
+ }
+
+ public bool IsObject(string c_type)
+ {
+ if (this[c_type] is ObjectGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsCallback(string c_type)
+ {
+ if (this[c_type] is CallbackGen)
+ return true;
+
+ return false;
+ }
+
+ public bool IsManuallyWrapped(string c_type)
+ {
+ if (this[c_type] is ManualGen)
+ return true;
+
+ return false;
+ }
+
+ public string MangleName(string name)
+ {
+ switch (name) {
+ case "string":
+ return "str1ng";
+ case "event":
+ return "evnt";
+ case "null":
+ return "is_null";
+ case "object":
+ return "objekt";
+ case "params":
+ return "parms";
+ case "ref":
+ return "reference";
+ case "in":
+ return "in_param";
+ case "out":
+ return "out_param";
+ case "fixed":
+ return "mfixed";
+ case "byte":
+ return "_byte";
+ case "new":
+ return "_new";
+ case "base":
+ return "_base";
+ case "lock":
+ return "_lock";
+ case "callback":
+ return "cb";
+ case "readonly":
+ return "read_only";
+ case "interface":
+ return "iface";
+ case "internal":
+ return "_internal";
+ case "where":
+ return "wh3r3";
+ case "foreach":
+ return "for_each";
+ case "remove":
+ return "_remove";
+ default:
+ break;
+ }
+
+ return name;
+ }
+ }
+}
diff --git a/lib/unique-sharp/generator/VMSignature.cs b/lib/unique-sharp/generator/VMSignature.cs
index fe0ebf1..5937c0a 100644
--- a/lib/unique-sharp/generator/VMSignature.cs
+++ b/lib/unique-sharp/generator/VMSignature.cs
@@ -1,75 +1,75 @@
-// GtkSharp.Generation.VMSignature.cs - The Virtual Method Signature Generation Class.
-//
-// Author: Mike Kestner <mkestner ximian com>
-//
-// Copyright (c) 2003-2004 Novell, Inc.
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of version 2 of the GNU General Public
-// License as published by the Free Software Foundation.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-// General Public License for more details.
-//
-// You should have received a copy of the GNU General Public
-// License along with this program; if not, write to the
-// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-// Boston, MA 02111-1307, USA.
-
-
-namespace GtkSharp.Generation {
-
- using System;
- using System.Collections;
- using System.Xml;
-
- public class VMSignature {
-
- private ArrayList parms = new ArrayList ();
-
- public VMSignature (Parameters parms)
- {
- bool has_cb = parms.HideData;
- for (int i = 1; i < parms.Count; i++) {
- Parameter p = parms [i];
-
- if (i > 1 && p.IsLength && parms [i - 1].IsString)
- continue;
-
- if (p.IsCount && ((i > 1 && parms [i - 1].IsArray) || (i < parms.Count - 1 && parms [i + 1].IsArray)))
- continue;
-
- has_cb = has_cb || p.Generatable is CallbackGen;
- if (p.IsUserData && has_cb)
- continue;
-
- if (p.CType == "GError**")
- continue;
-
- if (p.Scope == "notified")
- i += 2;
-
- this.parms.Add (p);
- }
- }
-
- public override string ToString ()
- {
- if (parms.Count == 0)
- return "";
-
- string[] result = new string [parms.Count];
- int i = 0;
-
- foreach (Parameter p in parms) {
- result [i] = p.PassAs != "" ? p.PassAs + " " : "";
- result [i++] += p.CSType + " " + p.Name;
- }
-
- return String.Join (", ", result);
- }
- }
-}
-
+// GtkSharp.Generation.VMSignature.cs - The Virtual Method Signature Generation Class.
+//
+// Author: Mike Kestner <mkestner ximian com>
+//
+// Copyright (c) 2003-2004 Novell, Inc.
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of version 2 of the GNU General Public
+// License as published by the Free Software Foundation.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+// General Public License for more details.
+//
+// You should have received a copy of the GNU General Public
+// License along with this program; if not, write to the
+// Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+// Boston, MA 02111-1307, USA.
+
+
+namespace GtkSharp.Generation {
+
+ using System;
+ using System.Collections;
+ using System.Xml;
+
+ public class VMSignature {
+
+ private ArrayList parms = new ArrayList ();
+
+ public VMSignature (Parameters parms)
+ {
+ bool has_cb = parms.HideData;
+ for (int i = 1; i < parms.Count; i++) {
+ Parameter p = parms [i];
+
+ if (i > 1 && p.IsLength && parms [i - 1].IsString)
+ continue;
+
+ if (p.IsCount && ((i > 1 && parms [i - 1].IsArray) || (i < parms.Count - 1 && parms [i + 1].IsArray)))
+ continue;
+
+ has_cb = has_cb || p.Generatable is CallbackGen;
+ if (p.IsUserData && has_cb)
+ continue;
+
+ if (p.CType == "GError**")
+ continue;
+
+ if (p.Scope == "notified")
+ i += 2;
+
+ this.parms.Add (p);
+ }
+ }
+
+ public override string ToString ()
+ {
+ if (parms.Count == 0)
+ return "";
+
+ string[] result = new string [parms.Count];
+ int i = 0;
+
+ foreach (Parameter p in parms) {
+ result [i] = p.PassAs != "" ? p.PassAs + " " : "";
+ result [i++] += p.CSType + " " + p.Name;
+ }
+
+ return String.Join (", ", result);
+ }
+ }
+}
+
diff --git a/po/sl.po b/po/sl.po
index b098cce..88546fb 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -1,4711 +1,4711 @@
-# Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>, 2009"
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: f-spot\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&keywords=I18N+L10N&component=General\n";
-"POT-Creation-Date: 2011-11-25 17:02+0000\n"
-"PO-Revision-Date: \n"
-"Last-Translator: Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>\n"
-"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
-"X-Poedit-Country: SLOVENIA\n"
-"X-Poedit-Language: Slovenian\n"
-"X-Poedit-SourceCharset: utf-8\n"
-
-#. ../src/Clients/MainApp/FSpot.addin.xml
-#: ../data/addin-xml-strings.cs:8
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:1
-msgid "Copy Photo"
-msgstr "Kopiranj fotografijo"
-
-#: ../data/addin-xml-strings.cs:9
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:5
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:457
-#: ../src/Clients/MainApp/ui/main_window.ui.h:16
-msgid "Rotate _Left"
-msgstr "Zavrti _levo"
-
-#: ../data/addin-xml-strings.cs:10
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:6
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:458
-#: ../src/Clients/MainApp/ui/main_window.ui.h:17
-msgid "Rotate _Right"
-msgstr "Zavrti _desno"
-
-#: ../data/addin-xml-strings.cs:11
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:9
-#: ../src/Clients/MainApp/ui/main_window.ui.h:60
-msgid "_Remove From Catalog"
-msgstr "_Odstrani iz kataloga"
-
-#: ../data/addin-xml-strings.cs:12
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:8
-#: ../src/Clients/MainApp/ui/main_window.ui.h:41
-msgid "_Delete From Drive"
-msgstr "Iz_briÅi z diska"
-
-#. ../src/Extensions/Editors/FSpot.Editors.Blackout/Resources/BlackoutEditor.addin.xml
-#: ../data/addin-xml-strings.cs:15
-msgid "BlackoutEditor"
-msgstr "Urejevalnik poÄrnenja"
-
-#: ../data/addin-xml-strings.cs:16
-msgid "Blacks out an area of the image."
-msgstr "PoÄrni podroÄje slike."
-
-#: ../data/addin-xml-strings.cs:17
-#: ../data/addin-xml-strings.cs:22
-#: ../data/addin-xml-strings.cs:27
-#: ../data/addin-xml-strings.cs:32
-#: ../data/addin-xml-strings.cs:37
-msgid "Editors"
-msgstr "Urejevalniki"
-
-#. ../src/Extensions/Editors/FSpot.Editors.BW/Resources/BWEditor.addin.xml
-#: ../data/addin-xml-strings.cs:20
-msgid "BWEditor"
-msgstr "BWUrejevalnik"
-
-#: ../data/addin-xml-strings.cs:21
-msgid "Convert to B/W with control. Require Mono 2.2."
-msgstr "Pretvori v ÄB z nadzorom. Zahteva Mono 2.2."
-
-#. ../src/Extensions/Editors/FSpot.Editors.Flip/Resources/FlipEditor.addin.xml
-#: ../data/addin-xml-strings.cs:25
-msgid "FlipEditor"
-msgstr "Urejevalnik zrcaljenja"
-
-#: ../data/addin-xml-strings.cs:26
-msgid "Flips the image horizontally."
-msgstr "Zrcali sliko vodoravno."
-
-#. ../src/Extensions/Editors/FSpot.Editors.Pixelate/Resources/PixelateEditor.addin.xml
-#: ../data/addin-xml-strings.cs:30
-msgid "PixelateEditor"
-msgstr "Urejevalnik pretvorbe v toÄke"
-
-#: ../data/addin-xml-strings.cs:31
-msgid "Pixelates an area of the image."
-msgstr "PodroÄje slike pretvori v toÄke"
-
-#. ../src/Extensions/Editors/FSpot.Editors.Resize/Resources/ResizeEditor.addin.xml
-#: ../data/addin-xml-strings.cs:35
-msgid "ResizeEditor"
-msgstr "Urejevalnik spremembe velikosti"
-
-#: ../data/addin-xml-strings.cs:36
-msgid "Resize the image"
-msgstr "Spremeni velikost slike"
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml
-#: ../data/addin-xml-strings.cs:40
-msgid "CD Export"
-msgstr "Izvoz na CD"
-
-#: ../data/addin-xml-strings.cs:41
-msgid "This extension allows you to burn your photos to CD."
-msgstr "Ta razÅiritev vam omogoÄa zapisovanje vaÅih fotografij na CD."
-
-#: ../data/addin-xml-strings.cs:42
-#: ../data/addin-xml-strings.cs:48
-#: ../data/addin-xml-strings.cs:54
-#: ../data/addin-xml-strings.cs:62
-#: ../data/addin-xml-strings.cs:68
-#: ../data/addin-xml-strings.cs:74
-#: ../data/addin-xml-strings.cs:80
-#: ../data/addin-xml-strings.cs:86
-#: ../data/addin-xml-strings.cs:92
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:6
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:5
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:5
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:5
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:5
-msgid "Export"
-msgstr "Izvoz"
-
-#: ../data/addin-xml-strings.cs:43
-msgid "_CD..."
-msgstr "_CD ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml
-#: ../data/addin-xml-strings.cs:46
-msgid "FacebookExport"
-msgstr "Izvoz na Facebook"
-
-#: ../data/addin-xml-strings.cs:47
-msgid "Export pictures to facebook"
-msgstr "Izvoz fotografij na Facebook"
-
-#: ../data/addin-xml-strings.cs:49
-msgid "F_acebook..."
-msgstr "F_acebook ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml
-#: ../data/addin-xml-strings.cs:52
-msgid "Flickr Export"
-msgstr "Izvoz na Flickr"
-
-#: ../data/addin-xml-strings.cs:53
-msgid "This extension allows you to export your photos to Flickr and 23hq."
-msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij na Flickr in 23hq."
-
-#: ../data/addin-xml-strings.cs:55
-msgid "_Flickr..."
-msgstr "_Flickr ..."
-
-#: ../data/addin-xml-strings.cs:56
-msgid "_23hq..."
-msgstr "_23hq ..."
-
-#: ../data/addin-xml-strings.cs:57
-msgid "_Zooomr..."
-msgstr "_Zooomr ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml
-#: ../data/addin-xml-strings.cs:60
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:10
-msgid "Folder Export"
-msgstr "Izvoz mape"
-
-#: ../data/addin-xml-strings.cs:61
-msgid "This extension allows you to export your photos to HTML galleries, Original galleries or just to a folder."
-msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v galerije HTML, galerije Origional ali enostavno v mapo."
-
-#: ../data/addin-xml-strings.cs:63
-msgid "F_older..."
-msgstr "_Mapa ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml
-#: ../data/addin-xml-strings.cs:66
-msgid "Gallery Export"
-msgstr "Izvoz v Gallery"
-
-#: ../data/addin-xml-strings.cs:67
-msgid "This extension allows you to export your photos to PHP Gallery (http://gallery.menalto.com)."
-msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v PHP Gallery (http://gallery.menalto.com)."
-
-#: ../data/addin-xml-strings.cs:69
-msgid "Web _Gallery..."
-msgstr "Spletna _galerija ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml
-#: ../data/addin-xml-strings.cs:72
-msgid "PicasaWeb Export"
-msgstr "Izvoz na PicasaWeb"
-
-#: ../data/addin-xml-strings.cs:73
-msgid "This extension allows you to export your photos to PicasaWeb."
-msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v PicasaWeb."
-
-#: ../data/addin-xml-strings.cs:75
-msgid "_PicasaWeb..."
-msgstr "_PicasaWeb ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml
-#: ../data/addin-xml-strings.cs:78
-msgid "SmugMug Export"
-msgstr "Izvoz na SmugMug"
-
-#: ../data/addin-xml-strings.cs:79
-msgid "This extension allows you to export your photos to SmugMug."
-msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v SmugMug."
-
-#: ../data/addin-xml-strings.cs:81
-msgid "_SmugMug..."
-msgstr "_SmugMug ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml
-#: ../data/addin-xml-strings.cs:84
-msgid "Tabblo Export"
-msgstr "Izvoz v Tabblo"
-
-#: ../data/addin-xml-strings.cs:85
-msgid "This extension allows you to export your photos to Tabblo."
-msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v Tabblo."
-
-#: ../data/addin-xml-strings.cs:87
-msgid "_Tabblo..."
-msgstr "_Tabblo ..."
-
-#. ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml
-#: ../data/addin-xml-strings.cs:90
-msgid "Zip export"
-msgstr "Izvoz v Zip"
-
-#: ../data/addin-xml-strings.cs:91
-msgid "Simple export to Zip file"
-msgstr "Enostaven izvoz v datoteko Zip"
-
-#: ../data/addin-xml-strings.cs:93
-msgid "Compressed fil_e..."
-msgstr "Stisnjena datot_eka ..."
-
-#. ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.addin.xml
-#: ../data/addin-xml-strings.cs:96
-msgid "ChangePath"
-msgstr "Spremeni pot"
-
-#: ../data/addin-xml-strings.cs:97
-msgid "UNSTABLE - Please ensure you have a backup of your photos.db before you test this extension. This extension will allow you to change the base path to the your photos. It is very handy if you move your photos from ~/Photos to /OurPhotos for instance. Just ensure you let SqLite continue to process the changes for up to a few hours after f-spot reports finished. It will only change the path to photos which are located under the Photo directory."
-msgstr "NESTABILNO - pred preizkusom te razÅiritve se prepriÄajte, da imate varnostno kopijo photos.db. Ta razÅiritev vam bo dovolila spremembo osnovne poti do vaÅih fotografij. To je zelo priroÄno, Äe svoje fotografije premikate na primer iz ~/Fotografije v /NaÅeFotografije. PrepriÄajte se, da pustite Sqlite obdelovati spremembe Åe do pol ure potem, ko f-spot sporoÄi, da je konÄal. Spremenjena bo samo pot do fotografij, ki so v mapi Fotografije. "
-
-#: ../data/addin-xml-strings.cs:98
-#: ../data/addin-xml-strings.cs:104
-#: ../data/addin-xml-strings.cs:110
-#: ../data/addin-xml-strings.cs:116
-#: ../data/addin-xml-strings.cs:122
-#: ../data/addin-xml-strings.cs:128
-#: ../data/addin-xml-strings.cs:134
-#: ../data/addin-xml-strings.cs:140
-#: ../data/addin-xml-strings.cs:146
-#: ../data/addin-xml-strings.cs:152
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:7
-msgid "Tools"
-msgstr "Orodja"
-
-#: ../data/addin-xml-strings.cs:99
-msgid "Change path to photos"
-msgstr "Spremeni pot v slike"
-
-#. ../src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml
-#: ../data/addin-xml-strings.cs:102
-msgid "DevelopInUFRaw"
-msgstr "RazvojVUFRaw"
-
-#: ../data/addin-xml-strings.cs:103
-msgid ""
-"Develop the image in UFRaw, saves the result as a new version\\n"
-"\\n"
-"Note: Require ufraw 0.13 or CVS version newer than 2007-09-06 !!!"
-msgstr ""
-"Razvije sliko v UFRaw, shrani rezultat kot novo razliÄico\\n"
-"\\n"
-"Zahteva ufraw 0.13 ali CVS razliÄico novejÅo kot 06.09.2007 !!!"
-
-#: ../data/addin-xml-strings.cs:105
-msgid "Develop in UFRaw"
-msgstr "Razvoj v UFRaw"
-
-#. ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml
-#: ../data/addin-xml-strings.cs:108
-msgid "LiveWebGallery"
-msgstr "Åiva spletna galerija"
-
-#: ../data/addin-xml-strings.cs:109
-msgid "Share photos with other people on the same network via Web Browser"
-msgstr "Souporaba fotografij z drugimi ljudmi na istem omreÅju preko spletnega brskalnika"
-
-#: ../data/addin-xml-strings.cs:111
-msgid "Live Web Gallery"
-msgstr "Åiva spletna galerija"
-
-#. ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml
-#: ../data/addin-xml-strings.cs:114
-msgid "MergeDb"
-msgstr "ZdruÅi podatkovne zbirke"
-
-#: ../data/addin-xml-strings.cs:115
-msgid "Merge another db back to the main one"
-msgstr "ZdruÅi drugo podatkovno zbirko nazaj z glavno"
-
-#: ../data/addin-xml-strings.cs:117
-msgid "Merge Db"
-msgstr "ZdruÅi podatkovne zbirke"
-
-#. ../src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.addin.xml
-#: ../data/addin-xml-strings.cs:120
-msgid "MetaPixel"
-msgstr "MetaPixel"
-
-#: ../data/addin-xml-strings.cs:121
-msgid "Create photomosaics using MetaPixel (http://www.complang.tuwien.ac.at/schani/metapixel/)"
-msgstr "Ustvari mozaike fotografij z uproabo MetaPixel (http://www.complang.tuwien.ac.at/schani/metapixel/)"
-
-#: ../data/addin-xml-strings.cs:123
-msgid "Create p_hotomosaic"
-msgstr "Ustvari foto-mozaik"
-
-#. ../src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.addin.xml
-#: ../data/addin-xml-strings.cs:126
-msgid "PictureTile"
-msgstr "PictureTile"
-
-#: ../data/addin-xml-strings.cs:127
-msgid "Create photo wall using PictureTile by Jamie Zawinski (http://www.jwz.org/picturetile/)"
-msgstr "Ustvari slikovni zid s PictureTile Jamieja Zawinskija (http://www.jwz.org/picturetile/)"
-
-#: ../data/addin-xml-strings.cs:129
-msgid "Create photo_wall"
-msgstr "Ustvari slikovni _zid"
-
-#. ../src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml
-#: ../data/addin-xml-strings.cs:132
-msgid "RawPlusJpeg"
-msgstr "RawPlusJpeg"
-
-#: ../data/addin-xml-strings.cs:133
-msgid "Merge RAW+Jpeg as multiple versions of the same photo"
-msgstr "ZadruÅi RAW in jpeg kot veÄ razliÄic enake fotografije"
-
-#: ../data/addin-xml-strings.cs:135
-msgid "Merge Raw"
-msgstr "ZdruÅi surove"
-
-#. ../src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml
-#: ../data/addin-xml-strings.cs:138
-msgid "RetroactiveRoll"
-msgstr "Retroaktivni zvitki"
-
-#: ../data/addin-xml-strings.cs:139
-msgid "Retroactively assign old photos to import rolls"
-msgstr "Retroaktivno dodeli stare fotografije uvoznim zvitkom"
-
-#: ../data/addin-xml-strings.cs:141
-msgid "Reassign to new import roll"
-msgstr "Ponovno dodeli novemu uvoznemu zvitku"
-
-#. ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml
-#: ../data/addin-xml-strings.cs:144
-#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:6
-msgid "Screensaver Configuration"
-msgstr "Nastavitve ohranjevalnika zaslona"
-
-#: ../data/addin-xml-strings.cs:145
-msgid "Screensaver options"
-msgstr "MoÅnosti ohranjevalnika zaslona"
-
-#: ../data/addin-xml-strings.cs:147
-msgid "Configure Screensaver"
-msgstr "Nastavi ohranjevalnik zaslona"
-
-#. ../src/Extensions/Tools/FSpot.Tools.SyncCatalog/SyncCatalog.addin.xml
-#: ../data/addin-xml-strings.cs:150
-msgid "SyncMetaData"
-msgstr "Metapodatki Usklajevanja"
-
-#: ../data/addin-xml-strings.cs:151
-msgid "Sync MetaData information of all catalog with Photos"
-msgstr "Uskladi podrobnosti metapodatkov za vse kataloge s fotografijami "
-
-#: ../data/addin-xml-strings.cs:153
-msgid "Sync Catalog with Photos"
-msgstr "Uskladi katalog s fotografijami"
-
-#. ../src/Extensions/Transitions/FSpot.Transitions.Cover/Resources/CoverTransition.addin.xml
-#: ../data/addin-xml-strings.cs:156
-msgid "Cover Transition"
-msgstr "Prehod prekrivanja"
-
-#: ../data/addin-xml-strings.cs:157
-msgid "A Slideshow transition that covers images"
-msgstr "Prehod diaprestavitve, ki pokrije slike"
-
-#: ../data/addin-xml-strings.cs:158
-#: ../data/addin-xml-strings.cs:163
-#: ../data/addin-xml-strings.cs:168
-msgid "Transitions"
-msgstr "Prehodi"
-
-#. ../src/Extensions/Transitions/FSpot.Transitions.Dissolve/Resources/DissolveTransition.addin.xml
-#: ../data/addin-xml-strings.cs:161
-msgid "Dissolve Transition"
-msgstr "Prehod raztapljanje"
-
-#: ../data/addin-xml-strings.cs:162
-msgid "A Slideshow transition that dissolves images"
-msgstr "Prehod predstavitve, ki raztopi slike"
-
-#. ../src/Extensions/Transitions/FSpot.Transitions.Push/Resources/PushTransition.addin.xml
-#: ../data/addin-xml-strings.cs:166
-msgid "Push Transition"
-msgstr "Prehod potisk"
-
-#: ../data/addin-xml-strings.cs:167
-msgid "A Slideshow transition that pushes images"
-msgstr "Prehod prestavitve, ki slike potisne"
-
-#: ../data/desktop-files/f-spot.desktop.in.in.h:1
-#: ../data/desktop-files/f-spot-import.desktop.in.in.h:1
-#: ../data/desktop-files/f-spot-view.desktop.in.in.h:1
-msgid "F-Spot"
-msgstr "F-Spot"
-
-#: ../data/desktop-files/f-spot.desktop.in.in.h:2
-#: ../data/desktop-files/f-spot-import.desktop.in.in.h:2
-msgid "F-Spot Photo Manager"
-msgstr "F-spot upravljalnik fotografij"
-
-#: ../data/desktop-files/f-spot.desktop.in.in.h:3
-msgid "Organize, enjoy, and share your photos"
-msgstr "Urejajte, uÅivajte in dajte svoje fotografije v souporabo."
-
-#: ../data/desktop-files/f-spot.desktop.in.in.h:4
-#: ../data/desktop-files/f-spot-import.desktop.in.in.h:4
-msgid "Photo Manager"
-msgstr "Upravljalnik fotografij"
-
-#: ../data/desktop-files/f-spot-import.desktop.in.in.h:3
-msgid "Import into F-Spot"
-msgstr "Uvozi v F-Spot"
-
-#: ../data/desktop-files/f-spot-view.desktop.in.in.h:2
-msgid "F-Spot Photo Viewer"
-msgstr "F-_Spot pregledovalnik fotografij"
-
-#: ../data/desktop-files/f-spot-view.desktop.in.in.h:3
-msgid "Photo Viewer"
-msgstr "Pregledovalnik fotografij"
-
-#: ../f-spot.schemas.in.h:1
-msgid "Display of transparent parts."
-msgstr "PrikaÅi prozorne dele."
-
-#: ../f-spot.schemas.in.h:2
-msgid "Enable this to allow interpolation on zoomed images."
-msgstr "OmogoÄite to za interpolacijo pribliÅanih slik."
-
-#: ../f-spot.schemas.in.h:3
-msgid "Height of the import dialog."
-msgstr "ViÅina pogovornega okna uvoza."
-
-#: ../f-spot.schemas.in.h:4
-msgid "Height of the main window."
-msgstr "ViÅina glavnega okna."
-
-#: ../f-spot.schemas.in.h:5
-msgid "Height of the photo viewer window."
-msgstr "ViÅina okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:6
-msgid "If the 'transparency' option is set, the color specified in this option will be used as the transparent color when viewing images."
-msgstr "V primeru da je moÅnost 'prozornost' nastavljena, bo barva navedena v tej moÅnosti pri ogledu slik uporabljena kot prozorna barva."
-
-#: ../f-spot.schemas.in.h:7
-msgid "Interpolate image on zoom."
-msgstr "Interpolacija slike pri poveÄavi."
-
-#: ../f-spot.schemas.in.h:8
-msgid "Maximize the main window."
-msgstr "Razpne glavno okno."
-
-#: ../f-spot.schemas.in.h:9
-msgid "Maximize the photo viewer window."
-msgstr "Razpne okno pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:10
-msgid "Path to custom gtkrc for theming F-Spot."
-msgstr "Pot do gtkrc po meri za temo F-Spot."
-
-#: ../f-spot.schemas.in.h:11
-msgid "Show dates in the thumbnail view."
-msgstr "PokaÅi datume v pogledu sliÄic."
-
-#: ../f-spot.schemas.in.h:12
-msgid "Show ratings in the thumbnail view."
-msgstr "PokaÅi ocene v pogledu sliÄic."
-
-#: ../f-spot.schemas.in.h:13
-msgid "Show tags in the thumbnail view."
-msgstr "PokaÅi oznake v pogledu sliÄic."
-
-#: ../f-spot.schemas.in.h:14
-msgid "Show the filename in the viewer window."
-msgstr "PokaÅi ime datoteke v oknu pregledovalnika."
-
-#: ../f-spot.schemas.in.h:15
-msgid "Show the filmstrip in the main window."
-msgstr "PokaÅi filmski trak v glavnem oknu."
-
-#: ../f-spot.schemas.in.h:16
-msgid "Show the sidebar in the main window."
-msgstr "PokaÅi drsnik v glavnem oknu."
-
-#: ../f-spot.schemas.in.h:17
-msgid "Show the timeline in the main window."
-msgstr "PokaÅi Äasovnico v glavnem oknu."
-
-#: ../f-spot.schemas.in.h:18
-msgid "Show the toolbar in the main window."
-msgstr "PokaÅi orodno vrstico v glavnem oknu."
-
-#: ../f-spot.schemas.in.h:19
-msgid "Show the toolbar in the photo viewer window."
-msgstr "PokaÅi ali skrij orodno vrstico v oknu pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:20
-msgid "Size of the tag icons shown in the sidebar."
-msgstr "Velikost ikon oznak prikazanih v stranski vrstici."
-
-#: ../f-spot.schemas.in.h:21
-msgid "The X position to use for the main window."
-msgstr "X poloÅaj glavnega okna."
-
-#: ../f-spot.schemas.in.h:22
-msgid "The X position to use for the photo viewer window."
-msgstr "X poloÅaj okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:23
-msgid "The Y position to use for the main window."
-msgstr "Y poloÅaj glavnega okna."
-
-#: ../f-spot.schemas.in.h:24
-msgid "The Y position to use for the photo viewer window."
-msgstr "Y poloÅaj okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:25
-msgid "The color to use for transparent parts."
-msgstr "Barva za prozorne dele."
-
-#: ../f-spot.schemas.in.h:26
-msgid "The height dimension to use for the import dialog."
-msgstr "ViÅina pogovornega okna."
-
-#: ../f-spot.schemas.in.h:27
-msgid "The height dimension to use for the main window."
-msgstr "ViÅina glavnega okna."
-
-#: ../f-spot.schemas.in.h:28
-msgid "The height dimension to use for the photo viewer window."
-msgstr "ViÅina okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:29
-msgid "The orientation of the filmstrip, if shown."
-msgstr "Usmeritev filmskega traku, Äe je prikazan."
-
-#: ../f-spot.schemas.in.h:30
-msgid "The orientation of the filmstrip."
-msgstr "Usmeritev filmskega traku."
-
-#: ../f-spot.schemas.in.h:31
-msgid "The size (width) of the sidebar in the main window."
-msgstr "Velikost (Åirina) drsnika v glavnemu oknu."
-
-#: ../f-spot.schemas.in.h:32
-msgid "The size of the sidebar in the main window."
-msgstr "Velikost drsnika v glavnemu oknu."
-
-#: ../f-spot.schemas.in.h:33
-msgid "The width dimension to use for the import dialog."
-msgstr "Åirina pogovornega okna uvoza."
-
-#: ../f-spot.schemas.in.h:34
-msgid "The width dimension to use for the main window."
-msgstr "Åirina glavnega okna."
-
-#: ../f-spot.schemas.in.h:35
-msgid "The width dimension to use for the photo viewer window."
-msgstr "Åirina okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:36
-msgid "Use the current photo's filename as the viewer window's title."
-msgstr "Uporabi ime datoteke trenutne fotografije kot naslov okna pregledovalnika."
-
-#: ../f-spot.schemas.in.h:37
-msgid "Width of the import dialog."
-msgstr "Åirina pogovornega okna uvoza."
-
-#: ../f-spot.schemas.in.h:38
-msgid "Width of the main window."
-msgstr "Åirina glavnega okna."
-
-#: ../f-spot.schemas.in.h:39
-msgid "Width of the photo viewer window."
-msgstr "Åirina okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:40
-msgid "Width of the preview image pane in the import dialog."
-msgstr "Åirina pladnja predogleda slike v pogovornemu oknu uvoza."
-
-#: ../f-spot.schemas.in.h:41
-msgid "X position of the main window."
-msgstr "X poloÅaj glavnega okna"
-
-#: ../f-spot.schemas.in.h:42
-msgid "X position of the photo viewer window."
-msgstr "X poloÅaj okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:43
-msgid "Y position of the main window."
-msgstr "Y poloÅaj glavnega okna."
-
-#: ../f-spot.schemas.in.h:44
-msgid "Y position of the photo viewer window."
-msgstr "Y poloÅaj okna pregledovalnika fotografij."
-
-#: ../f-spot.schemas.in.h:45
-msgid "You can choose how to display transparent parts in images. This option has no effect on photos but setting this value to CHECK_PATTERN or CUSTOM_COLOR could be useful when viewing icons or other artwork with transparent parts."
-msgstr "MogoÄe je izbrati naÄin prikaza prozornih delov slik. Ta moÅnost ne vpliva na fotografije, vendar je lahko nastavitev te vrednosti na vzorec Åahovnice ali barva po izbiri koristna pri ogledu ikon in ostalih grafiÄnih podobah s prozornimi deli."
-
-#: ../lib/Mono.Google/Mono.Google/CaptchaException.cs:58
-msgid "url"
-msgstr "url"
-
-#: ../lib/Mono.Google/Mono.Google/CaptchaException.cs:59
-msgid "token"
-msgstr "Åeton"
-
-#: ../lib/Mono.Google/Mono.Google/CaptchaException.cs:60
-msgid "captcha_url"
-msgstr "captcha_url"
-
-#: ../lib/Mono.Tabblo/Mono.Tabblo/Connection.cs:132
-#, csharp-format
-msgid "Uploading photo \"{0}\""
-msgstr "PoÅiljanje fotografije \"{0}\""
-
-#: ../lib/Mono.Tabblo/Mono.Tabblo/Connection.cs:206
-msgid "Logging into Tabblo"
-msgstr "Prijavljanje v Tabblo"
-
-#: ../lib/Mono.Tabblo/Mono.Tabblo/Connection.cs:267
-msgid "Obtaining URL for upload"
-msgstr "Pridobivanje URL-ja za nalaganje"
-
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:2
-msgid "Export to"
-msgstr "Izvozi v"
-
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:3
-msgid "Open _With"
-msgstr "Odpri _z"
-
-#: ../src/Clients/MainApp/FSpot.addin.xml.h:4
-#: ../src/Clients/MainApp/ui/main_window.ui.h:15
-msgid "Rem_ove Tag"
-msgstr "Ods_trani oznako"
-
-#: ../src/Clients/MainApp/FSpot/App.cs:319
-#, csharp-format
-msgid "No photos matching {0} found"
-msgstr "Fotografije, ki se sklada z {0}, ni bilo mogoÄe najti"
-
-#: ../src/Clients/MainApp/FSpot/App.cs:320
-#, csharp-format
-msgid ""
-"The tag \"{0}\" is not applied to any photos. Try adding\n"
-"the tag to some photos or selecting a different tag in the\n"
-"F-Spot preference dialog."
-msgstr ""
-"Oznaka \"{0}\" ni uveljavljena. Poskusite z dodajanjem\n"
-"oznake fotografijam ali izberite drugo oznako v\n"
-"pogovornem oknu moÅnosti F-Spot."
-
-#: ../src/Clients/MainApp/FSpot/App.cs:324
-msgid "Search returned no results"
-msgstr "Iskanje ni vrnilo rezultatov"
-
-#: ../src/Clients/MainApp/FSpot/App.cs:325
-msgid ""
-"The tag F-Spot is looking for does not exist. Try\n"
-"selecting a different tag in the F-Spot preference\n"
-"dialog."
-msgstr ""
-"Oznaka, ki jo iÅÄe F-Spot, ne obstaja. Poskusite\n"
-"z izborom druge oznake v pogovornem oknu \n"
-"moÅnosti F-Spot."
-
-#: ../src/Clients/MainApp/FSpot.Database/Updater.cs:768
-msgid "Updating F-Spot Database"
-msgstr "Posodabljanje podatkovne zbirke F-Spot"
-
-#: ../src/Clients/MainApp/FSpot.Database/Updater.cs:769
-msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
-msgstr "PoÄakati je treba, da se podatkovna zbirka galerije F-Spot do konca posodobi. Postopek lahko traja nekaj Äasa."
-
-#: ../src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs:37
-msgid "Auto Color"
-msgstr "Samodejna barva"
-
-#: ../src/Clients/MainApp/FSpot.Editors/ColorEditor.cs:61
-msgid "Adjust Colors"
-msgstr "Prilagajanje barv"
-
-#: ../src/Clients/MainApp/FSpot.Editors/ColorEditor.cs:64
-msgid "Adjust"
-msgstr "Prilagodi"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:56
-msgid "4 x 3 (Book)"
-msgstr "4 x 3 (knjiga)"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:57
-msgid "4 x 6 (Postcard)"
-msgstr "4 x 6 (razglednica)"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:58
-msgid "5 x 7 (L, 2L)"
-msgstr "5 x 7 (L, 2L)"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:59
-msgid "8 x 10"
-msgstr "8 x 10"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:60
-msgid "Square"
-msgstr "Kvadrat"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:63
-msgid "Crop"
-msgstr "ObreÅi"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:94
-msgid "Select the area that needs cropping."
-msgstr "Izbor obmoÄja za obrez."
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:119
-msgid "No Constraint"
-msgstr "Brez omejitev"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:120
-msgid "Same as photo"
-msgstr "Enako kot fotografija"
-
-#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:125
-msgid "Custom Ratios..."
-msgstr "Razmerja velikosti po meri"
-
-#: ../src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs:37
-msgid "Desaturate"
-msgstr "ZmanjÅaj nasiÄenje"
-
-#: ../src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs:41
-msgid "Red-eye Reduction"
-msgstr "ZmanjÅanje rdeÄih oÄi"
-
-#: ../src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs:44
-msgid "Fix!"
-msgstr "Popravi"
-
-#: ../src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs:48
-msgid "Select the eyes you wish to fix."
-msgstr "Izberite oÄi za popravilo."
-
-#: ../src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs:37
-msgid "Sepia Tone"
-msgstr "Sepia uÄinek staranja"
-
-#: ../src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs:50
-msgid "Soft Focus"
-msgstr "Mehka izostritev"
-
-#: ../src/Clients/MainApp/FSpot.Editors/TiltEditor.cs:51
-msgid "Straighten"
-msgstr "Poravnava"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:82
-msgid "Hide"
-msgstr "Skrij"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:84
-msgid "Hide toolbar"
-msgstr "Skrij orodno vrstico"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:90
-msgid "Info"
-msgstr "Podatki"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:92
-msgid "Image information"
-msgstr "Podatki o sliki"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:97
-msgid "Exit fullscreen"
-msgstr "Izhod iz celozaslonskega naÄina"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:105
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:341
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:122
-msgid "Slideshow"
-msgstr "Diapredstavitev"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:106
-msgid "Start slideshow"
-msgstr "Zagon diapredstavitve"
-
-#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:152
-msgid "Slide transition:"
-msgstr "Prehodi med diapozitivi:"
-
-#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:90
-#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:91
-msgid "More dates"
-msgstr "VeÄ datumov"
-
-#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:93
-#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:94
-msgid "More"
-msgstr "VeÄ"
-
-#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:554
-#: ../src/Clients/MainApp/ui/main_window.ui.h:34
-msgid "_Clear Date Range"
-msgstr "_ÄiÅÄenje datumskega obmoÄja"
-
-#: ../src/Clients/MainApp/FSpot.Import/ImportController.cs:510
-#: ../src/Clients/MainApp/FSpot.Import/ImportController.cs:512
-#: ../src/Clients/MainApp/FSpot.Import/MetadataImporter.cs:72
-msgid "Imported Tags"
-msgstr "UvoÅene oznake"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:102
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:308
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:105
-msgid "Rotate Left"
-msgstr "Zavrti levo"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:103
-msgid "Rotate picture left"
-msgstr "Vrtenje slike levo"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:114
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:312
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:110
-msgid "Rotate Right"
-msgstr "Zavrti desno"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:115
-msgid "Rotate picture right"
-msgstr "Vrtenje slike desno"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:125
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:938
-msgid "Next"
-msgstr "Naslednja"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:126
-msgid "Next picture"
-msgstr "Naslednja slika"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:146
-msgid "Previous"
-msgstr "Predhodni"
-
-#: ../src/Clients/MainApp/FSpot/ItemAction.cs:147
-msgid "Previous picture"
-msgstr "Predhodna slika"
-
-#: ../src/Clients/MainApp/FSpot/Literal.cs:225
-#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:182
-#, csharp-format
-msgid "Not {0}"
-msgstr "Ne {0}"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:301
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:229
-#: ../src/Clients/MainApp/ui/import.ui.h:3
-msgid "Import"
-msgstr "Uvozi"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:303
-msgid "Import new images"
-msgstr "Uvoz novih slik"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:319
-#: ../src/Clients/MainApp/ui/main_window.ui.h:3
-msgid "Browse"
-msgstr "Prebrskaj"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:323
-msgid "Browse many photos simultaneously"
-msgstr "Brskanje po veÄ fotografijah hkrati"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:327
-msgid "Edit Image"
-msgstr "Uredi sliko"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:331
-msgid "View and edit a photo"
-msgstr "Prikaz in urejanje fotografije"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:336
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:117
-msgid "Fullscreen"
-msgstr "Celozaslonski naÄin"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:338
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:119
-msgid "View photos fullscreen"
-msgstr "Celozaslonski ogled fotografij"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:343
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:124
-msgid "View photos in a slideshow"
-msgstr "Ogled fotografij v diapredstavitvi"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:358
-msgid "Previous photo"
-msgstr "Predhodna fotografija"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:363
-msgid "Next photo"
-msgstr "Naslednja fotografija"
-
-#. Don't care otherwise, Tags sounds reasonable
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:376
-#: ../src/Clients/MainApp/FSpot.Widgets/Sidebar.cs:75
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:935
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1107
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1147
-msgid "Tags"
-msgstr "Oznake"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:440
-msgid "Show _Find Bar"
-msgstr "PokaÅi is_kalno vrstico"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:443
-msgid "Hide _Find Bar"
-msgstr "Skrij _iskalno vrstico"
-
-#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:671
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs:154
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs:111
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:134
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:391
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:242
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:214
-#, csharp-format
-msgid "{0} of {1}"
-msgstr "{0} od {1}"
-
-#. Translators, The singular case will never happen here.
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1745
-#, csharp-format
-msgid "Merge the selected tag"
-msgid_plural "Merge the {0} selected tags?"
-msgstr[0] "Ali naj bo zdruÅenih {0} izbranih oznak?"
-msgstr[1] "Ali naj bo zdruÅena {0} izbrana oznaka?"
-msgstr[2] "Ali naj bosta zdruÅeni {0} izbrani oznaki?"
-msgstr[3] "Ali naj bodo zdruÅene {0} izbrane oznake?"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1772
-msgid "This operation will merge the selected tags and any sub-tags into a single tag."
-msgstr "To dejanje bo zdruÅilo izbrane oznake in morebitne pod-oznake v eno samo oznako."
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1774
-msgid "_Merge Tags"
-msgstr "Z_druÅi oznake"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1979
-#, csharp-format
-msgid "{0} Photo out of {1}"
-msgid_plural "{0} Photos out of {1}"
-msgstr[0] "{0} fotografij od {1}"
-msgstr[1] "{0} fotografija od {1}"
-msgstr[2] "{0} fotografiji od {1}"
-msgstr[3] "{0} fotografije od {1}"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1981
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:499
-#, csharp-format
-msgid "{0} Photo"
-msgid_plural "{0} Photos"
-msgstr[0] "{0} Fotografij"
-msgstr[1] "{0} Fotografija"
-msgstr[2] "{0} Fotografiji"
-msgstr[3] "{0} Fotografije"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1984
-#, csharp-format
-msgid " ({0} selected)"
-msgid_plural " ({0} selected)"
-msgstr[0] " ({0} izbranih)"
-msgstr[1] " ({0} izbrana)"
-msgstr[2] " ({0} izbrani)"
-msgstr[3] " ({0} izbrane)"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2065
-msgid "_Ok"
-msgstr "_V redu"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2066
-msgid "Error Deleting Picture"
-msgstr "Napaka med brisanjem slike"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2071
-#, csharp-format
-msgid "No permission to delete the file:{1}{0}"
-msgstr "Ni dovoljenj za izbris datoteke:{1}{0}"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2075
-#, csharp-format
-msgid "An error of type {0} occurred while deleting the file:{2}{1}"
-msgstr "Med brisanjem datoteke {2} {1} je priÅlo do napake vrste {0}"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2107
-#, csharp-format
-msgid "Delete the selected photo permanently?"
-msgid_plural "Delete the {0} selected photos permanently?"
-msgstr[0] "Ali naj bo trajno izbrisanih {0} izbranih fotografij?"
-msgstr[1] "Ali naj bo trajno izbrisana {0} izbrana fotografija?"
-msgstr[2] "Ali naj bosta trajno izbrisani {0} izbrani fotografiji?"
-msgstr[3] "Ali naj bodo trajno izbrisane {0} izbrane fotografije?"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2111
-msgid "This deletes all versions of the selected photo from your drive."
-msgid_plural "This deletes all versions of the selected photos from your drive."
-msgstr[0] "To bo izbrisalo vse razliÄice izbranih fotografij z diska."
-msgstr[1] "To bo izbrisalo vse razliÄice izbrane fotografije z diska."
-msgstr[2] "To bo izbrisalo vse razliÄice izbranih fotografij z diska."
-msgstr[3] "To bo izbrisalo vse razliÄice izbranih fotografij z diska."
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2114
-msgid "_Delete photo"
-msgid_plural "_Delete photos"
-msgstr[0] "Izbri_Åi fotografije"
-msgstr[1] "Izbri_Åi fotografijo"
-msgstr[2] "Izbri_Åi fotografiji"
-msgstr[3] "Izbri_Åi fotografije"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2150
-#, csharp-format
-msgid "Remove the selected photo from F-Spot?"
-msgid_plural "Remove the {0} selected photos from F-Spot?"
-msgstr[0] "Ali naj se odstrani {0} izbranih fotografij iz F-Spot ?"
-msgstr[1] "Ali naj se odstrani {0} izbrano fotografijo iz F-Spot ?"
-msgstr[2] "Ali naj se odstranita {0} izbrani fotografij iz F-Spot ?"
-msgstr[3] "Ali naj se odstranijo {0} izbrane fotografije iz F-Spot ?"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2155
-msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
-msgstr "Ob odstranjevanju fotografij iz kataloga F-Spot bodo vsi podatki o oznakah izgubljeni. Fotografije bodo ostale na vaÅem raÄunalniku in jih lahko ponovno uvozite v F-Spot."
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2156
-msgid "_Remove from Catalog"
-msgstr "_Odstrani iz kataloga"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2230
-#, csharp-format
-msgid "Delete tag \"{0}\"?"
-msgstr "Izbris oznake \"{0}\"?"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2232
-#, csharp-format
-msgid "Delete the {0} selected tags?"
-msgstr "Izbris {0} izbrane oznake ?"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2237
-msgid "photo"
-msgid_plural "photos"
-msgstr[0] "fotografije"
-msgstr[1] "fotografija"
-msgstr[2] "fotografiji"
-msgstr[3] "fotografije"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2239
-#, csharp-format
-msgid "If you delete this tag, the association with {0} {1} will be lost."
-msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
-msgstr[0] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
-msgstr[1] "Ob izbrisu oznake, bo povezljivost z {0} {1} izgubljena."
-msgstr[2] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
-msgstr[3] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2244
-msgid "_Delete tag"
-msgid_plural "_Delete tags"
-msgstr[0] "Iz_briÅi oznake"
-msgstr[1] "Iz_briÅi oznako"
-msgstr[2] "Iz_briÅi oznaki"
-msgstr[3] "Iz_briÅi oznake"
-
-#. A Category is not empty. Can not delete it.
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2258
-msgid "Tag is not empty"
-msgstr "Oznaka ni prazna"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2259
-#, csharp-format
-msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
-msgstr "Ni mogoÄe izbrisati oznak, ki imajo oznake znotraj njih. Najprej izbriÅite oznake pod \"{0}\""
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2711
-msgid "Rotate selected photo left"
-msgid_plural "Rotate selected photos left"
-msgstr[0] "Vrtenje izbranih fotografij levo"
-msgstr[1] "Vrtenje izbrane fotografije levo"
-msgstr[2] "Vrtenje izbranih fotografij levo"
-msgstr[3] "Vrtenje izbranih fotografij levo"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2724
-msgid "Rotate selected photo right"
-msgid_plural "Rotate selected photos right"
-msgstr[0] "Vrtenje izbranih fotografij desno"
-msgstr[1] "Vrtenje izbrane fotografije desno"
-msgstr[2] "Vrtenje izbranih fotografij desno"
-msgstr[3] "Vrtenje izbranih fotografij desno"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2735
-#, csharp-format
-msgid "Find _Selected Tag"
-msgid_plural "Find _Selected Tags"
-msgstr[0] "IÅÄi _izbrane oznake"
-msgstr[1] "IÅÄi _izbrano oznako "
-msgstr[2] "IÅÄi _izbrani oznaki"
-msgstr[3] "IÅÄi _izbrane oznake"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2739
-#, csharp-format
-msgid "Find Selected Tag _With"
-msgid_plural "Find Selected Tags _With"
-msgstr[0] "IÅÄi izbrane oznake _z"
-msgstr[1] "IÅÄi izbrano oznako _z"
-msgstr[2] "IÅÄi izbrani oznaki _z"
-msgstr[3] "IÅÄi izbrane oznake _z"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2780
-msgid "Create New Version?"
-msgid_plural "Create New Versions?"
-msgstr[0] "Ustvari nove razliÄice?"
-msgstr[1] "Ustvari novo razliÄico?"
-msgstr[2] "Ustvari novi razliÄici?"
-msgstr[3] "Ustvari nove razliÄice?"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2782
-#, csharp-format
-msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
-msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
-msgstr[0] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbranih fotografij, da ohrani izvirnike?"
-msgstr[1] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbrane fotografije, da ohrani izvirnik?"
-msgstr[2] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbranih fotografij, da ohrani izvirnika?"
-msgstr[3] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbranih fotografij, da ohrani izvirnike?"
-
-#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2804
-msgid "XCF version"
-msgstr "RazliÄica XCF"
-
-#. Note for translators: Reparented is a picture becoming a version of another one
-#: ../src/Clients/MainApp/FSpot/Photo.cs:430
-msgid "Reparented"
-msgstr "Lastnik je bil spremenjen"
-
-#: ../src/Clients/MainApp/FSpot/Photo.cs:448
-#, csharp-format
-msgid "Modified"
-msgid_plural "Modified ({0})"
-msgstr[0] "Spremenjenih ({0})"
-msgstr[1] "Spremenjena ({0})"
-msgstr[2] "Spremenjeni ({0})"
-msgstr[3] "Spremenjene ({0})"
-
-#: ../src/Clients/MainApp/FSpot/Photo.cs:471
-#, csharp-format
-msgid "Modified in {1}"
-msgstr "Spremenjena v {1}"
-
-#: ../src/Clients/MainApp/FSpot/Photo.cs:471
-#, csharp-format
-msgid "Modified in {1} ({0})"
-msgstr "Spremenjena v {1} ({0})"
-
-#: ../src/Clients/MainApp/FSpot/PhotoStore.cs:202
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:17
-msgid "Original"
-msgstr "Izvorno"
-
-#: ../src/Clients/MainApp/FSpot/PhotoView.cs:353
-msgid "Description:"
-msgstr "Opis:"
-
-#: ../src/Clients/MainApp/FSpot/Preferences.cs:191
-msgid "Photos"
-msgstr "Fotografije"
-
-#: ../src/Clients/MainApp/FSpot/PrintOperation.cs:54
-msgid "Image Settings"
-msgstr "Nastavitve slik"
-
-#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:84
-msgid "Find: "
-msgstr "Najdi: "
-
-#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:89
-msgid "Untagged photos"
-msgstr "NeoznaÄene fotografije"
-
-#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:97
-msgid "Rated photos"
-msgstr "Ocenjene fotografije"
-
-#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
-#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:106
-msgid "Import roll"
-msgstr "Uvozni zvitek"
-
-#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:129
-msgid "Clear search"
-msgstr "ÄiÅÄenje iskanja"
-
-#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:136
-msgid "Refresh search"
-msgstr "OsveÅitev iskanja"
-
-#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:139
-msgid "No matching photos found"
-msgstr "Ni mogoÄe najti skladnih fotografij"
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:99
-msgid "Unable to rotate this type of photo"
-msgstr "Ni mogoÄe vrteti te vrste fotografij"
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:115
-msgid "Unable to rotate readonly file"
-msgstr "Ni mogoÄe vrteti datoteke le za branje"
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:173
-msgid "Rotating photos"
-msgstr "Vrtenje fotografij"
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:184
-#, csharp-format
-msgid "Rotating photo \"{0}\""
-msgstr "Vrtenje fotografije \"{0}\""
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:197
-msgid "Directory not found"
-msgstr "Mape ni mogoÄe najti"
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:199
-msgid "File not found"
-msgstr "Datoteke ni mogoÄe najti"
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:217
-#, csharp-format
-msgid "Unable to rotate photo"
-msgid_plural "Unable to rotate {0} photos"
-msgstr[0] "Ni mogoÄe zavrteti {0} fotografij"
-msgstr[1] "Ni mogoÄe zavrteti {0} fotografije"
-msgstr[2] "Ni mogoÄe zavrteti {0} fotografij"
-msgstr[3] "Ni mogoÄe zavrteti {0} fotografij"
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:219
-#, csharp-format
-msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
-msgstr[0] "{0} fotografij ni bilo mogoÄe zavrteti, ker se nahajajo na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
-msgstr[1] "{0} fotografije ni bilo mogoÄe zavrteti, ker se nahaja na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
-msgstr[2] "{0} fotografij ni bilo mogoÄe zavrteti, ker se nahajati na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
-msgstr[3] "{0} fotografij ni bilo mogoÄe zavrteti, ker se nahajajo na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:246
-#, csharp-format
-msgid "Received error \"{0}\" while attempting to rotate {1}"
-msgstr "Med poskusom vrtenja {1} je priÅlo do napake \"{0}\""
-
-#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:251
-msgid "Error while rotating photo."
-msgstr "Napaka med vrtenjem fotografije."
-
-#: ../src/Clients/MainApp/FSpot/SendEmail.cs:233
-msgid "Preparing email"
-msgstr "Pripravljanje elektronske poÅte"
-
-#: ../src/Clients/MainApp/FSpot/SendEmail.cs:277
-#, csharp-format
-msgid "Exporting picture \"{0}\""
-msgstr "IzvaÅanje slike \"{0}\""
-
-#: ../src/Clients/MainApp/FSpot/SendEmail.cs:296
-msgid "Error processing image"
-msgstr "Napaka med obdelavo slike"
-
-#: ../src/Clients/MainApp/FSpot/SendEmail.cs:297
-#, csharp-format
-msgid "An error occured while processing \"{0}\": {1}"
-msgstr "Med obdelavo \"{0}\" je priÅlo do napake: {1}"
-
-#. Send the mail :)
-#: ../src/Clients/MainApp/FSpot/SendEmail.cs:310
-msgid "My Photos"
-msgstr "Moje fotografije"
-
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:107
-msgid "Rotate photo left"
-msgstr "Vrtenje fotografije v levo"
-
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:112
-msgid "Rotate photo right"
-msgstr "Vrtenje fotografije v desno"
-
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:148
-msgid "Folder"
-msgstr "Mapa"
-
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:373
-msgid "Open"
-msgstr "Odpri"
-
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:376
-msgid "Select Folder"
-msgstr "Izbor mape"
-
-#: ../src/Clients/MainApp/FSpot/SingleView.cs:460
-msgid "Set as Background"
-msgstr "Nastavi kot ozadje"
-
-#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:67
-#, csharp-format
-msgid "Include Photos Tagged \"{0}\""
-msgstr "VkljuÄi fotografije oznaÄene z \"{0}\""
-
-#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:72
-#, csharp-format
-msgid "Exclude Photos Tagged \"{0}\""
-msgstr "IzkljuÄi fotografije oznaÄene z \"{0}\""
-
-#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:77
-msgid "Remove From Search"
-msgstr "Odstrani iz iskanja"
-
-#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:121
-#, csharp-format
-msgid "Find _With"
-msgid_plural "Find _With"
-msgstr[0] "IÅÄi _z"
-msgstr[1] "IÅÄi _z"
-msgstr[2] "IÅÄi _z"
-msgstr[3] "IÅÄi _z"
-
-#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:147
-msgid "All"
-msgstr "Vse"
-
-#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:306
-msgid "Drag tags here to search for them"
-msgstr "Za iskanje po oznakah jih povlecite sem"
-
-#: ../src/Clients/MainApp/FSpot/TagSelectionWidget.cs:521
-msgid "Error renaming tag"
-msgstr "Napaka med preimenovanjem oznake"
-
-#: ../src/Clients/MainApp/FSpot/TagSelectionWidget.cs:522
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs:99
-#: ../src/Clients/MainApp/TagCommands.cs:139
-msgid "This name is already in use"
-msgstr "Ime je Åe v uporabi"
-
-#: ../src/Clients/MainApp/FSpot/TagStore.cs:222
-msgid "Favorites"
-msgstr "Priljubljeno"
-
-#: ../src/Clients/MainApp/FSpot/TagStore.cs:227
-msgid "Hidden"
-msgstr "Skrito"
-
-#: ../src/Clients/MainApp/FSpot/TagStore.cs:235
-msgid "People"
-msgstr "Ljudje"
-
-#: ../src/Clients/MainApp/FSpot/TagStore.cs:240
-msgid "Places"
-msgstr "Mesta"
-
-#: ../src/Clients/MainApp/FSpot/TagStore.cs:245
-msgid "Events"
-msgstr "Dogodki"
-
-#. The label for the root category is used in new and edit tag dialogs
-#: ../src/Clients/MainApp/FSpot/TagStore.cs:257
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:441
-msgid "(None)"
-msgstr "(Brez)"
-
-#: ../src/Clients/MainApp/FSpot/Term.cs:336
-msgid " and "
-msgstr " in "
-
-#. Operators.Add (Catalog.GetString (" && "));
-#: ../src/Clients/MainApp/FSpot/Term.cs:338
-msgid ", "
-msgstr ","
-
-#: ../src/Clients/MainApp/FSpot/Term.cs:394
-msgid " or "
-msgstr " ali "
-
-#. OPS The operators we support, case insensitive
-#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
-#: ../src/Clients/MainApp/FSpot/Term.cs:415
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:7
-#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:202
-#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:557
-msgid "or"
-msgstr "ali"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:123
-msgid "Photo management for GNOME"
-msgstr "Upravljanje fotografij za GNOME"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:124
-msgid "Copyright  2003-2010 Novell Inc."
-msgstr "Avtorske pravice  2003-2010 Novell Inc."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:148
-msgid "translator-credits"
-msgstr "Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:153
-msgid "F-Spot Website"
-msgstr "SpletiÅÄe F-Spot"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs:137
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:10
-#, csharp-format
-msgid "Shift all photos by {0}"
-msgstr "Premik vseh fotografij za {0}"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:109
-msgid "Today"
-msgstr "Danes"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:111
-msgid "Yesterday"
-msgstr "VÄeraj"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:113
-msgid "Last 7 days"
-msgstr "Zadnjih 7 dni"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:115
-msgid "Last 30 days"
-msgstr "Zadnjih 30 dni"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:117
-msgid "Last 90 days"
-msgstr "Zadnjih 90 dni"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:119
-msgid "Last 360 days"
-msgstr "Zadnjih 360 dni"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:121
-msgid "Current Week (Mon-Sun)"
-msgstr "Trenutni Teden (Pon-Ned)"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:123
-msgid "Previous Week (Mon-Sun)"
-msgstr "Predhodni Teden (Pon-Ned)"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:139
-#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:1
-msgid "All Images"
-msgstr "Vse slike"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:141
-msgid "Customized Range"
-msgstr "Obseg po meri"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs:50
-#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:107
-#, csharp-format
-msgid "Received exception \"{0}\". Unable to save photo {1}"
-msgstr "Prejeta je bila izjema \"{0}\". Ni mogoÄe shraniti fotografije {1}"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs:63
-msgid "Error editing photo"
-msgstr "Napaka med urejanjem fotografije"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:64
-#, csharp-format
-msgid "Edit Icon for Tag {0}"
-msgstr "Urejanje ikone za oznako {0}"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:86
-msgid "Select Photo from file"
-msgstr "Izberi fotografijo iz datoteke"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:108
-#, csharp-format
-msgid ""
-"\n"
-"<b>From Photo</b>\n"
-" You can use one of your library photos as an icon for this tag.\n"
-" However, first you must have at least one photo associated\n"
-" with this tag. Please tag a photo as '{0}' and return here\n"
-" to use it as an icon."
-msgstr ""
-"\n"
-"<b>S Fotografije</b>\n"
-" Kot ikono za to oznako lahko uporabite eno od fotografij iz vaÅe\n"
-" knjiÅnice. Najprej morate imeti vsaj eno fotografijo oznaÄeno\n"
-" s to oznako. OznaÄite fotografijo kot '{0}' in se vrnite sem,\n"
-"da jo lahko uporabite kot ikono."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:186
-msgid "Unable to load image"
-msgstr "Ni mogoÄe naloÅiti slike."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:187
-#, csharp-format
-msgid "Unable to load \"{0}\" as icon for the tag"
-msgstr "Ni mogoÄe naloÅiti \"{0}\" kot ikono za oznako"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:225
-#, csharp-format
-msgid "Photo {0} of {1}"
-msgstr "Fotografija {0} od {1}"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:45
-msgid "Choose Folder..."
-msgstr "Izbor mape ...."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:164
-msgid "Choose Import source..."
-msgstr "Izbor vira uvoza ..."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:176
-msgid "(No Cameras Detected)"
-msgstr "(Ni zaznanih fotoaparatov)"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:211
-msgid ""
-"Checking this box will remove the imported photos from the camera after the import finished successfully.\n"
-"\n"
-"It is generally recommended to backup your photos before removing them from the camera. <b>Use this option at your own risk!</b>"
-msgstr ""
-"Izbira tega polja bo po uspeÅnemu uvozu odstranila uvoÅene fotografije s fotoaparata.\n"
-"\n"
-"PriporoÄamo da pred odstranitvijo svojih fotografij z digitalnega fotoaparata napravite varnostno kopijo. <b>To moÅnost uporabljate na lastno odgovornost!</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:212
-msgid "Warning"
-msgstr "Opozorilo"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:331
-#, csharp-format
-msgid "Importing Photos: {0} of {1}..."
-msgstr "UvaÅanje fotografij: {0} od {1} ..."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:355
-msgid "Importing photos..."
-msgstr "UvaÅanje fotografij ..."
-
-#. TODO: Using a GtkSpinner would be nicer here.
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:362
-msgid "Searching for photos... (You can already click Import to continue)"
-msgstr "Iskanje fotografij ... (za nadaljevanje lahko Åe kliknite Uvozi)"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:65
-msgid "Import failures"
-msgstr "Napake uvoza"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:66
-msgid "Some files failed to import"
-msgstr "Uvoz nekaterih datotek je spodletel"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:67
-msgid "Some files could not be imported, they might be corrupt or there might be something wrong with the storage on which they reside."
-msgstr "Nekaterih datotek ni bilo mogoÄe uvoziti. Morda so pokvarjene ali pa je morda nekaj narobe z njihovo shrambo."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:130
-msgid "Details"
-msgstr "Podrobnosti"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:77
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:100
-msgid "None"
-msgstr "Brez"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:79
-msgid "System profile"
-msgstr "Sistemski profil"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:117
-msgid "Standard theme"
-msgstr "ObiÄajna tema"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs:44
-msgid "Error loading database."
-msgstr "Napaka med nalaganjem podatkovne zbirke."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs:45
-#, csharp-format
-msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
-msgstr "PriÅlo je do napake med nalaganjem podatkovne zbirke fotografij. Stara podatkovna zbirka je bila premaknjena v {0}, zato je bila ustvarjena nova."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs:81
-msgid "Label"
-msgstr "Oznaka"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs:85
-msgid "Ratio"
-msgstr "Razmerje"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs:78
-msgid "Retry"
-msgstr "Poskusi znova"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs:80
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/pickfolder_dialog.ui.h:1
-msgid "Skip"
-msgstr "PreskoÄi"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:1
-msgid "0000:00:00 00:00:00"
-msgstr "0000:00:00 00:00:00"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:2
-msgid "00:00:00"
-msgstr "00:00:00"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:3
-msgid "5"
-msgstr "5"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:4
-msgid "<b>Action</b>"
-msgstr "<b>Dejanje</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:5
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:6
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:2
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:3
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:3
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:2
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:2
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:2
-msgid "<b>Photos</b>"
-msgstr "<b>Fotografije</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:6
-msgid "<b>Reference Photo</b>"
-msgstr "<b>ReferenÄna fotografija</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:7
-msgid "Adjust Time"
-msgstr "Prilagodi Äas"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:8
-msgid "Adjusted date: "
-msgstr "Prilagojen datum:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:9
-msgid "Current date:"
-msgstr "Trenutni datum:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:11
-msgid "Space all photos by"
-msgstr "Razmakni vse fotografije za"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:12
-msgid "difference:"
-msgstr "razlika:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:13
-msgid "min. Starting at {0}"
-msgstr "najmanjÅi zaÄetek pri {0}"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:1
-msgid "C_reate"
-msgstr "Ustva_ri"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:2
-msgid "Create _icon for this tag when first used"
-msgstr "Ustvari _ikono za to oznako ob prvi uporabi"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:3
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:3
-msgid "P_arent Tag:"
-msgstr "N_adrejena oznaka:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:4
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:5
-msgid "_Tag Name:"
-msgstr "Ime _oznake:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:1
-msgid "<b>End Date</b>"
-msgstr "<b>KonÄni datum</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:2
-msgid "<b>Select period</b>"
-msgstr "<b>Izberi obdobje</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:3
-msgid "<b>Start Date</b>"
-msgstr "<b>ZaÄetni datum</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:4
-msgid "Cancel, do not change the current timeline. "
-msgstr "PrekliÄi, ne spremeni trenutne Äasovnice."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:5
-msgid "Only photos taken within these dates will be displayed."
-msgstr "Prikazane bodo le fotografije znotraj teh datumov."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:6
-msgid "Set date range"
-msgstr "Nastavi obseg datumov"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:1
-msgid "Edit Tag"
-msgstr "Urejanje oznake"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:2
-msgid "Edit icon"
-msgstr "Urejanje ikone"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:4
-msgid "_Icon:"
-msgstr "_Ikona:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:1
-msgid "<b>From External Photo</b>"
-msgstr "<b>Iz zunanje fotografije</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:2
-msgid "<b>From Photo</b>"
-msgstr "<b>Iz fotografije</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:3
-msgid "<b>Predefined icons</b>"
-msgstr "<b>Pred doloÄene ikone</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:4
-msgid "<b>Preview</b>"
-msgstr "<b>Predogled</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:5
-msgid "Design icon from"
-msgstr "Oblika ikone od "
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:6
-msgid "Edit Tag Icon"
-msgstr "Urejanje ikone oznake"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:7
-msgid "No _image"
-msgstr "_Brez slike"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:1
-msgid "<b>View all pictures imported</b>"
-msgstr "<b>Ogled vseh uvoÅenih slik</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:2
-msgid "Display only those photos that were imported in specified Rolls."
-msgstr "Prikaz le tistih fotografij, ki so bile uvoÅene v navedenih zvitkih."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:3
-msgid "Filter on selected rolls"
-msgstr "Filter na izbranih zvitkih"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:4
-msgid "Number of photos in selected rolls:"
-msgstr "Åtevilo fotografij v izbranih zvitkih:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:5
-msgid "Show all photos."
-msgstr "PokaÅi vse fotografije."
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:6
-msgid "after"
-msgstr "za"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:7
-#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:202
-#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:558
-msgid "and"
-msgstr "in"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:8
-msgid "at"
-msgstr "ob"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:9
-msgid "between"
-msgstr "med"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:1
-msgid "Color profile for display:"
-msgstr "Barvni profil za zaslon:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:2
-msgid "Color profile for printing:"
-msgstr "Barvni profil za tiskanje:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:3
-msgid "F-Spot Preferences"
-msgstr "MoÅnosti F-Spot"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:4
-msgid "F-Spot appearance:"
-msgstr "Videz F-spot:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:5
-msgid ""
-"Inside the image files when possible\n"
-"<small>Makes them accessible to other image-editing programs.</small>"
-msgstr ""
-"Znotraj slikovnih datotek, Äe je mogoÄe\n"
-"<small>To naredi slike dostopne ostalim programom za urejanje slik.</small>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:7
-msgid ""
-"Never modify image files.\n"
-"<small>Write XMP files next to the images instead.</small>"
-msgstr ""
-"Nikoli ne spreminjaj slikovnih datotek.\n"
-"<small>Namesto tega zapiÅi datoteke XMP poleg slik.</small>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:9
-msgid "Select A Folder"
-msgstr "Izbira mape"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:10
-msgid "Separately from the image files"
-msgstr "LoÄeno od slikovnih datotek"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:11
-msgid "Store tags and descriptions for photos:"
-msgstr "Shranjevanje oznak in opisov fotografij:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:12
-msgid "When importing photos, copy them to:"
-msgstr "Pri uvaÅanju fotografij jih kopiraj v:"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RatingFilterDialog.ui.h:1
-msgid "<b>Max Rating</b>"
-msgstr "<b>NajviÅja Ocena</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RatingFilterDialog.ui.h:2
-msgid "<b>Min Rating</b>"
-msgstr "<b>NajniÅja Ocena</b>"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RatingFilterDialog.ui.h:3
-msgid "Set Rating Filter"
-msgstr "Nastavitev filtrov ocen"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RepairDialog.ui.h:1
-msgid "Repair"
-msgstr "Popravi"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui.h:1
-msgid "Manage your custom selection ratios"
-msgstr "Upravljanje razmerij za izbiranje po meri"
-
-#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui.h:2
-msgid "Selection Constraints"
-msgstr "Izbira omejitev"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:55
-#: ../src/Clients/MainApp/FSpot.Widgets/Sidebar.cs:73
-msgid "Edit"
-msgstr "Urejanje"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:223
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:66
-msgid "No selection available"
-msgstr "Na voljo ni nobene izbire"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:224
-msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
-msgstr "Orodje zahteva dejavno izbiro. Izberite obmoÄje na fotografiji in poskusite znova"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:242
-msgid "Error saving adjusted photo"
-msgid_plural "Error saving adjusted photos"
-msgstr[0] "Napaka med shranjevanjem prilagojenih fotografij"
-msgstr[1] "Napaka med shranjevanjem prilagojene fotografije"
-msgstr[2] "Napaka med shranjevanjem prilagojenih fotografij"
-msgstr[3] "Napaka med shranjevanjem prilagojenih fotografij"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:244
-#, csharp-format
-msgid "Received exception \"{0}\". Note that you have to develop RAW files into JPEG before you can edit them."
-msgstr "Prejeta je bila izjema \"{0}\". Datoteke RAW je treba pred urejanjem razviti v JPEG."
-
-#: ../src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs:497
-msgid "_Horizontal"
-msgstr "_Vodoravno"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs:501
-msgid "_Vertical"
-msgstr "_NavpiÄno"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:83
-msgid "Find:"
-msgstr "Najdi:"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs:44
-msgid "Folders"
-msgstr "Mape"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs:159
-msgid "Filesystem"
-msgstr "DatoteÄni sistem"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:125
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:401
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:451
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:457
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:461
-msgid "(Unknown)"
-msgstr "(neznano)"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:305
-msgid "Histogram"
-msgstr "Histogram"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:324
-msgid "Image Information"
-msgstr "Podrobnosti o sliki"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:332
-#, csharp-format
-msgid "{0} Photos"
-msgstr "{0} fotografij"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:334
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:10
-msgid "Name"
-msgstr "Ime"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:346
-msgid "Version"
-msgstr "RazliÄica"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:361
-#: ../src/Clients/MainApp/PhotoVersionMenu.cs:86
-msgid "(No Edits)"
-msgstr "(Ni urejanj)"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:365
-#, csharp-format
-msgid "(One Edit)"
-msgid_plural "({0} Edits)"
-msgstr[0] "({0} urejanj)"
-msgstr[1] "({0} urejanje)"
-msgstr[2] "({0} urejanji)"
-msgstr[3] "({0} urejanja)"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:371
-msgid "Date"
-msgstr "Datum"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:371
-msgid "Show Date"
-msgstr "PokaÅi datum"
-
-#. Note for translators: {0} is a date, {1} and {2} are times.
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:382
-#, csharp-format
-msgid ""
-"On {0} between \n"
-"{1} and {2}"
-msgstr ""
-"Na {0} med \n"
-"{1} in {2}"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:387
-#, csharp-format
-msgid ""
-"Between {0} \n"
-"and {1}"
-msgstr ""
-"Med {0} \n"
-"in {1}"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:393
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:4
-msgid "Size"
-msgstr "Velikost"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:393
-msgid "Show Size"
-msgstr "PokaÅi velikost"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:404
-msgid "Exposure"
-msgstr "Osvetljenost"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:404
-msgid "Show Exposure"
-msgstr "PokaÅi osvetlitev"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:434
-msgid "flash fired"
-msgstr "bliskavica se je sproÅila"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:436
-msgid "flash didn't fire"
-msgstr "bliskavica se ni sproÅila"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:446
-msgid "Focal Length"
-msgstr "GoriÅÄna razdalja"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:446
-msgid "Show Focal Length"
-msgstr "PokaÅi goriÅÄno razdaljo"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:456
-msgid "Camera"
-msgstr "Fotoaparat"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:456
-msgid "Show Camera"
-msgstr "PokaÅi fotoaparat"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:460
-msgid "Creator"
-msgstr "Ustvarjalec"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:460
-msgid "Show Creator"
-msgstr "PokaÅi ustvarjalca"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:464
-msgid "File Size"
-msgstr "Velikost datoteke"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:464
-msgid "Show File Size"
-msgstr "PokaÅi velikost datotek"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:472
-msgid "(File read error)"
-msgstr "(Napaka med branjem datoteke)"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:480
-msgid "Rating"
-msgstr "Ocena"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:480
-msgid "Show Rating"
-msgstr "PokaÅi oceno"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:484
-msgid "Show Tags"
-msgstr "PrikaÅi oznake"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:46
-msgid "Metadata"
-msgstr "Metapodatki"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:127
-msgid "Extended Metadata"
-msgstr "RazÅirjeni metapodatki"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:380
-msgid "No active photo"
-msgstr "Ni dejavnih fotografij"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:382
-#, csharp-format
-msgid "The photo \"{0}\" does not exist"
-msgstr "Fotografija \"{0}\" ne obstaja"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:384
-msgid "No metadata available"
-msgstr "Metapodatki niso na voljo"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:106
-msgid "Error saving sharpened photo"
-msgstr "Napaka med shranjevanjem izostrene datoteke"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:152
-msgid "Sharpen"
-msgstr "Izostritev"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:162
-msgid "Amount:"
-msgstr "KoliÄina:"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:163
-msgid "Radius:"
-msgstr "Polmer:"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:164
-msgid "Threshold:"
-msgstr "Prag:"
-
-#: ../src/Clients/MainApp/FSpot.Widgets/TagMenu.cs:132
-#: ../src/Clients/MainApp/TagPopup.cs:61
-msgid "Create New Tag..."
-msgstr "Ustvari novo oznako ..."
-
-#. Fixme this should really set parent menu
-#. items insensitve
-#: ../src/Clients/MainApp/PhotoTagMenu.cs:68
-msgid "(No Tags)"
-msgstr "(Ni oznak)"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:91
-msgid "Create New Version"
-msgstr "Ustvari novo razliÄico"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:92
-msgid "Name:"
-msgstr "Ime:"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:96
-msgid "Rename Version"
-msgstr "Preimenuj razliÄico"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:97
-msgid "New name:"
-msgstr "Novo ime:"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:157
-msgid "Delete"
-msgstr "IzbriÅi"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:158
-#, csharp-format
-msgid "Really delete version \"{0}\"?"
-msgstr "Ali zares Åelite izbrisati razliÄico \"{0}\"?"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:159
-msgid "This removes the version and deletes the corresponding file from disk."
-msgstr "To odstrani razliÄico in izbriÅe ustrezno datoteko z diska."
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:204
-msgid "De_tach"
-msgstr "O_dpni"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:205
-#, csharp-format
-msgid "Really detach version \"{0}\" from \"{1}\"?"
-msgstr "ResniÄno odpni razliÄico \"{0}\" od \"{1}\"?"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:206
-msgid "This makes the version appear as a separate photo in the library. To undo, drag the new photo back to its parent."
-msgstr "RazliÄice fotografije se v knjiÅnici pojavijo kot razliÄne fotografije. Za razveljavitve povlecite novo fotografijo nazaj k starÅevski fotografiji. "
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:228
-msgid "Re_parent"
-msgstr "Pri_pni"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:229
-#, csharp-format
-msgid "Really reparent \"{0}\" as version of \"{1}\"?"
-msgid_plural "Really reparent {2} photos as versions of \"{1}\"?"
-msgstr[0] "Ali zares Åelite znova pripeti {2} fotografij kot razliÄice \"{1}\"?"
-msgstr[1] "Ali zares Åelite znova pripeti {2} fotografijo kot razliÄico \"{1}\"?"
-msgstr[2] "Ali zares Åelite znova pripeti {2} fotografiji kot razliÄici \"{1}\"?"
-msgstr[3] "Ali zares Åelite znova pripeti {2} fotografije kot razliÄice \"{1}\"?"
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:232
-msgid "This makes the photos appear as a single one in the library. The versions can be detached using the Photo menu."
-msgstr "Fotografije se v knjiÅnici pojavijo kot ena fotografija. RazliÄice je mogoÄe odpeti v meniju Fotografija."
-
-#: ../src/Clients/MainApp/PhotoVersionCommands.cs:272
-#, csharp-format
-msgid "Received exception \"{0}\"."
-msgstr "Prejeta je bila izjema \"{0}\"."
-
-#: ../src/Clients/MainApp/TagCommands.cs:189
-msgid "Create New Tag"
-msgstr "Ustvari novo oznako"
-
-#: ../src/Clients/MainApp/TagCommands.cs:190
-msgid "Name of New Tag:"
-msgstr "Ime nove oznake:"
-
-#: ../src/Clients/MainApp/TagPopup.cs:51
-#, csharp-format
-msgid "Find"
-msgid_plural "Find"
-msgstr[0] "Iskanje"
-msgstr[1] "Iskanje"
-msgstr[2] "Iskanje"
-msgstr[3] "Iskanje"
-
-#: ../src/Clients/MainApp/TagPopup.cs:67
-msgid "Edit Tag..."
-msgstr "Urejanje oznake ..."
-
-#: ../src/Clients/MainApp/TagPopup.cs:72
-msgid "Delete Tag"
-msgid_plural "Delete Tags"
-msgstr[0] "IzbriÅi oznake"
-msgstr[1] "IzbriÅi oznako"
-msgstr[2] "IzbriÅi oznaki"
-msgstr[3] "IzbriÅi oznake"
-
-#: ../src/Clients/MainApp/TagPopup.cs:78
-msgid "Attach Tag to Selection"
-msgid_plural "Attach Tags to Selection"
-msgstr[0] "Dodajanje oznak izboru"
-msgstr[1] "Dodajanje oznake izboru"
-msgstr[2] "Dodajanje oznak izboru"
-msgstr[3] "Dodajanje oznak izboru"
-
-#: ../src/Clients/MainApp/TagPopup.cs:82
-msgid "Remove Tag From Selection"
-msgid_plural "Remove Tags From Selection"
-msgstr[0] "Odstranitev oznak iz izbora"
-msgstr[1] "Odstranitev oznake iz izbora"
-msgstr[2] "Odstranitev oznak iz izbora"
-msgstr[3] "Odstranitev oznak iz izbora"
-
-#: ../src/Clients/MainApp/TagPopup.cs:88
-msgid "Merge Tags"
-msgstr "ZdruÅi oznake"
-
-#: ../src/Clients/MainApp/ThumbnailCommand.cs:54
-msgid "Updating Thumbnails"
-msgstr "Posodabljanje sliÄic"
-
-#: ../src/Clients/MainApp/ThumbnailCommand.cs:62
-#, csharp-format
-msgid "Updating picture \"{0}\""
-msgstr "Posodabljanje slike \"{0}\""
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:1
-msgid "<b>Co_rrections</b>"
-msgstr "<b>Pop_ravki</b>"
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:2
-msgid "<b>_White Balance</b>"
-msgstr "<b>_RavnoteÅje bele barve</b>"
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:3
-msgid "C_ontrast:"
-msgstr "K_ontrast:"
-
-#. Note for translators: meant as Temperature
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:5
-msgid "Te_mp:"
-msgstr "ZaÄ_asno:"
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:6
-msgid "_Brightness:"
-msgstr "Svet_lost:"
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:7
-msgid "_Exposure:"
-msgstr "Izpos_tavljenost:"
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:8
-msgid "_Hue:"
-msgstr "_Odtenek:"
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:9
-msgid "_Saturation:"
-msgstr "N_asiÄenost:"
-
-#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:10
-msgid "_Tint:"
-msgstr "_Ärnilo:"
-
-#: ../src/Clients/MainApp/ui/import.ui.h:1
-msgid "C_opy files to the Photos folder"
-msgstr "_Kopiranj datoteke v mapo fotografij"
-
-#: ../src/Clients/MainApp/ui/import.ui.h:2
-msgid "I_nclude subfolders"
-msgstr "_VkljuÄi podmape"
-
-#. Translators: this string means 'source of import'
-#: ../src/Clients/MainApp/ui/import.ui.h:5
-msgid "Import _from:"
-msgstr "Uvozi _iz:"
-
-#: ../src/Clients/MainApp/ui/import.ui.h:6
-msgid "_Attach tags:"
-msgstr "_Pripni oznake:"
-
-#: ../src/Clients/MainApp/ui/import.ui.h:7
-msgid "_Detect duplicates"
-msgstr "_Zaznaj dvojnike"
-
-#: ../src/Clients/MainApp/ui/import.ui.h:8
-msgid "_Import"
-msgstr "_Uvozi"
-
-#: ../src/Clients/MainApp/ui/import.ui.h:9
-msgid "_Remove original files after import"
-msgstr "_Odstrani izvorne datoteke po uvozu"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:1
-msgid "1024 px"
-msgstr "1024 px"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:2
-msgid "320 px"
-msgstr "320 px"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:3
-msgid "480 px"
-msgstr "480 px"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:4
-msgid "640 px"
-msgstr "640 px"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:5
-msgid "800 px"
-msgstr "800 px"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:7
-msgid "<b>Size</b>"
-msgstr "<b>Velikost</b>"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:8
-msgid "<b>Summary</b>"
-msgstr "<b>Povzetek</b>"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:9
-msgid "Create Mail"
-msgstr "Ustvari poÅto"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:10
-msgid "Create a mail with the selected photos (possibly resized) attached"
-msgstr "Ustvari poÅto s pripetimi fotografijami (po moÅnosti spremenjenih velikosti)"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:11
-msgid "Do not send a mail"
-msgstr "Ne poÅlji poÅte"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:12
-msgid "Estimated new size"
-msgstr "Ocenjena nova velikost"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:13
-msgid "Extra large"
-msgstr "Zelo velika"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:14
-msgid "Large"
-msgstr "Velika"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:15
-msgid "Medium"
-msgstr "Srednja"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:16
-msgid "Number of pictures"
-msgstr "Åtevilo slik"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:18
-msgid "Original size (possible very large file size)"
-msgstr "Izvorna velikost (morda zelo velika velikost datotek)"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:19
-msgid "Small"
-msgstr "Majhna"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:20
-msgid "Tiny"
-msgstr "Drobcena"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:21
-msgid "Total original size"
-msgstr "Skupna izvorna velikost"
-
-#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:22
-msgid "_Create Mail"
-msgstr "_Ustvari poÅto"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:1
-msgid "Adjust _Time..."
-msgstr "Prilagodi _Äas ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:2
-msgid "Arrange _by"
-msgstr "Uredi _po"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:4
-msgid "By _Date"
-msgstr "Po _datumu"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:5
-msgid "By _Import Roll"
-msgstr "Po _uvoznem zvitku"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:6
-msgid "By _Rating"
-msgstr "Po _oceni"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:7
-msgid "Copy"
-msgstr "Kopiraj"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:8
-msgid "Create New _Tag..."
-msgstr "Ustvari novo _oznako ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:9
-msgid "Create _New Version..."
-msgstr "Ustvari _novo razliÄico ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:10
-msgid "De_tach Version"
-msgstr "O_dpni razliÄico"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:11
-msgid "Fin_d"
-msgstr "Naj_di"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:12
-msgid "Manage _Extensions"
-msgstr "Upravljanje _razÅiritev"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:13
-msgid "Page Set_up..."
-msgstr "Nas_tavitve strani ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:14
-msgid "Re_fresh Thumbnail"
-msgstr "O_sveÅi sliÄico"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:18
-msgid "Select _All"
-msgstr "Izberi _vse"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:19
-msgid "Select _None"
-msgstr "Ne izberi _niÄesar"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:20
-msgid "Send by _Mail..."
-msgstr "PoÅlji po _poÅti ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:21
-#: ../src/Clients/MainApp/ui/single_view.ui.h:3
-msgid "Set as _Background"
-msgstr "Nastavi kot _ozadje"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:22
-msgid "Side_bar"
-msgstr "Stranska v_rstica"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:23
-msgid "T_ags"
-msgstr "Ozn_ake"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:24
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1118
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1119
-msgid "Tags: "
-msgstr "Oznake:"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:25
-msgid "Thumbnail _elements"
-msgstr "_Elementi sliÄic"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:26
-msgid "Too_lbar"
-msgstr "O_rodna vrstica"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:27
-msgid "View"
-msgstr "Pogled"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:28
-#: ../src/Clients/MainApp/ui/single_view.ui.h:7
-msgid "Zoom _in"
-msgstr "_PribliÅaj"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:29
-#: ../src/Clients/MainApp/ui/single_view.ui.h:8
-msgid "Zoom _out"
-msgstr "_Oddalji"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:30
-#: ../src/Clients/MainApp/ui/single_view.ui.h:9
-msgid "Zoom in"
-msgstr "PribliÅaj"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:31
-#: ../src/Clients/MainApp/ui/single_view.ui.h:10
-msgid "Zoom out"
-msgstr "Oddalji"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:32
-msgid "_Attach Tag"
-msgstr "_Pripni oznake"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:33
-msgid "_Attach Tag to Selection"
-msgstr "_Pripni oznako izboru"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:35
-msgid "_Clear Rating Filter"
-msgstr "_PoÄisti filter ocen"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:36
-msgid "_Clear Roll Filter"
-msgstr "_PoÄisti filter zvitkov"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:37
-msgid "_Close"
-msgstr "_Zapri"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:38
-msgid "_Components"
-msgstr "_Sestavni deli"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:39
-msgid "_Contents"
-msgstr "_Vsebina"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:40
-msgid "_Dates"
-msgstr "_Datumi"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:42
-msgid "_Delete Selected Tag"
-msgstr "_IzbriÅi izbrano oznako"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:43
-msgid "_Delete Version"
-msgstr "_IzbriÅi razliÄico"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:44
-#: ../src/Clients/MainApp/ui/single_view.ui.h:11
-msgid "_Edit"
-msgstr "_Uredi"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:45
-msgid "_Edit Tag..."
-msgstr "_Uredi oznako ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:46
-msgid "_Export to"
-msgstr "_Izvozi v"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:47
-msgid "_Filmstrip"
-msgstr "_Filmski trak"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:48
-#: ../src/Clients/MainApp/ui/single_view.ui.h:13
-msgid "_Fullscreen"
-msgstr "_Celozaslonski naÄin"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:49
-#: ../src/Clients/MainApp/ui/single_view.ui.h:14
-msgid "_Help"
-msgstr "Pomo_Ä"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:50
-msgid "_Hidden"
-msgstr "_Skrito"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:51
-msgid "_Import..."
-msgstr "_Uvozi ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:52
-msgid "_Invert Selection"
-msgstr "Obrni _izbor"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:53
-msgid "_Large"
-msgstr "_Velike"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:54
-msgid "_Last Import Roll"
-msgstr "_Zadnji uvozni zvitek"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:55
-msgid "_Loupe"
-msgstr "_LeÄa"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:56
-msgid "_Medium"
-msgstr "_Srednje"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:57
-#: ../src/Clients/MainApp/ui/single_view.ui.h:15
-msgid "_Photo"
-msgstr "_Fotografija"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:58
-msgid "_Quit"
-msgstr "_KonÄaj"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:59
-msgid "_Ratings"
-msgstr "_Ocene"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:61
-msgid "_Remove Tag From Selection"
-msgstr "_Odstrani oznako iz izbora"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:62
-msgid "_Rename Version"
-msgstr "_Preimenuj razliÄico"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:63
-msgid "_Reverse Order"
-msgstr "_Obrnjen vrstni red"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:64
-msgid "_Select Import Rolls..."
-msgstr "Izberi _uvozne zvitke ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:65
-msgid "_Set Date Range..."
-msgstr "Nastavi _obsega datumov ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:66
-msgid "_Set Rating filter..."
-msgstr "_Nastavi filter ocen ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:67
-msgid "_Sharpen..."
-msgstr "_Izostri ..."
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:68
-#: ../src/Clients/MainApp/ui/single_view.ui.h:16
-msgid "_Slideshow"
-msgstr "_Diapredstavitev"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:69
-msgid "_Small"
-msgstr "_Majhne"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:70
-msgid "_Tag Icons"
-msgstr "_Ikone oznak"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:71
-msgid "_Tags"
-msgstr "O_znake"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:72
-msgid "_Timeline"
-msgstr "_Äasovnica"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:73
-msgid "_Tools"
-msgstr "_Orodja"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:74
-msgid "_Untagged Photos"
-msgstr "_NeoznaÄene fotografije"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:75
-msgid "_Version"
-msgstr "_RazliÄica"
-
-#: ../src/Clients/MainApp/ui/main_window.ui.h:76
-#: ../src/Clients/MainApp/ui/single_view.ui.h:18
-msgid "_View"
-msgstr "_Pogled"
-
-#: ../src/Clients/MainApp/ui/single_view.ui.h:1
-msgid "Display File _Names"
-msgstr "Prikaz imen _datotek"
-
-#: ../src/Clients/MainApp/ui/single_view.ui.h:2
-msgid "F-Spot View"
-msgstr "F-Spot pogled"
-
-#: ../src/Clients/MainApp/ui/single_view.ui.h:4
-msgid "Show or hide the side pane"
-msgstr "PokaÅe ali skrije stranski pladenj"
-
-#: ../src/Clients/MainApp/ui/single_view.ui.h:5
-msgid "Show or hide the toolbar"
-msgstr "PokaÅe ali skrije orodno vrstico"
-
-#: ../src/Clients/MainApp/ui/single_view.ui.h:6
-msgid "Side _pane"
-msgstr "_Stranski pladenj"
-
-#: ../src/Clients/MainApp/ui/single_view.ui.h:12
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:7
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:14
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:13
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:8
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:7
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:8
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:9
-msgid "_Export"
-msgstr "_Izvozi"
-
-#: ../src/Clients/MainApp/ui/single_view.ui.h:17
-msgid "_Toolbar"
-msgstr "_Orodna vrstica"
-
-#: ../src/Clients/MainApp/ui/tag_selection_dialog.ui.h:1
-msgid "Select a Tag..."
-msgstr "Izbor oznake ..."
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:1
-msgid "<b>Image Interpolation</b>"
-msgstr "<b>Interpolacija slike</b>"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:2
-msgid "<b>Transparent Parts</b>"
-msgstr "<b>Prozorni deli</b>"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:3
-msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
-msgstr "<small><i>MoÅnost omogoÄa interpolacijo pribliÅanih slik. Ta moÅnost za ogled fotografij ni priporoÄena, toda njeno onemogoÄanje bi lahko bilo uporabno pri oblikovanju ikon.</i></small>"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:4
-msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
-msgstr "<small><i>MogoÄe je izbrati naÄin prikaza prozornih delov slik. Ta moÅnost ne vpliva na fotografije, vendar je lahko koristna pri ogledu ikon in ostalih grafiÄnih podob s prozornimi deli.</i></small>"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:5
-msgid "As _background"
-msgstr "Kot _ozadje"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:6
-msgid "As _custom color: "
-msgstr "Kot barvo _po meri"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:7
-msgid "As check _pattern"
-msgstr "Kot _vzorec Åahovnice"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:8
-msgid "Preferences"
-msgstr "MoÅnosti"
-
-#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:9
-msgid "_Interpolate image on zoom"
-msgstr "_Interpolacija slike pri pribliÅanju"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:141
-msgid "Page Setup"
-msgstr "Nastavitve strani"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:145
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:149
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:155
-#, csharp-format
-msgid "Paper Size: {0} x {1} mm"
-msgstr "Velikost papirja: {0} x {1} mm"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:152
-msgid "Set Page Size and Orientation"
-msgstr "Nastavi velikost in usmerjenost strani"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:163
-msgid "Photos per page"
-msgstr "Fotografije na stran"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:173
-msgid "Repeat"
-msgstr "Ponavljanje"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:174
-msgid "Print cut marks"
-msgstr "Natisni oznake za izrez"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:180
-msgid "Photos layout"
-msgstr "Razporeditev fotografij"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:182
-msgid "Full Page (no margin)"
-msgstr "Polna stran (brez robov)"
-
-#. Note for translators: "Zoom" is a Fit Mode
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:185
-msgid "Zoom"
-msgstr "PribliÅevanje"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:186
-msgid "Fill"
-msgstr "Zapolni"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:187
-msgid "Scaled"
-msgstr "Prilagojena velikost"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:192
-msgid "White borders"
-msgstr "Bele obrobe"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:198
-msgid "Custom Text"
-msgstr "Besedilo po meri"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:202
-msgid "Photos infos"
-msgstr "Podrobnosti o fotografijah"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:204
-msgid "Print file name"
-msgstr "Natisni ime datoteke"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:205
-msgid "Print photo date"
-msgstr "Natisni datum posnetka fotografije"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:206
-msgid "Print photo time"
-msgstr "Natisni Äas posnetka fotografije"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:207
-msgid "Print photo tags"
-msgstr "Natisni oznake fotografij"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:208
-msgid "Print photo comment"
-msgstr "Natisni opombe fotografij"
-
-#: ../src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs:88
-msgid "No applications available"
-msgstr "Ni razpoloÅljivih programov"
-
-#: ../src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs:38
-msgid "Blackout"
-msgstr "PoÄrni"
-
-#: ../src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs:46
-msgid "Select the area that you want blacked out."
-msgstr "Izberite podroÄje, ki ga Åelite poÄrniti."
-
-#: ../src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs:41
-msgid "Convert to B/W"
-msgstr "Pretvori v Ärno-blo"
-
-#: ../src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs:44
-msgid "Apply"
-msgstr "Uveljavi"
-
-#: ../src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs:37
-msgid "Flip"
-msgstr "Zrcaljenje"
-
-#: ../src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs:40
-msgid "Pixelate"
-msgstr "Pretvori v toÄke"
-
-#: ../src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs:48
-msgid "Select the area that you want pixelated."
-msgstr "Izberite podroÄje, ki ga Åelite pretvoriti v toÄke."
-
-#: ../src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs:42
-msgid "Resize"
-msgstr "Spremeni velikost"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:79
-msgid "Transferring Pictures"
-msgstr "PrenaÅanje slik"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:132
-#, csharp-format
-msgid "Transferring picture \"{0}\" To CD"
-msgstr "PrenaÅanje slike \"{0}\" na CD"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:147
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:392
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:421
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:237
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:288
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:255
-msgid "Done Sending Photos"
-msgstr "PoÅiljanje fotografij je konÄano"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:149
-msgid "Transfer Complete"
-msgstr "Prenos je konÄan"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:156
-msgid "Error While Transferring"
-msgstr "Napaka med prenosom"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:164
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:299
-msgid "Error Transferring"
-msgstr "Napaka prenosa"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:174
-msgid "copying..."
-msgstr "kopiranje ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:1
-msgid "<b><i>There are some previously scheduled items to write</i></b>"
-msgstr "<b><i>Obstaja nekaj predhodno razporejenih predmetov za zapis</i></b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:2
-msgid "<b>Photos to Burn</b>"
-msgstr "<b>Fotografije za zapis</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:3
-msgid "Create CD"
-msgstr "Ustvari CD"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:5
-msgid "Size of the exported selection:"
-msgstr "Velikost izvoÅenega izbora:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:6
-msgid "_Browse Previously Scheduled Files"
-msgstr "_Brskaj po predhodno razporejenih datotekah"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:8
-msgid "_Write only these photos to CD"
-msgstr "_ZapiÅi le te fotografije na CD"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:111
-msgid "Waiting for authorization"
-msgstr "Äakanje na overitev"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:112
-msgid ""
-"F-Spot will now launch your browser so that you can enable the permission you just selected.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok\" below."
-msgstr ""
-"F-Spot bo sedaj zagnal vaÅ brskalnik, zato da lahko omogoÄite dovoljenja, ki ste jih izbrali.\n"
-"\n"
-"Ko bo Facebook zahteval vrnitev k programu, spodaj kliknite \"V redu\"."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:296
-msgid "Too many images to export"
-msgstr "DoloÄenih je preveÄ slik za izvoz"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:297
-#, csharp-format
-msgid "Facebook only permits {0} photographs per album. Please refine your selection and try again."
-msgstr "Facebook omogoÄa le {0} fotografij na album. Treba je izpopolniti izbiro in poskusiti ponovno. "
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:312
-msgid "Album must have a name"
-msgstr "Album mora imeti ime"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:313
-msgid "Please name your album or choose an existing album."
-msgstr "Poimenujte album ali izberite obstojeÄi album."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:327
-msgid "Creating a new album failed"
-msgstr "Ustvarjanje novega albuma je spodletelo"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:328
-#, csharp-format
-msgid ""
-"An error occurred creating a new album.\n"
-"\n"
-"{0}"
-msgstr ""
-"Med ustvarjanjem novega albuma je priÅlo do napake.\n"
-"\n"
-"{0}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:341
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:516
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:168
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:184
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:174
-msgid "Uploading Pictures"
-msgstr "PoÅiljanje slik"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:369
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:243
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:213
-#, csharp-format
-msgid "Uploading picture \"{0}\" ({1} of {2})"
-msgstr "PoÅiljanje slike \"{0}\" ({1} od {2})"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:383
-#, csharp-format
-msgid "Error Uploading To Facebook: {0}"
-msgstr "Napaka med poÅiljanjem na Facebook: {0}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:384
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:412
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:248
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:229
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:277
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:244
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:321
-msgid "Error"
-msgstr "Napaka"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:394
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:423
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:239
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:290
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:257
-msgid "Upload Complete"
-msgstr "PoÅiljanje je konÄano"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:397
-msgid "Visit F-Spot group on Facebook"
-msgstr "ObiÅÄi skupino F-Spot na Facebook"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:231
-msgid "Waiting for authentication"
-msgstr "Äakanje na overitev"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:232
-msgid ""
-"F-Spot will now launch your browser so that you can log into Facebook.\n"
-"\n"
-"Once you are directed by Facebook to return to this application, click \"Ok\" below. F-Spot will cache your session in gnome-keyring, if possible, and re-use it on future Facebook exports."
-msgstr ""
-"Program F-Spot bo zagnal brskalnik za prijavo v Facebook.\n"
-"\n"
-"Ko vas Facebook usmeri v vrnitev v ta program, kliknite \"V redu\" spodaj. F-Spot bo, Äe bo mogoÄe, vaÅo sejo shranil v gnome-keyring in jo uporabil pri prihodnjih izvozih v Facebook."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:237
-msgid "Authenticating..."
-msgstr "Overjanje ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:247
-msgid "Error logging into Facebook"
-msgstr "Napaka med prijavljanjem v Facebook"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:248
-msgid "There was a problem logging into Facebook. Check your credentials and try again."
-msgstr "PriÅlo je do teÅav med prijavljanjem v Facebook. Preverite svoje geslo in poskusite znova. "
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:257
-msgid "Authorizing Session"
-msgstr "PooblaÅÄanje seje"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:266
-msgid "Session established, fetching user info..."
-msgstr "Seja je zagnana, pridobivanje podrobnosti o uporabniku ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:272
-msgid "Session established, fetching friend list..."
-msgstr "Seja je zagnana, pridobivanje seznama prijateljev ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:282
-msgid "Session established, fetching friend details..."
-msgstr "Seja je zagnana, pridobivanje podrobnosti o prijateljih ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:294
-msgid "Session established, fetching photo albums..."
-msgstr "Seja je zagnana, pridobivanje albumov fotografij ..."
-
-#. Note for translators: {0} and {1} are respectively firstname and surname of the user
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:304
-#, csharp-format
-msgid "{0} {1} is logged into Facebook"
-msgstr "{0} {1} je prijavljen v Facebook"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:313
-msgid "Facebook Connection Error"
-msgstr "Napaka povezovanja s Facebook-om"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:314
-#, csharp-format
-msgid ""
-"There was an error when downloading your information from Facebook.\n"
-"\n"
-"Facebook said: {0}"
-msgstr ""
-"PriÅlo je do napake med nalaganjem vaÅih podrobnosti s Facebook-a.\n"
-"\n"
-"Javljena napaka: {0}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:343
-msgid "You are not logged in."
-msgstr "Niste prijavljeni."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:1
-msgid "Auto-confirm Photos"
-msgstr "Samodejno potrjevanje fotografij"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:2
-msgid "Caption"
-msgstr "Naslov"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:3
-msgid "Create a new album"
-msgstr "Ustvari nov album"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:4
-msgid "Description"
-msgstr "Opis"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:5
-msgid "Export to Facebook"
-msgstr "Izvozi v Facebook"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:6
-msgid "In this photo"
-msgstr "Na tej fotografiji"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:7
-msgid "Location"
-msgstr "Mesto"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:8
-msgid "Login"
-msgstr "Prijava"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:9
-msgid "Logout"
-msgstr "Odjava"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:11
-msgid "Not logged in"
-msgstr "Ni prijavljen"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:12
-msgid "Permissions:"
-msgstr "Dovoljenja:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:13
-msgid "Stay Connected"
-msgstr "Ostani povezan"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:14
-msgid "Use an existing album"
-msgstr "Uporabi obstojeÄi album"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:15
-msgid "Who is this?"
-msgstr "Kdo je to?"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:139
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:5
-msgid "Authorize"
-msgstr "Pooblasti"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:145
-#, csharp-format
-msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
-msgstr "Po konÄanem postopku pooblastitve na {0} se vrnite v to okno in kliknite gumb \"KonÄanj pooblastitev\" spodaj"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:146
-msgid "Complete Authorization"
-msgstr "KonÄaj pooblastitev"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:151
-#, csharp-format
-msgid "Logging into {0}"
-msgstr "Prijavljanje v {0}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:152
-msgid "Checking credentials..."
-msgstr "Preverjanje gesla ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:159
-#, csharp-format
-msgid "Welcome {0} you are connected to {1}"
-msgstr "DobrodoÅli {0}, povezani ste na {1}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:162
-#, csharp-format
-msgid "Sign in as a different user"
-msgstr "Prijava kot drug uporabnik"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:167
-#, csharp-format
-msgid "Used {0} of your allowed {1} monthly quota"
-msgstr "Uporabljene je {0} od dovoljene meseÄne kvote {1}."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:270
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:339
-msgid "Unable to log on"
-msgstr "Ni se mogoÄe prijaviti"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:359
-#, csharp-format
-msgid "Waiting for response {0} of {1}"
-msgstr "Äakanje na odziv {0} od {1}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:386
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:210
-#, csharp-format
-msgid "Uploading picture \"{0}\""
-msgstr "PoÅiljanje slike \"{0}\""
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:409
-#, csharp-format
-msgid "Error Uploading To {0}: {1}"
-msgstr "Napaka med poÅiljanjem na {0}: {1}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:496
-msgid "Unable to log on."
-msgstr "Ni se mogoÄe prijaviti."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:497
-#, csharp-format
-msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
-msgstr "Ni se mogoÄe prijaviti na {0}. PrepriÄajte se, da ste dali pooblastitev z uporabo vmesnika spletnega brskalnika {0}."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:1
-msgid "<b>Account</b>"
-msgstr "<b>RaÄun</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:3
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:4
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:4
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:4
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:4
-msgid "<b>Style</b>"
-msgstr "<b>Slog</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:4
-msgid "<b>Viewing permissions</b>"
-msgstr "<b>Dovoljenja za ogled</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:7
-msgid "Export tag _hierarchy"
-msgstr "Izvozi _hierarhijo oznak"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:8
-msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
-msgstr "F-Spot potrebuje pooblastitev za nalaganje fotografij na vaÅ raÄun {0}. Pritisnite gumb \"Pooblastitev\" za odprtje spletnega brskalnika in pooblastitev F-Spota."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:9
-msgid "Ignore _top level tags"
-msgstr "Prezri oznake _zgornjih ravni"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:10
-msgid "Private"
-msgstr "Zasebno"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:11
-msgid "Public"
-msgstr "Javno"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:12
-msgid "Visible to Family"
-msgstr "Vidno druÅini"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:13
-msgid "Visible to Friends"
-msgstr "Vidno prijateljem"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:15
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:8
-msgid "_Export tags"
-msgstr "Izvozi ozna_ke"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:16
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:15
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:11
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:11
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:10
-msgid "_Resize to: "
-msgstr "Sp_remeni velikost na:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:17
-msgid "_View photos in browser when done uploading"
-msgstr "Ogled fotografij _v brskalniku po konÄanem poÅiljanju"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:18
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:17
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:12
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:12
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:11
-msgid "pixels"
-msgstr "toÄke"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:150
-msgid "Select Export Folder"
-msgstr "Izbor mape za izvoz"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:202
-msgid "Building Gallery"
-msgstr "Gradnja galerije"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:239
-#, csharp-format
-msgid "Exporting \"{0}\"..."
-msgstr "IzvaÅanje \"{0}\" ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:246
-#, csharp-format
-msgid "Error Copying \"{0}\" to Gallery:{2}{1}"
-msgstr "Napaka med kopiranjem \"{0}\" v galerijo: {2}{1}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:272
-#, csharp-format
-msgid "Transferring to \"{0}\""
-msgstr "PrenaÅanje na \"{0}\""
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:273
-msgid "Transferring..."
-msgstr "PrenaÅanje ..."
-
-#. No need to check result here as if result is not true, an Exception will be thrown before
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:278
-msgid "Export Complete."
-msgstr "Izvoz je konÄan."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:280
-msgid "Exporting Photos Completed."
-msgstr "IzvaÅanje fotografij je konÄano."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:345
-msgid "Exporting Photos"
-msgstr "IzvaÅanje fotografij"
-
-#. Note for translators: light as clear, opposite as dark
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:749
-msgid "Light"
-msgstr "Svetlo"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:750
-msgid "Dark"
-msgstr "Temno"
-
-#. Abbreviation of previous
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:930
-msgid "Prev"
-msgstr "Predhodna"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:932
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1173
-msgid "Index"
-msgstr "Kazalo"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1042
-msgid "Gallery generated by"
-msgstr "Galerijo je ustvaril"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1082
-msgid "Show Styles"
-msgstr "PokaÅi sloge"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1083
-msgid "Hide Styles"
-msgstr "Skrij sloge"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1250
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1383
-msgid "Page:"
-msgstr "Stran:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:1
-msgid "<b>Destination</b>"
-msgstr "<b>Cilj</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:2
-msgid "<b>Export Method</b>"
-msgstr "<b>NaÄin izvoza</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:5
-msgid "Create _gallery using \"Original\""
-msgstr "Ustvari galerijo z uporabo \"Izvirnika\""
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:6
-msgid "Create standalone _web gallery"
-msgstr "Ustvari samostojno spletno _galerijo"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:7
-msgid "D_escription:"
-msgstr "Op_is:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:8
-msgid "Export _tags"
-msgstr "Izvozi oz_nake"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:9
-msgid "Export tag _icons"
-msgstr "Izvozi _ikone oznak"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:11
-msgid "G_allery Name:"
-msgstr "Ime g_alerije:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:12
-msgid "Open _destination when done exporting"
-msgstr "_Odpiri cilj po konÄanem izvozu"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:14
-msgid "_Folder:"
-msgstr "_Mapa:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:16
-msgid "_Save the files only"
-msgstr "_Shrani le datoteke"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:132
-msgid "Invalid URL"
-msgstr "Neveljaven URL"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:133
-msgid "The gallery URL entry does not appear to be a valid URL"
-msgstr "URL galerije ni videti kot veljaven URL"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:143
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:170
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:181
-msgid "Error while connecting to Gallery"
-msgstr "Med povezovanjem z galerijo je priÅlo do napake"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:144
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:171
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:182
-#, csharp-format
-msgid "The following error was encountered while attempting to log in: {0}"
-msgstr "Med poskusom prijave je priÅlo do naslednje napake: {0}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:158
-msgid "A Gallery with this name already exists"
-msgstr "Galerija s tem imenom Åe obstaja"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:159
-#, csharp-format
-msgid "There is already a Gallery with the same name in your registered Galleries. Please choose a unique name."
-msgstr "Galerija s tem imenom Åe obstaja v vpisanih galerijah. Izberite edinstveno ime."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs:327
-msgid "Unhandled exception"
-msgstr "Nesprejeta izjema"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs:82
-msgid ""
-"Cannot connect to a Gallery for which the version is unknown.\n"
-"Please check that you have Remote plugin 1.0.8 or later"
-msgstr ""
-"Ni se mogoÄe povezati z galerijo neznane razliÄice.\n"
-"NaloÅiti je treba vstavek Remote razliÄice 1.0.8. ali kasnejÅe"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs:95
-msgid "(TopLevel)"
-msgstr "(Vrhnja raven)"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs:149
-msgid "Invalid Gallery name"
-msgstr "Neveljavno ime galerije"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs:150
-msgid ""
-"The gallery name contains invalid characters.\n"
-"Only letters, numbers, - and _ are allowed"
-msgstr ""
-"Ime galerije vsebuje neveljavne znake.\n"
-"Dovoljene so le Ärke, Åtevilke ter - in _"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:228
-#, csharp-format
-msgid "Error uploading picture \"{0}\" to Gallery: {1}"
-msgstr "Napaka med poÅiljanjem slike \"{0}\" v galerijo: {1}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:253
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:312
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:272
-msgid "(No Gallery)"
-msgstr "(Ni galerije)"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:339
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:431
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:363
-msgid "(Not Connected)"
-msgstr "(Ni Povezave)"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:340
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:432
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:364
-msgid "(No Albums)"
-msgstr "(Ni Albumov)"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:381
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:490
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:401
-msgid "No account selected"
-msgstr "Noben raÄun ni bil izbran"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:382
-msgid "Error reading server response"
-msgstr "Napaka med branjem odziva streÅnika"
-
-#. failed to find the response
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:394
-msgid "Server returned response without Gallery content"
-msgstr "StreÅnik je vrnil odgovor brez vsebine Galerije"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:717
-msgid "Error while creating new album"
-msgstr "Napaka med ustvarjanjem novega albuma"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:718
-#, csharp-format
-msgid ""
-"The following error was encountered while attempting to perform the requested operation:\n"
-"{0} ({1})"
-msgstr ""
-"Med poskusom izvajanja zahtevanega opravila je priÅlo do napake:\n"
-"{0} ({1})"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:1
-msgid "_Album Name:"
-msgstr "Ime _albuma:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:2
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_album_dialog.ui.h:3
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_album_dialog.ui.h:3
-msgid "_Description:"
-msgstr "O_pis:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:3
-msgid "_Parent Album:"
-msgstr "_Nadrejeni album:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:4
-msgid "_Title:"
-msgstr "_Naslov:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:1
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:1
-msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
-msgstr "<span weight='bold' size='larger'>Napaka med povezovanjem z galerijo</span>\n"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:3
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:5
-msgid "Please verify that the settings for this gallery are correct."
-msgstr "Potrdite, da so nastavitve za to galerijo pravilne."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:4
-msgid "U_RL:"
-msgstr "U_RL:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:5
-msgid "_Gallery Name:"
-msgstr "Ime _galerije:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:6
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:10
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_dialog.ui.h:1
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:10
-msgid "_Password:"
-msgstr "_Geslo:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:7
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:11
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_dialog.ui.h:2
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:11
-msgid "_Username:"
-msgstr "_UporabniÅko ime:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:1
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:1
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:1
-msgid "<b>Album</b>"
-msgstr "<b>Album</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:2
-msgid "<b>Gallery</b>"
-msgstr "<b>Galerija</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:6
-msgid "Export _titles and comments"
-msgstr "Izvozi _naslove in opombe"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:7
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:6
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:6
-msgid "Open _album in browser when done uploading"
-msgstr "_Odpri album v brskalniku po konÄanem poÅiljanju"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:9
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:9
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:9
-msgid "_Export to Album:"
-msgstr "Iz_voz v album:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:10
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:10
-msgid "_Gallery:"
-msgstr "_Galerija:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs:111
-msgid "Error while creating Album"
-msgstr "Napaka med ustvarjanjem albuma"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs:112
-#, csharp-format
-msgid "The following error was encountered while attempting to create an album: {0}"
-msgstr "Med poskusom ustvarjanja albuma je priÅlo do naslednje napake: {0}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:206
-#, csharp-format
-msgid "{0} Sent"
-msgstr "{0} poslanih"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:208
-#, csharp-format
-msgid "{0} of approx. {1}"
-msgstr "{0} od pribliÅno {1}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:275
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:242
-#, csharp-format
-msgid "Error Uploading To Gallery: {0}"
-msgstr "Napaka med poÅiljanjem v Galerijo: {0}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:363
-#, csharp-format
-msgid "Available space: {0}, {1}% used out of {2}"
-msgstr "Prostor na voljo: {0}, uporabljenih {1}% od {2}"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:467
-#, csharp-format
-msgid ""
-"The selected album has a limit of {0} pictures,\n"
-"which would be passed with the current selection of {1} images"
-msgstr ""
-"Izbrani album ima mejo {0} slik,\n"
-"Äemur bi zadostovala trenutna izbira {1} slik"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_album_dialog.ui.h:1
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_album_dialog.ui.h:1
-msgid "Public Album"
-msgstr "Javni album"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_album_dialog.ui.h:2
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_album_dialog.ui.h:2
-msgid "_Album Title:"
-msgstr "Naslov _albuma:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:3
-msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
-msgstr "<span weight='bold' size='larger'>VaÅ raÄun Google je zaklenjen</span>\n"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:6
-msgid ""
-"Please verify that the settings for this gallery are correct.\n"
-"Enter the letters as they are shown in the image in\n"
-"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
-msgstr ""
-"Potrdite, da so nastavitve za to galerijo pravilne.\n"
-"Vnesite Ärke, kot so prikazane na sliki v polju 'Captcha'.\n"
-"<i>Velikost Ärk ni pomembna</i>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:9
-msgid "_Captcha:"
-msgstr "_Captcha:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:3
-msgid "<b>PicasaWeb Export</b>"
-msgstr "<b>Izvoz PicasaWeb</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:3
-msgid "<b>SmugMug Export</b>"
-msgstr "<b>Izvoz SmugMug</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:7
-msgid "_Account:"
-msgstr "_RaÄun:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:310
-msgid "Done sending photos"
-msgstr "PoÅiljanje fotografij je konÄano"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:312
-msgid "Upload complete"
-msgstr "PoÅiljanje je konÄano"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:318
-msgid "Error uploading to Tabblo: "
-msgstr "Napaka med poÅiljanjem v Tabblo:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:1
-msgid "<b>F-Spot tags</b>"
-msgstr "<b>Oznake F-Spot</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:3
-msgid "<b>Tabblo account</b>"
-msgstr "<b>RaÄun Tabblo</b>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:4
-msgid "<small><i>F-Spot tags can help you track the export status of photos. Example: Use one tag for the photos that you plan to export, and another one for those already exported. Here, you can tell F-Spot to automatically replace these tags as appropriate.</i></small>"
-msgstr "<small><i>F-Spot oznake lahko olajÅajo sledenje izvoznemu stanju fotografij. Primer: uporaba ene oznake za fotografije, pripravljene na izvoz in druge za fotografije, ki so bile Åe izvoÅene. Tukaj lahko nastavite samodejno zamenjavo oznak.</i></small>"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:6
-msgid "Rem_ove from exported photos:"
-msgstr "_Odstrani iz izvoÅenih fotografij:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:7
-msgid "Select..."
-msgstr "Izberi ..."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:8
-msgid "_Attach to exported photos:"
-msgstr "_Pripni izvoÅenim fotografijam:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:1
-msgid "A trust error occured while attempting to access"
-msgstr "Med poskusom dostopa je priÅlo do napake zaupanja"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:2
-msgid "Abort this session"
-msgstr "Prekini to sejo"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:3
-msgid "Always trust this site's certificate"
-msgstr "Vedno zaupaj potrdilu te strani"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:4
-msgid "Do you wish to:"
-msgstr "Ali Åelite: "
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:5
-msgid "Trust Error"
-msgstr "Napaka zaupanja"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:6
-msgid "Trust the site's certificate this once"
-msgstr "Zaupaj potrdilu te strani tokrat"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:67
-msgid "This tool requires an active selection. Please select one or more pictures and try again"
-msgstr "To orodje zahteva dejavno izbiro. Izberite eno ali veÄ slik in poskusite znova."
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:83
-msgid "Select export folder"
-msgstr "Izbor mape za izvoz"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:121
-msgid "Exporting files"
-msgstr "Izvoz datotek"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:127
-#, csharp-format
-msgid "Preparing photo \"{0}\""
-msgstr "Pripravljanje fotografije \"{0}\""
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:1
-msgid "_Create"
-msgstr "_Ustvari"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:2
-msgid "_File name:"
-msgstr "_Ime datoteke:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:3
-msgid "_Location:"
-msgstr "_Mesto:"
-
-#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:4
-msgid "_Scale:"
-msgstr "M_erilo:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:1
-msgid "<b>Specify the toplevel Photos directories</b>"
-msgstr "<b>Navedite vrhnje mape fotografij</b>"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:2
-msgid "Change Photos directory"
-msgstr "Spremeni mapo fotograij"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:3
-msgid "Change base path (URI) to"
-msgstr "Spremeni osnovno pot (URI) v"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:4
-msgid "Old base path (URI) was"
-msgstr "Stara osnovna pot (URI) je bila"
-
-#: ../src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs:51
-msgid "Developing photos"
-msgstr "Razvijanje fotografij"
-
-#: ../src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs:58
-#, csharp-format
-msgid "Developing {0}"
-msgstr "Razvijanje {0}"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:128
-msgid "F-Spot Gallery"
-msgstr "Galerija F-Spot"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:129
-msgid "The web gallery seems to be offline now"
-msgstr "Videti je, da je spletna galerija trenutno nepovezana"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:130
-msgid "Show All"
-msgstr "PokaÅi vse"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:140
-#, csharp-format
-msgid "{0} photo"
-msgid_plural "{0} photos"
-msgstr[0] "{0} fotografij"
-msgstr[1] "{0} fotografija"
-msgstr[2] "{0} fotografiji"
-msgstr[3] "{0} fotografije"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:182
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:8
-msgid "Current View"
-msgstr "Trenutni pogled"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:185
-msgid "Selected"
-msgstr "Izbrano"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs:111
-msgid "none"
-msgstr "brez"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs:114
-#, csharp-format
-msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
-msgstr " Galerija: {0}, fotografij: {1}, zadnji odjemalec: {3}"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs:178
-msgid "Gallery is inactive"
-msgstr "Galerija je nedejavna"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:1
-msgid ""
-"<small><i>The gallery stays active until you either deactivate it or close\n"
-"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
-msgstr ""
-"<small><i>Galerija ostane dejavna dokler je ne izkljuÄite ali zaprete F-spota.\n"
-"PrepriÄajte se, da lahko do dostopajo krajevni obiskovalci tako da obidejo posredniÅki streÅnik HTTP.</i></small>"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:3
-msgid ""
-"<small><i>When the gallery is active, above is the URL you need to open \n"
-"on another computer to access the shared photos.</i></small>"
-msgstr ""
-"<small><i>Ko je galerija dejavna, je mogoÄe do fotografij v souporabi\n"
-"dostopati preko zgornjega URL-ja.</i></small>"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:5
-msgid "Activates and deactivates the web gallery"
-msgstr "OmogoÄi in onemogoÄi spletno galerijo"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:6
-msgid "Allow viewers to add tags"
-msgstr "Obiskovalcem dovoli dodajanje oznak"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:7
-msgid "Copy URL to clipboard"
-msgstr "Kopiraj URL na odloÅiÅÄe"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:9
-msgid "F-Spot Live Web Gallery"
-msgstr "Åiva spletna galerija F-Spot"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:10
-msgid "Gallery URL:"
-msgstr "URL galerije:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:11
-msgid "Limit number of shared photos to"
-msgstr "Omeji Åtevilo fotografij v souporabi na"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:12
-msgid "Options:"
-msgstr "MoÅnosti:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:13
-msgid "Photos with a Tag"
-msgstr "Fotografije z oznako"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:14
-msgid "Selected Photos"
-msgstr "Izbrane fotografije"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:15
-msgid "Share:"
-msgstr "Souporaba:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:16
-msgid "Views:"
-msgstr "Ogledov:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs:91
-msgid "Error opening the selected file"
-msgstr "Napaka med odpiranjem izbrane datoteke"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs:92
-#, csharp-format
-msgid ""
-"The file you selected is not a valid or supported database.\n"
-"\n"
-"Received exception \"{0}\"."
-msgstr ""
-"Izbrana datoteka ni veljavna ali podprta podatkovna zbirka.\n"
-"\n"
-"Prejeta je bila izjema \"{0}\"."
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs:57
-#, csharp-format
-msgid ""
-"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
-" Please select that folder so I can do the mapping.</big>"
-msgstr ""
-"<big>Podatkovna zbirka se navezuje na datoteke v mapi <b>{0}</b>.\n"
-"Izbrati je treba mapo za preslikavo.</big>"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:1
-msgid "<small><i>Choose the location of the database you want to import from</i></small>"
-msgstr "<small><i>Izbira mesta podatkovne zbirke za uvaÅanje</i></small>"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:2
-msgid ""
-"<small><i>Choose what to import from the selected db.\n"
-"\"New Rolls Only\" is the smart option that will avoid re-importing photos you could have imported during a previous operation.\n"
-"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
-"\"Everything\" will import everything, creating duplicates if you already imported from that database.</i></small>"
-msgstr ""
-"<small><i>Izberite kaj Åelite uvoziti iz izbrane podatkovne zbirke.\n"
-"\"Samo novi zvitki\" je pametna moÅnost, ki se bo izognila ponovnemu uvaÅanju Åe uvoÅenih fotografij.\n"
-"\"Posamezni uvozni zvitek\" omogoÄa izbiro zvitka za zdruÅevanje.\n"
-"\"Vse\" uvozi vse in ustvari dvojnike, Äe so bile fotografije iz te podatkovne zbirke Åe uvoÅene.</i></small>"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:6
-msgid "<small><i>Copy the images locally or keep them where they are. If you chose the later, be sure that this location will stay accessible from f-spot.</i></small>"
-msgstr "<small><i>Krajevno kopiranje slik ali izbira njihovega trenutnega mesta. V slednjem primeru se je treba prepriÄati, da bo to mesto ostalo dostopno iz f-spot-a.</i></small>"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:7
-msgid "A Single Import Roll"
-msgstr "Posamezen uvozni zvitek"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:8
-msgid "Copy images to photos folder"
-msgstr "Kopiranje slik v mapo fotografij"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:9
-msgid "Database Location:"
-msgstr "Mesto podatkovne zbirke:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:10
-msgid "Everything"
-msgstr "Vse"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:11
-msgid "Import:"
-msgstr "Uvozi:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:12
-msgid "Keep the images at their original location"
-msgstr "ObdrÅi slike na njihovem izvirnem mestu"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:13
-msgid "Merge another F-Spot collection"
-msgstr "ZdruÅitev druge zbirke F-Spot"
-
-#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:14
-msgid "New Rolls Only"
-msgstr "Samo novi zvitki"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:2
-msgid "Delay:"
-msgstr "Zamik:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:3
-msgid "Display:"
-msgstr "Zaslon:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:4
-msgid "Images tagged with:"
-msgstr "Slike oznaÄene z:"
-
-#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:5
-msgid "Make F-Spot my screensaver"
-msgstr "Naredi F-spot moj ohranjevalnik zaslona"
-
-#: ../src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs:45
-msgid "Cover"
-msgstr "Naslovnica"
-
-#: ../src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs:45
-msgid "Dissolve"
-msgstr "Raztapljanje"
-
-#: ../src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs:45
-msgid "Push"
-msgstr "Potisk"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:1
-msgid "Display a slideshow from F-Spot"
-msgstr "PrikaÅe F-Spotovo diapredstavitev"
-
-#: ../tools/f-spot-screensaver.desktop.in.h:2
-msgid "F-Spot photos"
-msgstr "F-Spot fotografije"
-
-#~ msgid "(wrong format)"
-#~ msgstr "(napaÄen zapis)"
-
-#~ msgid "(At least one File not found)"
-#~ msgstr "(vsaj ene datoteke ni mogoÄe najti)"
-
-#~ msgid "Show Photo Name"
-#~ msgstr "PokaÅi ime fotografije"
-
-#~ msgid ""
-#~ "Metadata of file {0} may be corrupt, refusing to write to it, falling "
-#~ "back to XMP sidecar."
-#~ msgstr ""
-#~ "Metapodatki datoteke {0} so morda pokvarjeni, zato ne bodo zapisani. "
-#~ "Uporabljena bo dodatna datoteka XMP."
-
-#~ msgid "Rating:"
-#~ msgstr "Ocena:"
-
-#~ msgid ""
-#~ "In order to detect duplicates on pictures you imported before 0.5.0, F-"
-#~ "Spot needs to analyze your image collection. This is not done by default "
-#~ "as it's time consuming. You can Start or Pause this update process using "
-#~ "this dialog."
-#~ msgstr ""
-#~ "Za zaznavanje dvojnikov slik, ki so bile uvoÅene pred 0.5.0, mora F-spot "
-#~ "preuÄiti zbirko slik. To ni storjeno samodejno, ker vzame veliko Äasa. V "
-#~ "temu pogovornemu oknu lahko postopek posodabljanja zaÅenete ali zaÄasno "
-#~ "zaustavite."
-
-#~ msgid ""
-#~ "You currently have {0} photos needing md5 calculation, and {1} pending "
-#~ "jobs"
-#~ msgstr ""
-#~ "Trenutno imate {0} fotografij, ki potrebujejo izraÄun md5 in {1} "
-#~ "ÄakajoÄih poslov"
-
-#~ msgid "Processing images..."
-#~ msgstr "Obdelavanje slik ..."
-
-#~ msgid "Stopped"
-#~ msgstr "Zaustavljeno"
-
-#~ msgid "Strip _metadata"
-#~ msgstr "Odstrani _metapodatke"
-
-#~ msgid "Check for Duplicates..."
-#~ msgstr "Zaznaj dvojnike ..."
-
-#~ msgid "F-Spot Encountered a Fatal Error"
-#~ msgstr "PriÅlo je do usodne napake"
-
-#~ msgid "Error Details"
-#~ msgstr "Podrobnosti napake"
-
-#~ msgid "An unhandled exception was thrown: "
-#~ msgstr "Nesprejeto izjemno dejanje:"
-
-#~ msgid "Attach Tags:"
-#~ msgstr "Pripenjanje oznak:"
-
-#~ msgid "Autorotate"
-#~ msgstr "Samodejno vrtenje"
-
-#~ msgid "_Autorotate"
-#~ msgstr "S_amodejno vrtenje"
-
-#~ msgid "Unknown transform type %d"
-#~ msgstr "Neznana vrsta pretvorbe %d"
-
-#~ msgid "Operation failed"
-#~ msgstr "Dejanje ni uspelo"
-
-#~ msgid "No way to save files of type \"{0}\""
-#~ msgstr "Ni naÄina za shranjevanje datotek vrste \"{0}\""
-
-#~ msgid "Thumbnail Directory"
-#~ msgstr "Mapa sliÄic"
-
-#~ msgid "Exif Directory"
-#~ msgstr "Exif mapa"
-
-#~ msgid "GPS Directory"
-#~ msgstr "GPS mapa"
-
-#~ msgid "InterOperability Directory"
-#~ msgstr "Mapa vzajemnega delovanja"
-
-#~ msgid "Unknown Directory"
-#~ msgstr "Neznana mapa"
-
-#~ msgid "Writing to this file format is not supported"
-#~ msgstr "Pisanje v to vrsto datoteke ni podprto"
-
-#~ msgid "IPTC Information Interchange Model (IIM) Version number"
-#~ msgstr "Åtevilka razliÄice IPTC Informacijsko Izmenjalnega Modela (IIM) "
-
-#~ msgid "OSI Destination routing information"
-#~ msgstr "OSI podrobnosti o potovanju do cilja"
-
-#~ msgid "IPTC file format"
-#~ msgstr "IPTC vrsta datoteke"
-
-#~ msgid "Identifies the provider and product"
-#~ msgstr "DoloÄa ponudnika in izdelek"
-
-#~ msgid "A unique number identifying the envelope"
-#~ msgstr "Edinstveno Åtevilo za doloÄevanje ovojnice"
-
-#~ msgid "A unique number"
-#~ msgstr "Edinstveno Åtevilo"
-
-#~ msgid ""
-#~ "The envelope handling priority between 1 (most urgent) and 9 (least "
-#~ "urgent)"
-#~ msgstr ""
-#~ "Prednost upravljanja ovojnice med 1 (najbolj nujno) in 9 (najmanj nujno)"
-
-#~ msgid "The year, month and day (CCYYMMDD) the service sent the material"
-#~ msgstr "Leto, mesec in dan (LLLLMMDD), ko je storitev poslala material"
-
-#~ msgid "The hour, minute and second (HHMMSS) the service sent the material"
-#~ msgstr "Ura, minuta in sekunda (UUMMSS), ko je storitev poslala material."
-
-#~ msgid "The character set designation"
-#~ msgstr "Imenovanje niza znakov"
-
-#~ msgid "External globally unique object identifier"
-#~ msgstr "Zunanje edinstveno doloÄilo predmeta"
-
-#~ msgid "Abstract Relationship Method (ARM) identifier"
-#~ msgstr "DoloÄilo metode abstraktnega razmerja (ARM)"
-
-#~ msgid "Abstract Relationship Method (ARM) version number."
-#~ msgstr "Åtevilka razliÄice metode abstraktnega razmerja (ARM)"
-
-#~ msgid "Number identifying the IIM version this application record uses"
-#~ msgstr "Åtevilka razliÄice IIM, ki jo uporablja programski zapis"
-
-#~ msgid "Object type reference"
-#~ msgstr "Sklic vrste predmeta"
-
-#~ msgid "Object attribute reference"
-#~ msgstr "Sklic atributov predmeta"
-
-#~ msgid "Object name"
-#~ msgstr "Ime predmeta"
-
-#~ msgid "Status of the objectdata according to the provider"
-#~ msgstr "Stanje podatkov predmeta glede na ponudnika"
-
-#~ msgid "Location within a city or area where the object originates"
-#~ msgstr "Kraj znotraj mesta ali obmoÄja od koder izvira vsebina"
-
-#~ msgid "Name of the city the content is focussing on"
-#~ msgstr "Ime mesta na katerega se osredotoÄa vsebina"
-
-#~ msgid "Copyright information for"
-#~ msgstr "Podrobnosti avtorskih pravic za "
-
-#~ msgid "Full name of the country of the focus of the content"
-#~ msgstr "Polno ime drÅave in osredotoÄenost vsebine"
-
-#~ msgid ""
-#~ "Two or three letter ISO3166 code of the country of the focus of the "
-#~ "content"
-#~ msgstr "Dvo ali tri Ärkovna ISO3166 koda drÅave in osredotoÄenost vsebine"
-
-#~ msgid "Creator of the content"
-#~ msgstr "Ustvarjalec vsebine"
-
-#~ msgid "Provider of the object"
-#~ msgstr "Ponudnik predmeta"
-
-#~ msgid "The title of the author or creator"
-#~ msgstr "Naslov avtorja ali ustvarjalca"
-
-#~ msgid ""
-#~ "The person involved in writing, editing or correcting the object data or "
-#~ "caption/abstract"
-#~ msgstr ""
-#~ "Oseba vkljuÄena v pisanje, urejanje ali popravljanje podatkov o predmetu "
-#~ "ali obnove"
-
-#~ msgid "Headline of the content"
-#~ msgstr "Naslovnica vsebine"
-
-#~ msgid ""
-#~ "Instructions from the creator to the receiver not covered by other fields"
-#~ msgstr ""
-#~ "Navodila od ustvarjalca za uporabnika, ki niso opredeljena z drugimi polji"
-
-#~ msgid "Intellectual genre of the object"
-#~ msgstr "Intelektualna zvrst predmeta"
-
-#~ msgid "Unknown IIM DataSet"
-#~ msgstr "Neznan IIM niz podatkov"
-
-#~ msgid "Title"
-#~ msgstr "Naslov"
-
-#~ msgid "Copyright"
-#~ msgstr "Avtorske pravice"
-
-#~ msgid "Subject and Keywords"
-#~ msgstr "Predmet in kljuÄne besede"
-
-#~ msgid "Compression"
-#~ msgstr "Stiskanje"
-
-#~ msgid "Planar Configuration"
-#~ msgstr "Nastavitev ravnine"
-
-#~ msgid "Orientation"
-#~ msgstr "Usmerjenost"
-
-#~ msgid "Photometric Interpretation"
-#~ msgstr "FotometriÄno tolmaÄenje"
-
-#~ msgid "Resolution Unit"
-#~ msgstr "Enota loÄljivosti"
-
-#~ msgid "Exposure Program"
-#~ msgstr "Program osvetlitve"
-
-#~ msgid "Metering Mode"
-#~ msgstr "NaÄin umerjanja"
-
-#~ msgid "Exposure Mode"
-#~ msgstr "NaÄin osvetlitve"
-
-#~ msgid "Custom Rendered"
-#~ msgstr "Izris po meri"
-
-#~ msgid "Components Configuration"
-#~ msgstr "Nastavitve enot"
-
-#~ msgid "Light Source"
-#~ msgstr "Vir svetlobe"
-
-#~ msgid "Sensing Method"
-#~ msgstr "Metoda zaznavanja"
-
-#~ msgid "Color Space"
-#~ msgstr "Barvni prostor"
-
-#~ msgid "White Balance"
-#~ msgstr "UravnoteÅenje beline"
-
-#~ msgid "Focal Plane Resolution Unit"
-#~ msgstr "Enota ploskovne loÄljivosti ÅariÅÄa."
-
-#~ msgid "File Source Type"
-#~ msgstr "Vrsta izvorne datoteke"
-
-#~ msgid "Scene Capture Type"
-#~ msgstr "Vrsta zajema scene"
-
-#~ msgid "Gain Control"
-#~ msgstr "Nadzor ojaÄitve"
-
-#~ msgid "Contrast"
-#~ msgstr "Kontrast"
-
-#~ msgid "Saturation"
-#~ msgstr "NasiÄenost"
-
-#~ msgid "Sharpness"
-#~ msgstr "Ostrina"
-
-#~ msgid "Scene Type"
-#~ msgstr "Vrsta scene"
-
-#~ msgid ""
-#~ "Specify if an original size picture should be rotated or not. Smaller "
-#~ "sizes are automatically rotated."
-#~ msgstr ""
-#~ "DoloÄa ali naj bo originalna slika zavrtena ali ne. ManjÅe velikosti so "
-#~ "samodejno zavrtene."
-
-#~ msgid "Unable to create temporary file"
-#~ msgstr "Ni mogoÄe ustvariti zaÄasne datoteke "
-
-#~ msgid "No Extended Metadata Available"
-#~ msgstr "RazÅirjeni metapodatki niso na voljo"
-
-#~ msgid "Country"
-#~ msgstr "DrÅava"
-
-#~ msgid "City"
-#~ msgstr "Mesto"
-
-#~ msgid "State"
-#~ msgstr "Regija"
-
-#~ msgid "Comment:"
-#~ msgstr "Opomba:"
-
-#~ msgid "Open _Folder..."
-#~ msgstr "Odpri _Mapo ..."
-
-#~ msgid "_New Window"
-#~ msgstr "_Novo Okno"
-
-#~ msgid "\n"
-#~ msgstr "\n"
-
-#~ msgid "<b>{0}</b>."
-#~ msgstr "<b>{0}</b>."
-
-#~ msgid "<small></small>"
-#~ msgstr "<small></small>"
-
-#~ msgid "Photo 0 of 0"
-#~ msgstr "Fotografija 0 od 0"
-
-#~ msgid "Preview"
-#~ msgstr "Predogled"
-
-#~ msgid "Path"
-#~ msgstr "Pot"
-
-#~ msgid "File"
-#~ msgstr "Datoteka"
-
-#~ msgid "Select Tag"
-#~ msgstr "Izbor oznake"
-
-#~ msgid "Downloading Previews"
-#~ msgstr "Nalaganje predogledov"
-
-#~ msgid "Downloading Preview of {0}"
-#~ msgstr "Nalaganje predogleda {0}"
-
-#~ msgid "Copying file {0} of {1}"
-#~ msgstr "Kopiranje datoteke {0} od {1}"
-
-#~ msgid "Error transferring file"
-#~ msgstr "Napaka med prenosom datoteke"
-
-#~ msgid "Download Complete"
-#~ msgstr "Prenos konÄan"
-
-#~ msgid "Done Copying Files"
-#~ msgstr "Kopiranje datotek konÄano"
-
-#~ msgid "Transferring \"{0}\" from camera"
-#~ msgstr "PrenaÅanje \"{0}\" s fotoaparata"
-
-#~ msgid "Port"
-#~ msgstr "Vrata"
-
-#~ msgid "Import error"
-#~ msgstr "Napaka uvaÅanja"
-
-#~ msgid "Error importing {0}{2}{2}{1}"
-#~ msgstr "Napaka med uvaÅanjem {0}{2}{2}{1}"
-
-#~ msgid " "
-#~ msgstr " "
-
-#~ msgid "<b></b>"
-#~ msgstr "<b></b>"
-
-#~ msgid "CD"
-#~ msgstr "CD"
-
-#~ msgid "Camera Selection"
-#~ msgstr "Izbira fotoaparata"
-
-#~ msgid "E-_Mail:"
-#~ msgstr "_E-poÅta:"
-
-#~ msgid "E_xport titles and comments"
-#~ msgstr "Izvozi _naslove in opombe"
-
-#~ msgid "G_allery:"
-#~ msgstr "G_alerija:"
-
-#~ msgid "Gallery"
-#~ msgstr "Galerija"
-
-#~ msgid "Pause"
-#~ msgstr "Premor"
-
-#~ msgid "Select Photos to Copy From Camera..."
-#~ msgstr "Izbor fotografij za kopiranje s fotoaparata"
-
-#~ msgid "Select the camera from which you want to transfer files"
-#~ msgstr "Izbor fotoaparata za prenos datotek"
-
-#~ msgid "Selected Camera: "
-#~ msgstr "Izbran fotoaparat:"
-
-#~ msgid "Strip image _metadata"
-#~ msgstr "Odstrani _metapodatke slike"
-
-#~ msgid "_Flickr"
-#~ msgstr "_Flickr"
-
-#~ msgid "_Gallery"
-#~ msgstr "_Galerija"
-
-#~ msgid "_Open album in browser when done uploading"
-#~ msgstr "_Odpri album v brskalniku po konÄanem nalaganju"
-
-#~ msgid "_Open destination when done exporting"
-#~ msgstr "_Odpiri cilj po konÄanem izvozu"
-
-#~ msgid "_Scale photos to no larger than: "
-#~ msgstr "_Spreminjanje velikosti fotografij na ne veÄ kot: "
-
-#~ msgid "_Strip metadata"
-#~ msgstr "O_dstrani metapodatke"
-
-#~ msgid "_URI:"
-#~ msgstr "_URI:"
-
-#~ msgid "_Virtual Filesystem"
-#~ msgstr "_Navidezni datoteÄni sistem"
-
-#~ msgid "x"
-#~ msgstr "x"
-
-#~ msgid "Done Loading"
-#~ msgstr "Nalaganje konÄano"
-
-#~ msgid "Directory does not exist."
-#~ msgstr "Mapa ne obstaja"
-
-#~ msgid ""
-#~ "The directory you selected \"{0}\" does not exist. Please choose a "
-#~ "different directory"
-#~ msgstr "Mapa \"{0}\", ki ste jo izbrali, ne obstaja. Izberite drugo mapo."
-
-#~ msgid "No cameras detected."
-#~ msgstr "Noben fotoaparat ni bil zaznan."
-
-#~ msgid ""
-#~ "F-Spot was unable to find any cameras attached to this system. Double "
-#~ "check that the camera is connected and has power"
-#~ msgstr ""
-#~ "Program F-spot ni zaznal v sistem povezanih fotoaparatov. Dvakrat "
-#~ "preverite, ali je fotoaparat povezan in priÅgan."
-
-#~ msgid "Error connecting to camera"
-#~ msgstr "Napaka med povezovanjem s fotoaparatom"
-
-#~ msgid "Received error \"{0}\" while connecting to camera"
-#~ msgstr "Med povezovanjem s fotoaparatom je bila prejeta napaka \"{0}\""
-
-#~ msgid "Reparented ({0})"
-#~ msgstr "RazliÄica slike ({0})"
-
-#~ msgid "Could not create a new version"
-#~ msgstr "Ni mogoÄe ustvariti nove razliÄice"
-
-#~ msgid "Received exception \"{0}\". Unable to create version \"{1}\""
-#~ msgstr ""
-#~ "Prejeta je bila napaka \"{0}\". Ni mogoÄe ustvariti razliÄice \"{1}\""
-
-#~ msgid "Really Delete?"
-#~ msgstr "ResniÄen izbris?"
-
-#~ msgid "Cancel"
-#~ msgstr "PrekliÄi"
-
-#~ msgid "Could not delete a version"
-#~ msgstr "Ni mogoÄe izbrisati razliÄice"
-
-#~ msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
-#~ msgstr ""
-#~ "Prejeta je bila napaka \"{0}\". Ni mogoÄe izbrisati razliÄice \"{1}\""
-
-#~ msgid "Could not rename a version"
-#~ msgstr "Ni mogoÄe preimenovati razliÄice"
-
-#~ msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
-#~ msgstr ""
-#~ "Prejeta je bila napaka \"{0}\". Ni mogoÄe preimenovati razliÄice v \"{1}\""
-
-#~ msgid "Error: Error while transferring; Aborting"
-#~ msgstr "Napaka: napaka med prenosom; preklicano"
-
-#~ msgid "Error: File Already Exists; Aborting"
-#~ msgstr "Napaka: datoteka Åe obstaja; preklicano"
-
-#~ msgid "Edit Selected Tag..."
-#~ msgstr "Uredi izbrane oznake ..."
-
-#~ msgid "_Edit Selected Tag..."
-#~ msgstr "_Uredi izbrane oznake ..."
-
-#~ msgid "Package"
-#~ msgstr "Paket"
-
-#~ msgid "Extension Installation"
-#~ msgstr "Namestitev razÅiritev"
-
-#~ msgid "<b>Select the extensions to install and click on Next</b>"
-#~ msgstr "<b>Izberite razÅiritve za namestitev in kliknite Naprej</b> "
-
-#~ msgid "Install from:"
-#~ msgstr "NameÅÄanje iz: "
-
-#~ msgid "_Repositories..."
-#~ msgstr "Sk_ladiÅÄa ..."
-
-#~ msgid "Show all packages"
-#~ msgstr "PokaÅi vse pakete"
-
-#~ msgid "Show new versions only"
-#~ msgstr "PokaÅi le nove razliÄice"
-
-#~ msgid "Show updates only"
-#~ msgstr "PokaÅi le posodobitve"
-
-#~ msgid "_Unselect All"
-#~ msgstr "_PoÄisti ves izbor"
-
-#~ msgid "label124"
-#~ msgstr "oznaka123"
-
-#~ msgid "Overall Progress:"
-#~ msgstr "Skupni napredek:"
-
-#~ msgid "Downloading extensions..."
-#~ msgstr "PrenaÅanje razÅiritev ..."
-
-#~ msgid "Extension Manager"
-#~ msgstr "Upravljalnik razÅiritev"
-
-#~ msgid "Additional extensions are required to perform this operation."
-#~ msgstr "Za izvajanje dejanja so obvezne dodatne razÅiritve."
-
-#~ msgid "The following extensions will be installed:"
-#~ msgstr "NameÅÄene bodo sledeÄe razÅiritve:"
-
-#~ msgid "<big><b>Extension Manager</b></big>"
-#~ msgstr "<big><b>Upravljalnik razÅiritev</b></big> "
-
-#~ msgid "The following extensions are currently installed:"
-#~ msgstr "Trenutno so nameÅÄene sledeÄe razÅiritve:"
-
-#~ msgid "_Install Extensions..."
-#~ msgstr "_Namesti razÅiritve ..."
-
-#~ msgid "_Uninstall..."
-#~ msgstr "_Odstrani ..."
-
-#~ msgid "Enable"
-#~ msgstr "OmogoÄi"
-
-#~ msgid "Disable"
-#~ msgstr "OnemogoÄi"
-
-#~ msgid "Extension Repository Management"
-#~ msgstr "Upravljanje skladiÅÄa razÅiritev"
-
-#~ msgid "Add New Repository"
-#~ msgstr "Dodajanje novega skladiÅÄa"
-
-#~ msgid "Select the location of the repository you want to register:"
-#~ msgstr "Izbor mesta skladiÅÄa za registracijo:"
-
-#~ msgid "Register an on-line repository"
-#~ msgstr "Registracija spletnega skladiÅÄa"
-
-#~ msgid "Url:"
-#~ msgstr "URL:"
-
-#~ msgid "Register a local repository"
-#~ msgstr "Registracija krajevnega skladiÅÄa."
-
-#~ msgid "Path:"
-#~ msgstr "Pot:"
-
-#~ msgid "Browse..."
-#~ msgstr "Prebrskaj ..."
-
-#~ msgid "Version:"
-#~ msgstr "RazliÄica:"
-
-#~ msgid "Author:"
-#~ msgstr "Avtor:"
-
-#~ msgid "Copyright:"
-#~ msgstr "Avtorske pravice:"
-
-#~ msgid "Extension Dependencies:"
-#~ msgstr "Odvisnosti razÅiritve:"
-
-#~ msgid "All registered repositories"
-#~ msgstr "Vsa registrirana skladiÅÄa"
-
-#~ msgid "Are you sure you want to cancel the installation?"
-#~ msgstr "Ali ste prepriÄani, da Åelite preklicati namestitev?"
-
-#~ msgid "The following packages will be uninstalled:"
-#~ msgstr "SledeÄi paketi bodo odstranjeni:"
-
-#~ msgid ""
-#~ "There are other extensions that depend on the previous ones which will "
-#~ "also be uninstalled:"
-#~ msgstr "Druge razÅiritve so odvisne od prejÅnjih in bodo tudi odstranjene:"
-
-#~ msgid ""
-#~ "The selected extensions can't be installed because there are dependency "
-#~ "conflicts."
-#~ msgstr ""
-#~ "Izbrane razÅiritve ne morejo biti nameÅÄene zaradi spora odvisnosti."
-
-#~ msgid "The following packages will be installed:"
-#~ msgstr "NameÅÄeni bodo sledeÄi paketi:"
-
-#~ msgid " (in user directory)"
-#~ msgstr "(v uporabnikovi mapi)"
-
-#~ msgid "The following packages need to be uninstalled:"
-#~ msgstr "Odstranjeni bodo sledeÄi paketi:"
-
-#~ msgid "The following dependencies could not be resolved:"
-#~ msgstr "Ni bilo zadoÅÄeno sledeÄim odvisnostim:"
-
-#~ msgid "The installation has been successfully completed."
-#~ msgstr "Namestitev je uspeÅno konÄana."
-
-#~ msgid "The installation failed!"
-#~ msgstr "Namestitev je spodletela!"
-
-#~ msgid "The installation has completed with warnings."
-#~ msgstr "Namestitev je zakljuÄena z opozorili."
-
-#~ msgid "The uninstallation has been successfully completed."
-#~ msgstr "Odstranjevanje namestitve je bilo uspeÅno zakljuÄeno."
-
-#~ msgid "The uninstallation failed!"
-#~ msgstr "Odstranjevanje namestitve je spodletelo!"
-
-#~ msgid "The uninstallation has completed with warnings."
-#~ msgstr "Odstranjevanje namestitve je bilo zakljuÄeno z opozorili."
-
-#~ msgid "Repository"
-#~ msgstr "SkladiÅÄe"
-
-#~ msgid "Installation cancelled"
-#~ msgstr "Namestitev je bila preklicana"
-
-#~ msgid "Some of the required extensions were not found"
-#~ msgstr "Nekaj zahtevanih razÅiritev ni bilo najdenih"
-
-#~ msgid "Installation failed"
-#~ msgstr "Namestitev ni uspela"
-
-#~ msgid "Extension"
-#~ msgstr "RazÅiritev"
-
-#~ msgid "Other"
-#~ msgstr "Ostalo"
-
-#~ msgid "Exception occurred: {0}"
-#~ msgstr "PriÅlo je do izjemne napake: {0}"
-
-#~ msgid "Disabled extensions can't be loaded."
-#~ msgstr "OnemogoÄene razÅiritve ne morejo biti naloÅene."
-
-#~ msgid "Loading {0} extension"
-#~ msgstr "Nalaganje razÅiritve {0}"
-
-#~ msgid "The required extension '{0}' is disabled."
-#~ msgstr "Zahtevana razÅiritev '{0}' je onemogoÄena."
-
-#~ msgid "The required extension '{0}' is not installed."
-#~ msgstr "Zahtevana razÅiritev '{0}' ni nameÅÄena."
-
-#~ msgid "(provided by {0})"
-#~ msgstr "(ponudnik {0})"
-
-#~ msgid "my photos"
-#~ msgstr "moje fotografije"
-
-#~ msgid "Copy Locat_ion"
-#~ msgstr "Kopiraj _mesto"
-
-#~ msgid "Reveal"
-#~ msgstr "Razodeni"
-
-#~ msgid "Wipe"
-#~ msgstr "DokonÄno poÄisti"
-
-#~ msgid "Split"
-#~ msgstr "Razdelitev"
+# Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>, 2009"
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: f-spot\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=f-spot&keywords=I18N+L10N&component=General\n";
+"POT-Creation-Date: 2011-11-25 17:02+0000\n"
+"PO-Revision-Date: \n"
+"Last-Translator: Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>\n"
+"Language-Team: Slovenian GNOME Translation Team <gnome-si googlegroups com>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n%100==4 ? 3 : 0);\n"
+"X-Poedit-Country: SLOVENIA\n"
+"X-Poedit-Language: Slovenian\n"
+"X-Poedit-SourceCharset: utf-8\n"
+
+#. ../src/Clients/MainApp/FSpot.addin.xml
+#: ../data/addin-xml-strings.cs:8
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:1
+msgid "Copy Photo"
+msgstr "Kopiranj fotografijo"
+
+#: ../data/addin-xml-strings.cs:9
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:5
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:457
+#: ../src/Clients/MainApp/ui/main_window.ui.h:16
+msgid "Rotate _Left"
+msgstr "Zavrti _levo"
+
+#: ../data/addin-xml-strings.cs:10
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:6
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:458
+#: ../src/Clients/MainApp/ui/main_window.ui.h:17
+msgid "Rotate _Right"
+msgstr "Zavrti _desno"
+
+#: ../data/addin-xml-strings.cs:11
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:9
+#: ../src/Clients/MainApp/ui/main_window.ui.h:60
+msgid "_Remove From Catalog"
+msgstr "_Odstrani iz kataloga"
+
+#: ../data/addin-xml-strings.cs:12
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:8
+#: ../src/Clients/MainApp/ui/main_window.ui.h:41
+msgid "_Delete From Drive"
+msgstr "Iz_briÅi z diska"
+
+#. ../src/Extensions/Editors/FSpot.Editors.Blackout/Resources/BlackoutEditor.addin.xml
+#: ../data/addin-xml-strings.cs:15
+msgid "BlackoutEditor"
+msgstr "Urejevalnik poÄrnenja"
+
+#: ../data/addin-xml-strings.cs:16
+msgid "Blacks out an area of the image."
+msgstr "PoÄrni podroÄje slike."
+
+#: ../data/addin-xml-strings.cs:17
+#: ../data/addin-xml-strings.cs:22
+#: ../data/addin-xml-strings.cs:27
+#: ../data/addin-xml-strings.cs:32
+#: ../data/addin-xml-strings.cs:37
+msgid "Editors"
+msgstr "Urejevalniki"
+
+#. ../src/Extensions/Editors/FSpot.Editors.BW/Resources/BWEditor.addin.xml
+#: ../data/addin-xml-strings.cs:20
+msgid "BWEditor"
+msgstr "BWUrejevalnik"
+
+#: ../data/addin-xml-strings.cs:21
+msgid "Convert to B/W with control. Require Mono 2.2."
+msgstr "Pretvori v ÄB z nadzorom. Zahteva Mono 2.2."
+
+#. ../src/Extensions/Editors/FSpot.Editors.Flip/Resources/FlipEditor.addin.xml
+#: ../data/addin-xml-strings.cs:25
+msgid "FlipEditor"
+msgstr "Urejevalnik zrcaljenja"
+
+#: ../data/addin-xml-strings.cs:26
+msgid "Flips the image horizontally."
+msgstr "Zrcali sliko vodoravno."
+
+#. ../src/Extensions/Editors/FSpot.Editors.Pixelate/Resources/PixelateEditor.addin.xml
+#: ../data/addin-xml-strings.cs:30
+msgid "PixelateEditor"
+msgstr "Urejevalnik pretvorbe v toÄke"
+
+#: ../data/addin-xml-strings.cs:31
+msgid "Pixelates an area of the image."
+msgstr "PodroÄje slike pretvori v toÄke"
+
+#. ../src/Extensions/Editors/FSpot.Editors.Resize/Resources/ResizeEditor.addin.xml
+#: ../data/addin-xml-strings.cs:35
+msgid "ResizeEditor"
+msgstr "Urejevalnik spremembe velikosti"
+
+#: ../data/addin-xml-strings.cs:36
+msgid "Resize the image"
+msgstr "Spremeni velikost slike"
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml
+#: ../data/addin-xml-strings.cs:40
+msgid "CD Export"
+msgstr "Izvoz na CD"
+
+#: ../data/addin-xml-strings.cs:41
+msgid "This extension allows you to burn your photos to CD."
+msgstr "Ta razÅiritev vam omogoÄa zapisovanje vaÅih fotografij na CD."
+
+#: ../data/addin-xml-strings.cs:42
+#: ../data/addin-xml-strings.cs:48
+#: ../data/addin-xml-strings.cs:54
+#: ../data/addin-xml-strings.cs:62
+#: ../data/addin-xml-strings.cs:68
+#: ../data/addin-xml-strings.cs:74
+#: ../data/addin-xml-strings.cs:80
+#: ../data/addin-xml-strings.cs:86
+#: ../data/addin-xml-strings.cs:92
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:6
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:5
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:5
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:5
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:5
+msgid "Export"
+msgstr "Izvoz"
+
+#: ../data/addin-xml-strings.cs:43
+msgid "_CD..."
+msgstr "_CD ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.addin.xml
+#: ../data/addin-xml-strings.cs:46
+msgid "FacebookExport"
+msgstr "Izvoz na Facebook"
+
+#: ../data/addin-xml-strings.cs:47
+msgid "Export pictures to facebook"
+msgstr "Izvoz fotografij na Facebook"
+
+#: ../data/addin-xml-strings.cs:49
+msgid "F_acebook..."
+msgstr "F_acebook ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/FlickrExport.addin.xml
+#: ../data/addin-xml-strings.cs:52
+msgid "Flickr Export"
+msgstr "Izvoz na Flickr"
+
+#: ../data/addin-xml-strings.cs:53
+msgid "This extension allows you to export your photos to Flickr and 23hq."
+msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij na Flickr in 23hq."
+
+#: ../data/addin-xml-strings.cs:55
+msgid "_Flickr..."
+msgstr "_Flickr ..."
+
+#: ../data/addin-xml-strings.cs:56
+msgid "_23hq..."
+msgstr "_23hq ..."
+
+#: ../data/addin-xml-strings.cs:57
+msgid "_Zooomr..."
+msgstr "_Zooomr ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/FolderExport.addin.xml
+#: ../data/addin-xml-strings.cs:60
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:10
+msgid "Folder Export"
+msgstr "Izvoz mape"
+
+#: ../data/addin-xml-strings.cs:61
+msgid "This extension allows you to export your photos to HTML galleries, Original galleries or just to a folder."
+msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v galerije HTML, galerije Origional ali enostavno v mapo."
+
+#: ../data/addin-xml-strings.cs:63
+msgid "F_older..."
+msgstr "_Mapa ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/GalleryExport.addin.xml
+#: ../data/addin-xml-strings.cs:66
+msgid "Gallery Export"
+msgstr "Izvoz v Gallery"
+
+#: ../data/addin-xml-strings.cs:67
+msgid "This extension allows you to export your photos to PHP Gallery (http://gallery.menalto.com)."
+msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v PHP Gallery (http://gallery.menalto.com)."
+
+#: ../data/addin-xml-strings.cs:69
+msgid "Web _Gallery..."
+msgstr "Spletna _galerija ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/PicasaWebExport.addin.xml
+#: ../data/addin-xml-strings.cs:72
+msgid "PicasaWeb Export"
+msgstr "Izvoz na PicasaWeb"
+
+#: ../data/addin-xml-strings.cs:73
+msgid "This extension allows you to export your photos to PicasaWeb."
+msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v PicasaWeb."
+
+#: ../data/addin-xml-strings.cs:75
+msgid "_PicasaWeb..."
+msgstr "_PicasaWeb ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/SmugMugExport.addin.xml
+#: ../data/addin-xml-strings.cs:78
+msgid "SmugMug Export"
+msgstr "Izvoz na SmugMug"
+
+#: ../data/addin-xml-strings.cs:79
+msgid "This extension allows you to export your photos to SmugMug."
+msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v SmugMug."
+
+#: ../data/addin-xml-strings.cs:81
+msgid "_SmugMug..."
+msgstr "_SmugMug ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/TabbloExport.addin.xml
+#: ../data/addin-xml-strings.cs:84
+msgid "Tabblo Export"
+msgstr "Izvoz v Tabblo"
+
+#: ../data/addin-xml-strings.cs:85
+msgid "This extension allows you to export your photos to Tabblo."
+msgstr "Ta razÅiritev vam omogoÄa izvoz vaÅih fotografij v Tabblo."
+
+#: ../data/addin-xml-strings.cs:87
+msgid "_Tabblo..."
+msgstr "_Tabblo ..."
+
+#. ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.addin.xml
+#: ../data/addin-xml-strings.cs:90
+msgid "Zip export"
+msgstr "Izvoz v Zip"
+
+#: ../data/addin-xml-strings.cs:91
+msgid "Simple export to Zip file"
+msgstr "Enostaven izvoz v datoteko Zip"
+
+#: ../data/addin-xml-strings.cs:93
+msgid "Compressed fil_e..."
+msgstr "Stisnjena datot_eka ..."
+
+#. ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.addin.xml
+#: ../data/addin-xml-strings.cs:96
+msgid "ChangePath"
+msgstr "Spremeni pot"
+
+#: ../data/addin-xml-strings.cs:97
+msgid "UNSTABLE - Please ensure you have a backup of your photos.db before you test this extension. This extension will allow you to change the base path to the your photos. It is very handy if you move your photos from ~/Photos to /OurPhotos for instance. Just ensure you let SqLite continue to process the changes for up to a few hours after f-spot reports finished. It will only change the path to photos which are located under the Photo directory."
+msgstr "NESTABILNO - pred preizkusom te razÅiritve se prepriÄajte, da imate varnostno kopijo photos.db. Ta razÅiritev vam bo dovolila spremembo osnovne poti do vaÅih fotografij. To je zelo priroÄno, Äe svoje fotografije premikate na primer iz ~/Fotografije v /NaÅeFotografije. PrepriÄajte se, da pustite Sqlite obdelovati spremembe Åe do pol ure potem, ko f-spot sporoÄi, da je konÄal. Spremenjena bo samo pot do fotografij, ki so v mapi Fotografije. "
+
+#: ../data/addin-xml-strings.cs:98
+#: ../data/addin-xml-strings.cs:104
+#: ../data/addin-xml-strings.cs:110
+#: ../data/addin-xml-strings.cs:116
+#: ../data/addin-xml-strings.cs:122
+#: ../data/addin-xml-strings.cs:128
+#: ../data/addin-xml-strings.cs:134
+#: ../data/addin-xml-strings.cs:140
+#: ../data/addin-xml-strings.cs:146
+#: ../data/addin-xml-strings.cs:152
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:7
+msgid "Tools"
+msgstr "Orodja"
+
+#: ../data/addin-xml-strings.cs:99
+msgid "Change path to photos"
+msgstr "Spremeni pot v slike"
+
+#. ../src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml
+#: ../data/addin-xml-strings.cs:102
+msgid "DevelopInUFRaw"
+msgstr "RazvojVUFRaw"
+
+#: ../data/addin-xml-strings.cs:103
+msgid ""
+"Develop the image in UFRaw, saves the result as a new version\\n"
+"\\n"
+"Note: Require ufraw 0.13 or CVS version newer than 2007-09-06 !!!"
+msgstr ""
+"Razvije sliko v UFRaw, shrani rezultat kot novo razliÄico\\n"
+"\\n"
+"Zahteva ufraw 0.13 ali CVS razliÄico novejÅo kot 06.09.2007 !!!"
+
+#: ../data/addin-xml-strings.cs:105
+msgid "Develop in UFRaw"
+msgstr "Razvoj v UFRaw"
+
+#. ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml
+#: ../data/addin-xml-strings.cs:108
+msgid "LiveWebGallery"
+msgstr "Åiva spletna galerija"
+
+#: ../data/addin-xml-strings.cs:109
+msgid "Share photos with other people on the same network via Web Browser"
+msgstr "Souporaba fotografij z drugimi ljudmi na istem omreÅju preko spletnega brskalnika"
+
+#: ../data/addin-xml-strings.cs:111
+msgid "Live Web Gallery"
+msgstr "Åiva spletna galerija"
+
+#. ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml
+#: ../data/addin-xml-strings.cs:114
+msgid "MergeDb"
+msgstr "ZdruÅi podatkovne zbirke"
+
+#: ../data/addin-xml-strings.cs:115
+msgid "Merge another db back to the main one"
+msgstr "ZdruÅi drugo podatkovno zbirko nazaj z glavno"
+
+#: ../data/addin-xml-strings.cs:117
+msgid "Merge Db"
+msgstr "ZdruÅi podatkovne zbirke"
+
+#. ../src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.addin.xml
+#: ../data/addin-xml-strings.cs:120
+msgid "MetaPixel"
+msgstr "MetaPixel"
+
+#: ../data/addin-xml-strings.cs:121
+msgid "Create photomosaics using MetaPixel (http://www.complang.tuwien.ac.at/schani/metapixel/)"
+msgstr "Ustvari mozaike fotografij z uproabo MetaPixel (http://www.complang.tuwien.ac.at/schani/metapixel/)"
+
+#: ../data/addin-xml-strings.cs:123
+msgid "Create p_hotomosaic"
+msgstr "Ustvari foto-mozaik"
+
+#. ../src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.addin.xml
+#: ../data/addin-xml-strings.cs:126
+msgid "PictureTile"
+msgstr "PictureTile"
+
+#: ../data/addin-xml-strings.cs:127
+msgid "Create photo wall using PictureTile by Jamie Zawinski (http://www.jwz.org/picturetile/)"
+msgstr "Ustvari slikovni zid s PictureTile Jamieja Zawinskija (http://www.jwz.org/picturetile/)"
+
+#: ../data/addin-xml-strings.cs:129
+msgid "Create photo_wall"
+msgstr "Ustvari slikovni _zid"
+
+#. ../src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml
+#: ../data/addin-xml-strings.cs:132
+msgid "RawPlusJpeg"
+msgstr "RawPlusJpeg"
+
+#: ../data/addin-xml-strings.cs:133
+msgid "Merge RAW+Jpeg as multiple versions of the same photo"
+msgstr "ZadruÅi RAW in jpeg kot veÄ razliÄic enake fotografije"
+
+#: ../data/addin-xml-strings.cs:135
+msgid "Merge Raw"
+msgstr "ZdruÅi surove"
+
+#. ../src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml
+#: ../data/addin-xml-strings.cs:138
+msgid "RetroactiveRoll"
+msgstr "Retroaktivni zvitki"
+
+#: ../data/addin-xml-strings.cs:139
+msgid "Retroactively assign old photos to import rolls"
+msgstr "Retroaktivno dodeli stare fotografije uvoznim zvitkom"
+
+#: ../data/addin-xml-strings.cs:141
+msgid "Reassign to new import roll"
+msgstr "Ponovno dodeli novemu uvoznemu zvitku"
+
+#. ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml
+#: ../data/addin-xml-strings.cs:144
+#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:6
+msgid "Screensaver Configuration"
+msgstr "Nastavitve ohranjevalnika zaslona"
+
+#: ../data/addin-xml-strings.cs:145
+msgid "Screensaver options"
+msgstr "MoÅnosti ohranjevalnika zaslona"
+
+#: ../data/addin-xml-strings.cs:147
+msgid "Configure Screensaver"
+msgstr "Nastavi ohranjevalnik zaslona"
+
+#. ../src/Extensions/Tools/FSpot.Tools.SyncCatalog/SyncCatalog.addin.xml
+#: ../data/addin-xml-strings.cs:150
+msgid "SyncMetaData"
+msgstr "Metapodatki Usklajevanja"
+
+#: ../data/addin-xml-strings.cs:151
+msgid "Sync MetaData information of all catalog with Photos"
+msgstr "Uskladi podrobnosti metapodatkov za vse kataloge s fotografijami "
+
+#: ../data/addin-xml-strings.cs:153
+msgid "Sync Catalog with Photos"
+msgstr "Uskladi katalog s fotografijami"
+
+#. ../src/Extensions/Transitions/FSpot.Transitions.Cover/Resources/CoverTransition.addin.xml
+#: ../data/addin-xml-strings.cs:156
+msgid "Cover Transition"
+msgstr "Prehod prekrivanja"
+
+#: ../data/addin-xml-strings.cs:157
+msgid "A Slideshow transition that covers images"
+msgstr "Prehod diaprestavitve, ki pokrije slike"
+
+#: ../data/addin-xml-strings.cs:158
+#: ../data/addin-xml-strings.cs:163
+#: ../data/addin-xml-strings.cs:168
+msgid "Transitions"
+msgstr "Prehodi"
+
+#. ../src/Extensions/Transitions/FSpot.Transitions.Dissolve/Resources/DissolveTransition.addin.xml
+#: ../data/addin-xml-strings.cs:161
+msgid "Dissolve Transition"
+msgstr "Prehod raztapljanje"
+
+#: ../data/addin-xml-strings.cs:162
+msgid "A Slideshow transition that dissolves images"
+msgstr "Prehod predstavitve, ki raztopi slike"
+
+#. ../src/Extensions/Transitions/FSpot.Transitions.Push/Resources/PushTransition.addin.xml
+#: ../data/addin-xml-strings.cs:166
+msgid "Push Transition"
+msgstr "Prehod potisk"
+
+#: ../data/addin-xml-strings.cs:167
+msgid "A Slideshow transition that pushes images"
+msgstr "Prehod prestavitve, ki slike potisne"
+
+#: ../data/desktop-files/f-spot.desktop.in.in.h:1
+#: ../data/desktop-files/f-spot-import.desktop.in.in.h:1
+#: ../data/desktop-files/f-spot-view.desktop.in.in.h:1
+msgid "F-Spot"
+msgstr "F-Spot"
+
+#: ../data/desktop-files/f-spot.desktop.in.in.h:2
+#: ../data/desktop-files/f-spot-import.desktop.in.in.h:2
+msgid "F-Spot Photo Manager"
+msgstr "F-spot upravljalnik fotografij"
+
+#: ../data/desktop-files/f-spot.desktop.in.in.h:3
+msgid "Organize, enjoy, and share your photos"
+msgstr "Urejajte, uÅivajte in dajte svoje fotografije v souporabo."
+
+#: ../data/desktop-files/f-spot.desktop.in.in.h:4
+#: ../data/desktop-files/f-spot-import.desktop.in.in.h:4
+msgid "Photo Manager"
+msgstr "Upravljalnik fotografij"
+
+#: ../data/desktop-files/f-spot-import.desktop.in.in.h:3
+msgid "Import into F-Spot"
+msgstr "Uvozi v F-Spot"
+
+#: ../data/desktop-files/f-spot-view.desktop.in.in.h:2
+msgid "F-Spot Photo Viewer"
+msgstr "F-_Spot pregledovalnik fotografij"
+
+#: ../data/desktop-files/f-spot-view.desktop.in.in.h:3
+msgid "Photo Viewer"
+msgstr "Pregledovalnik fotografij"
+
+#: ../f-spot.schemas.in.h:1
+msgid "Display of transparent parts."
+msgstr "PrikaÅi prozorne dele."
+
+#: ../f-spot.schemas.in.h:2
+msgid "Enable this to allow interpolation on zoomed images."
+msgstr "OmogoÄite to za interpolacijo pribliÅanih slik."
+
+#: ../f-spot.schemas.in.h:3
+msgid "Height of the import dialog."
+msgstr "ViÅina pogovornega okna uvoza."
+
+#: ../f-spot.schemas.in.h:4
+msgid "Height of the main window."
+msgstr "ViÅina glavnega okna."
+
+#: ../f-spot.schemas.in.h:5
+msgid "Height of the photo viewer window."
+msgstr "ViÅina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:6
+msgid "If the 'transparency' option is set, the color specified in this option will be used as the transparent color when viewing images."
+msgstr "V primeru da je moÅnost 'prozornost' nastavljena, bo barva navedena v tej moÅnosti pri ogledu slik uporabljena kot prozorna barva."
+
+#: ../f-spot.schemas.in.h:7
+msgid "Interpolate image on zoom."
+msgstr "Interpolacija slike pri poveÄavi."
+
+#: ../f-spot.schemas.in.h:8
+msgid "Maximize the main window."
+msgstr "Razpne glavno okno."
+
+#: ../f-spot.schemas.in.h:9
+msgid "Maximize the photo viewer window."
+msgstr "Razpne okno pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:10
+msgid "Path to custom gtkrc for theming F-Spot."
+msgstr "Pot do gtkrc po meri za temo F-Spot."
+
+#: ../f-spot.schemas.in.h:11
+msgid "Show dates in the thumbnail view."
+msgstr "PokaÅi datume v pogledu sliÄic."
+
+#: ../f-spot.schemas.in.h:12
+msgid "Show ratings in the thumbnail view."
+msgstr "PokaÅi ocene v pogledu sliÄic."
+
+#: ../f-spot.schemas.in.h:13
+msgid "Show tags in the thumbnail view."
+msgstr "PokaÅi oznake v pogledu sliÄic."
+
+#: ../f-spot.schemas.in.h:14
+msgid "Show the filename in the viewer window."
+msgstr "PokaÅi ime datoteke v oknu pregledovalnika."
+
+#: ../f-spot.schemas.in.h:15
+msgid "Show the filmstrip in the main window."
+msgstr "PokaÅi filmski trak v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:16
+msgid "Show the sidebar in the main window."
+msgstr "PokaÅi drsnik v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:17
+msgid "Show the timeline in the main window."
+msgstr "PokaÅi Äasovnico v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:18
+msgid "Show the toolbar in the main window."
+msgstr "PokaÅi orodno vrstico v glavnem oknu."
+
+#: ../f-spot.schemas.in.h:19
+msgid "Show the toolbar in the photo viewer window."
+msgstr "PokaÅi ali skrij orodno vrstico v oknu pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:20
+msgid "Size of the tag icons shown in the sidebar."
+msgstr "Velikost ikon oznak prikazanih v stranski vrstici."
+
+#: ../f-spot.schemas.in.h:21
+msgid "The X position to use for the main window."
+msgstr "X poloÅaj glavnega okna."
+
+#: ../f-spot.schemas.in.h:22
+msgid "The X position to use for the photo viewer window."
+msgstr "X poloÅaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:23
+msgid "The Y position to use for the main window."
+msgstr "Y poloÅaj glavnega okna."
+
+#: ../f-spot.schemas.in.h:24
+msgid "The Y position to use for the photo viewer window."
+msgstr "Y poloÅaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:25
+msgid "The color to use for transparent parts."
+msgstr "Barva za prozorne dele."
+
+#: ../f-spot.schemas.in.h:26
+msgid "The height dimension to use for the import dialog."
+msgstr "ViÅina pogovornega okna."
+
+#: ../f-spot.schemas.in.h:27
+msgid "The height dimension to use for the main window."
+msgstr "ViÅina glavnega okna."
+
+#: ../f-spot.schemas.in.h:28
+msgid "The height dimension to use for the photo viewer window."
+msgstr "ViÅina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:29
+msgid "The orientation of the filmstrip, if shown."
+msgstr "Usmeritev filmskega traku, Äe je prikazan."
+
+#: ../f-spot.schemas.in.h:30
+msgid "The orientation of the filmstrip."
+msgstr "Usmeritev filmskega traku."
+
+#: ../f-spot.schemas.in.h:31
+msgid "The size (width) of the sidebar in the main window."
+msgstr "Velikost (Åirina) drsnika v glavnemu oknu."
+
+#: ../f-spot.schemas.in.h:32
+msgid "The size of the sidebar in the main window."
+msgstr "Velikost drsnika v glavnemu oknu."
+
+#: ../f-spot.schemas.in.h:33
+msgid "The width dimension to use for the import dialog."
+msgstr "Åirina pogovornega okna uvoza."
+
+#: ../f-spot.schemas.in.h:34
+msgid "The width dimension to use for the main window."
+msgstr "Åirina glavnega okna."
+
+#: ../f-spot.schemas.in.h:35
+msgid "The width dimension to use for the photo viewer window."
+msgstr "Åirina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:36
+msgid "Use the current photo's filename as the viewer window's title."
+msgstr "Uporabi ime datoteke trenutne fotografije kot naslov okna pregledovalnika."
+
+#: ../f-spot.schemas.in.h:37
+msgid "Width of the import dialog."
+msgstr "Åirina pogovornega okna uvoza."
+
+#: ../f-spot.schemas.in.h:38
+msgid "Width of the main window."
+msgstr "Åirina glavnega okna."
+
+#: ../f-spot.schemas.in.h:39
+msgid "Width of the photo viewer window."
+msgstr "Åirina okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:40
+msgid "Width of the preview image pane in the import dialog."
+msgstr "Åirina pladnja predogleda slike v pogovornemu oknu uvoza."
+
+#: ../f-spot.schemas.in.h:41
+msgid "X position of the main window."
+msgstr "X poloÅaj glavnega okna"
+
+#: ../f-spot.schemas.in.h:42
+msgid "X position of the photo viewer window."
+msgstr "X poloÅaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:43
+msgid "Y position of the main window."
+msgstr "Y poloÅaj glavnega okna."
+
+#: ../f-spot.schemas.in.h:44
+msgid "Y position of the photo viewer window."
+msgstr "Y poloÅaj okna pregledovalnika fotografij."
+
+#: ../f-spot.schemas.in.h:45
+msgid "You can choose how to display transparent parts in images. This option has no effect on photos but setting this value to CHECK_PATTERN or CUSTOM_COLOR could be useful when viewing icons or other artwork with transparent parts."
+msgstr "MogoÄe je izbrati naÄin prikaza prozornih delov slik. Ta moÅnost ne vpliva na fotografije, vendar je lahko nastavitev te vrednosti na vzorec Åahovnice ali barva po izbiri koristna pri ogledu ikon in ostalih grafiÄnih podobah s prozornimi deli."
+
+#: ../lib/Mono.Google/Mono.Google/CaptchaException.cs:58
+msgid "url"
+msgstr "url"
+
+#: ../lib/Mono.Google/Mono.Google/CaptchaException.cs:59
+msgid "token"
+msgstr "Åeton"
+
+#: ../lib/Mono.Google/Mono.Google/CaptchaException.cs:60
+msgid "captcha_url"
+msgstr "captcha_url"
+
+#: ../lib/Mono.Tabblo/Mono.Tabblo/Connection.cs:132
+#, csharp-format
+msgid "Uploading photo \"{0}\""
+msgstr "PoÅiljanje fotografije \"{0}\""
+
+#: ../lib/Mono.Tabblo/Mono.Tabblo/Connection.cs:206
+msgid "Logging into Tabblo"
+msgstr "Prijavljanje v Tabblo"
+
+#: ../lib/Mono.Tabblo/Mono.Tabblo/Connection.cs:267
+msgid "Obtaining URL for upload"
+msgstr "Pridobivanje URL-ja za nalaganje"
+
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:2
+msgid "Export to"
+msgstr "Izvozi v"
+
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:3
+msgid "Open _With"
+msgstr "Odpri _z"
+
+#: ../src/Clients/MainApp/FSpot.addin.xml.h:4
+#: ../src/Clients/MainApp/ui/main_window.ui.h:15
+msgid "Rem_ove Tag"
+msgstr "Ods_trani oznako"
+
+#: ../src/Clients/MainApp/FSpot/App.cs:319
+#, csharp-format
+msgid "No photos matching {0} found"
+msgstr "Fotografije, ki se sklada z {0}, ni bilo mogoÄe najti"
+
+#: ../src/Clients/MainApp/FSpot/App.cs:320
+#, csharp-format
+msgid ""
+"The tag \"{0}\" is not applied to any photos. Try adding\n"
+"the tag to some photos or selecting a different tag in the\n"
+"F-Spot preference dialog."
+msgstr ""
+"Oznaka \"{0}\" ni uveljavljena. Poskusite z dodajanjem\n"
+"oznake fotografijam ali izberite drugo oznako v\n"
+"pogovornem oknu moÅnosti F-Spot."
+
+#: ../src/Clients/MainApp/FSpot/App.cs:324
+msgid "Search returned no results"
+msgstr "Iskanje ni vrnilo rezultatov"
+
+#: ../src/Clients/MainApp/FSpot/App.cs:325
+msgid ""
+"The tag F-Spot is looking for does not exist. Try\n"
+"selecting a different tag in the F-Spot preference\n"
+"dialog."
+msgstr ""
+"Oznaka, ki jo iÅÄe F-Spot, ne obstaja. Poskusite\n"
+"z izborom druge oznake v pogovornem oknu \n"
+"moÅnosti F-Spot."
+
+#: ../src/Clients/MainApp/FSpot.Database/Updater.cs:768
+msgid "Updating F-Spot Database"
+msgstr "Posodabljanje podatkovne zbirke F-Spot"
+
+#: ../src/Clients/MainApp/FSpot.Database/Updater.cs:769
+msgid "Please wait while your F-Spot gallery's database is updated. This may take some time."
+msgstr "PoÄakati je treba, da se podatkovna zbirka galerije F-Spot do konca posodobi. Postopek lahko traja nekaj Äasa."
+
+#: ../src/Clients/MainApp/FSpot.Editors/AutoStretchEditor.cs:37
+msgid "Auto Color"
+msgstr "Samodejna barva"
+
+#: ../src/Clients/MainApp/FSpot.Editors/ColorEditor.cs:61
+msgid "Adjust Colors"
+msgstr "Prilagajanje barv"
+
+#: ../src/Clients/MainApp/FSpot.Editors/ColorEditor.cs:64
+msgid "Adjust"
+msgstr "Prilagodi"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:56
+msgid "4 x 3 (Book)"
+msgstr "4 x 3 (knjiga)"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:57
+msgid "4 x 6 (Postcard)"
+msgstr "4 x 6 (razglednica)"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:58
+msgid "5 x 7 (L, 2L)"
+msgstr "5 x 7 (L, 2L)"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:59
+msgid "8 x 10"
+msgstr "8 x 10"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:60
+msgid "Square"
+msgstr "Kvadrat"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:63
+msgid "Crop"
+msgstr "ObreÅi"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:94
+msgid "Select the area that needs cropping."
+msgstr "Izbor obmoÄja za obrez."
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:119
+msgid "No Constraint"
+msgstr "Brez omejitev"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:120
+msgid "Same as photo"
+msgstr "Enako kot fotografija"
+
+#: ../src/Clients/MainApp/FSpot.Editors/CropEditor.cs:125
+msgid "Custom Ratios..."
+msgstr "Razmerja velikosti po meri"
+
+#: ../src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs:37
+msgid "Desaturate"
+msgstr "ZmanjÅaj nasiÄenje"
+
+#: ../src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs:41
+msgid "Red-eye Reduction"
+msgstr "ZmanjÅanje rdeÄih oÄi"
+
+#: ../src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs:44
+msgid "Fix!"
+msgstr "Popravi"
+
+#: ../src/Clients/MainApp/FSpot.Editors/RedEyeEditor.cs:48
+msgid "Select the eyes you wish to fix."
+msgstr "Izberite oÄi za popravilo."
+
+#: ../src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs:37
+msgid "Sepia Tone"
+msgstr "Sepia uÄinek staranja"
+
+#: ../src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs:50
+msgid "Soft Focus"
+msgstr "Mehka izostritev"
+
+#: ../src/Clients/MainApp/FSpot.Editors/TiltEditor.cs:51
+msgid "Straighten"
+msgstr "Poravnava"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:82
+msgid "Hide"
+msgstr "Skrij"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:84
+msgid "Hide toolbar"
+msgstr "Skrij orodno vrstico"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:90
+msgid "Info"
+msgstr "Podatki"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:92
+msgid "Image information"
+msgstr "Podatki o sliki"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:97
+msgid "Exit fullscreen"
+msgstr "Izhod iz celozaslonskega naÄina"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:105
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:341
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:122
+msgid "Slideshow"
+msgstr "Diapredstavitev"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:106
+msgid "Start slideshow"
+msgstr "Zagon diapredstavitve"
+
+#: ../src/Clients/MainApp/FSpot/FullScreenView.cs:152
+msgid "Slide transition:"
+msgstr "Prehodi med diapozitivi:"
+
+#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:90
+#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:91
+msgid "More dates"
+msgstr "VeÄ datumov"
+
+#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:93
+#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:94
+msgid "More"
+msgstr "VeÄ"
+
+#: ../src/Clients/MainApp/FSpot/GroupSelector.cs:554
+#: ../src/Clients/MainApp/ui/main_window.ui.h:34
+msgid "_Clear Date Range"
+msgstr "_ÄiÅÄenje datumskega obmoÄja"
+
+#: ../src/Clients/MainApp/FSpot.Import/ImportController.cs:510
+#: ../src/Clients/MainApp/FSpot.Import/ImportController.cs:512
+#: ../src/Clients/MainApp/FSpot.Import/MetadataImporter.cs:72
+msgid "Imported Tags"
+msgstr "UvoÅene oznake"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:102
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:308
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:105
+msgid "Rotate Left"
+msgstr "Zavrti levo"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:103
+msgid "Rotate picture left"
+msgstr "Vrtenje slike levo"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:114
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:312
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:110
+msgid "Rotate Right"
+msgstr "Zavrti desno"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:115
+msgid "Rotate picture right"
+msgstr "Vrtenje slike desno"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:125
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:938
+msgid "Next"
+msgstr "Naslednja"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:126
+msgid "Next picture"
+msgstr "Naslednja slika"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:146
+msgid "Previous"
+msgstr "Predhodni"
+
+#: ../src/Clients/MainApp/FSpot/ItemAction.cs:147
+msgid "Previous picture"
+msgstr "Predhodna slika"
+
+#: ../src/Clients/MainApp/FSpot/Literal.cs:225
+#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:182
+#, csharp-format
+msgid "Not {0}"
+msgstr "Ne {0}"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:301
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:229
+#: ../src/Clients/MainApp/ui/import.ui.h:3
+msgid "Import"
+msgstr "Uvozi"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:303
+msgid "Import new images"
+msgstr "Uvoz novih slik"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:319
+#: ../src/Clients/MainApp/ui/main_window.ui.h:3
+msgid "Browse"
+msgstr "Prebrskaj"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:323
+msgid "Browse many photos simultaneously"
+msgstr "Brskanje po veÄ fotografijah hkrati"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:327
+msgid "Edit Image"
+msgstr "Uredi sliko"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:331
+msgid "View and edit a photo"
+msgstr "Prikaz in urejanje fotografije"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:336
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:117
+msgid "Fullscreen"
+msgstr "Celozaslonski naÄin"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:338
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:119
+msgid "View photos fullscreen"
+msgstr "Celozaslonski ogled fotografij"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:343
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:124
+msgid "View photos in a slideshow"
+msgstr "Ogled fotografij v diapredstavitvi"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:358
+msgid "Previous photo"
+msgstr "Predhodna fotografija"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:363
+msgid "Next photo"
+msgstr "Naslednja fotografija"
+
+#. Don't care otherwise, Tags sounds reasonable
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:376
+#: ../src/Clients/MainApp/FSpot.Widgets/Sidebar.cs:75
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:935
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1107
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1147
+msgid "Tags"
+msgstr "Oznake"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:440
+msgid "Show _Find Bar"
+msgstr "PokaÅi is_kalno vrstico"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:443
+msgid "Hide _Find Bar"
+msgstr "Skrij _iskalno vrstico"
+
+#. Note for translators: This indicates the current photo is photo {0} of {1} out of photos
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:671
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs:154
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs:111
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:134
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:391
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:242
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:214
+#, csharp-format
+msgid "{0} of {1}"
+msgstr "{0} od {1}"
+
+#. Translators, The singular case will never happen here.
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1745
+#, csharp-format
+msgid "Merge the selected tag"
+msgid_plural "Merge the {0} selected tags?"
+msgstr[0] "Ali naj bo zdruÅenih {0} izbranih oznak?"
+msgstr[1] "Ali naj bo zdruÅena {0} izbrana oznaka?"
+msgstr[2] "Ali naj bosta zdruÅeni {0} izbrani oznaki?"
+msgstr[3] "Ali naj bodo zdruÅene {0} izbrane oznake?"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1772
+msgid "This operation will merge the selected tags and any sub-tags into a single tag."
+msgstr "To dejanje bo zdruÅilo izbrane oznake in morebitne pod-oznake v eno samo oznako."
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1774
+msgid "_Merge Tags"
+msgstr "Z_druÅi oznake"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1979
+#, csharp-format
+msgid "{0} Photo out of {1}"
+msgid_plural "{0} Photos out of {1}"
+msgstr[0] "{0} fotografij od {1}"
+msgstr[1] "{0} fotografija od {1}"
+msgstr[2] "{0} fotografiji od {1}"
+msgstr[3] "{0} fotografije od {1}"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1981
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:499
+#, csharp-format
+msgid "{0} Photo"
+msgid_plural "{0} Photos"
+msgstr[0] "{0} Fotografij"
+msgstr[1] "{0} Fotografija"
+msgstr[2] "{0} Fotografiji"
+msgstr[3] "{0} Fotografije"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:1984
+#, csharp-format
+msgid " ({0} selected)"
+msgid_plural " ({0} selected)"
+msgstr[0] " ({0} izbranih)"
+msgstr[1] " ({0} izbrana)"
+msgstr[2] " ({0} izbrani)"
+msgstr[3] " ({0} izbrane)"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2065
+msgid "_Ok"
+msgstr "_V redu"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2066
+msgid "Error Deleting Picture"
+msgstr "Napaka med brisanjem slike"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2071
+#, csharp-format
+msgid "No permission to delete the file:{1}{0}"
+msgstr "Ni dovoljenj za izbris datoteke:{1}{0}"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2075
+#, csharp-format
+msgid "An error of type {0} occurred while deleting the file:{2}{1}"
+msgstr "Med brisanjem datoteke {2} {1} je priÅlo do napake vrste {0}"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2107
+#, csharp-format
+msgid "Delete the selected photo permanently?"
+msgid_plural "Delete the {0} selected photos permanently?"
+msgstr[0] "Ali naj bo trajno izbrisanih {0} izbranih fotografij?"
+msgstr[1] "Ali naj bo trajno izbrisana {0} izbrana fotografija?"
+msgstr[2] "Ali naj bosta trajno izbrisani {0} izbrani fotografiji?"
+msgstr[3] "Ali naj bodo trajno izbrisane {0} izbrane fotografije?"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2111
+msgid "This deletes all versions of the selected photo from your drive."
+msgid_plural "This deletes all versions of the selected photos from your drive."
+msgstr[0] "To bo izbrisalo vse razliÄice izbranih fotografij z diska."
+msgstr[1] "To bo izbrisalo vse razliÄice izbrane fotografije z diska."
+msgstr[2] "To bo izbrisalo vse razliÄice izbranih fotografij z diska."
+msgstr[3] "To bo izbrisalo vse razliÄice izbranih fotografij z diska."
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2114
+msgid "_Delete photo"
+msgid_plural "_Delete photos"
+msgstr[0] "Izbri_Åi fotografije"
+msgstr[1] "Izbri_Åi fotografijo"
+msgstr[2] "Izbri_Åi fotografiji"
+msgstr[3] "Izbri_Åi fotografije"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2150
+#, csharp-format
+msgid "Remove the selected photo from F-Spot?"
+msgid_plural "Remove the {0} selected photos from F-Spot?"
+msgstr[0] "Ali naj se odstrani {0} izbranih fotografij iz F-Spot ?"
+msgstr[1] "Ali naj se odstrani {0} izbrano fotografijo iz F-Spot ?"
+msgstr[2] "Ali naj se odstranita {0} izbrani fotografij iz F-Spot ?"
+msgstr[3] "Ali naj se odstranijo {0} izbrane fotografije iz F-Spot ?"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2155
+msgid "If you remove photos from the F-Spot catalog all tag information will be lost. The photos remain on your computer and can be imported into F-Spot again."
+msgstr "Ob odstranjevanju fotografij iz kataloga F-Spot bodo vsi podatki o oznakah izgubljeni. Fotografije bodo ostale na vaÅem raÄunalniku in jih lahko ponovno uvozite v F-Spot."
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2156
+msgid "_Remove from Catalog"
+msgstr "_Odstrani iz kataloga"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2230
+#, csharp-format
+msgid "Delete tag \"{0}\"?"
+msgstr "Izbris oznake \"{0}\"?"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2232
+#, csharp-format
+msgid "Delete the {0} selected tags?"
+msgstr "Izbris {0} izbrane oznake ?"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2237
+msgid "photo"
+msgid_plural "photos"
+msgstr[0] "fotografije"
+msgstr[1] "fotografija"
+msgstr[2] "fotografiji"
+msgstr[3] "fotografije"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2239
+#, csharp-format
+msgid "If you delete this tag, the association with {0} {1} will be lost."
+msgid_plural "If you delete these tags, the association with {0} {1} will be lost."
+msgstr[0] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
+msgstr[1] "Ob izbrisu oznake, bo povezljivost z {0} {1} izgubljena."
+msgstr[2] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
+msgstr[3] "Ob izbrisu oznak, bo povezljivost z {0} {1} izgubljena."
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2244
+msgid "_Delete tag"
+msgid_plural "_Delete tags"
+msgstr[0] "Iz_briÅi oznake"
+msgstr[1] "Iz_briÅi oznako"
+msgstr[2] "Iz_briÅi oznaki"
+msgstr[3] "Iz_briÅi oznake"
+
+#. A Category is not empty. Can not delete it.
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2258
+msgid "Tag is not empty"
+msgstr "Oznaka ni prazna"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2259
+#, csharp-format
+msgid "Can not delete tags that have tags within them. Please delete tags under \"{0}\" first"
+msgstr "Ni mogoÄe izbrisati oznak, ki imajo oznake znotraj njih. Najprej izbriÅite oznake pod \"{0}\""
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2711
+msgid "Rotate selected photo left"
+msgid_plural "Rotate selected photos left"
+msgstr[0] "Vrtenje izbranih fotografij levo"
+msgstr[1] "Vrtenje izbrane fotografije levo"
+msgstr[2] "Vrtenje izbranih fotografij levo"
+msgstr[3] "Vrtenje izbranih fotografij levo"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2724
+msgid "Rotate selected photo right"
+msgid_plural "Rotate selected photos right"
+msgstr[0] "Vrtenje izbranih fotografij desno"
+msgstr[1] "Vrtenje izbrane fotografije desno"
+msgstr[2] "Vrtenje izbranih fotografij desno"
+msgstr[3] "Vrtenje izbranih fotografij desno"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2735
+#, csharp-format
+msgid "Find _Selected Tag"
+msgid_plural "Find _Selected Tags"
+msgstr[0] "IÅÄi _izbrane oznake"
+msgstr[1] "IÅÄi _izbrano oznako "
+msgstr[2] "IÅÄi _izbrani oznaki"
+msgstr[3] "IÅÄi _izbrane oznake"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2739
+#, csharp-format
+msgid "Find Selected Tag _With"
+msgid_plural "Find Selected Tags _With"
+msgstr[0] "IÅÄi izbrane oznake _z"
+msgstr[1] "IÅÄi izbrano oznako _z"
+msgstr[2] "IÅÄi izbrani oznaki _z"
+msgstr[3] "IÅÄi izbrane oznake _z"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2780
+msgid "Create New Version?"
+msgid_plural "Create New Versions?"
+msgstr[0] "Ustvari nove razliÄice?"
+msgstr[1] "Ustvari novo razliÄico?"
+msgstr[2] "Ustvari novi razliÄici?"
+msgstr[3] "Ustvari nove razliÄice?"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2782
+#, csharp-format
+msgid "Before launching {1}, should F-Spot create a new version of the selected photo to preserve the original?"
+msgid_plural "Before launching {1}, should F-Spot create new versions of the selected photos to preserve the originals?"
+msgstr[0] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbranih fotografij, da ohrani izvirnike?"
+msgstr[1] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbrane fotografije, da ohrani izvirnik?"
+msgstr[2] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbranih fotografij, da ohrani izvirnika?"
+msgstr[3] "Ali naj pred zagonom {1} F-spot ustvari nove razliÄice izbranih fotografij, da ohrani izvirnike?"
+
+#: ../src/Clients/MainApp/FSpot/MainWindow.cs:2804
+msgid "XCF version"
+msgstr "RazliÄica XCF"
+
+#. Note for translators: Reparented is a picture becoming a version of another one
+#: ../src/Clients/MainApp/FSpot/Photo.cs:430
+msgid "Reparented"
+msgstr "Lastnik je bil spremenjen"
+
+#: ../src/Clients/MainApp/FSpot/Photo.cs:448
+#, csharp-format
+msgid "Modified"
+msgid_plural "Modified ({0})"
+msgstr[0] "Spremenjenih ({0})"
+msgstr[1] "Spremenjena ({0})"
+msgstr[2] "Spremenjeni ({0})"
+msgstr[3] "Spremenjene ({0})"
+
+#: ../src/Clients/MainApp/FSpot/Photo.cs:471
+#, csharp-format
+msgid "Modified in {1}"
+msgstr "Spremenjena v {1}"
+
+#: ../src/Clients/MainApp/FSpot/Photo.cs:471
+#, csharp-format
+msgid "Modified in {1} ({0})"
+msgstr "Spremenjena v {1} ({0})"
+
+#: ../src/Clients/MainApp/FSpot/PhotoStore.cs:202
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:17
+msgid "Original"
+msgstr "Izvorno"
+
+#: ../src/Clients/MainApp/FSpot/PhotoView.cs:353
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../src/Clients/MainApp/FSpot/Preferences.cs:191
+msgid "Photos"
+msgstr "Fotografije"
+
+#: ../src/Clients/MainApp/FSpot/PrintOperation.cs:54
+msgid "Image Settings"
+msgstr "Nastavitve slik"
+
+#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:84
+msgid "Find: "
+msgstr "Najdi: "
+
+#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:89
+msgid "Untagged photos"
+msgstr "NeoznaÄene fotografije"
+
+#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:97
+msgid "Rated photos"
+msgstr "Ocenjene fotografije"
+
+#. Note for translators: 'Import roll' is no command, it means 'Roll that has been imported'
+#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:106
+msgid "Import roll"
+msgstr "Uvozni zvitek"
+
+#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:129
+msgid "Clear search"
+msgstr "ÄiÅÄenje iskanja"
+
+#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:136
+msgid "Refresh search"
+msgstr "OsveÅitev iskanja"
+
+#: ../src/Clients/MainApp/FSpot/QueryWidget.cs:139
+msgid "No matching photos found"
+msgstr "Ni mogoÄe najti skladnih fotografij"
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:99
+msgid "Unable to rotate this type of photo"
+msgstr "Ni mogoÄe vrteti te vrste fotografij"
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:115
+msgid "Unable to rotate readonly file"
+msgstr "Ni mogoÄe vrteti datoteke le za branje"
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:173
+msgid "Rotating photos"
+msgstr "Vrtenje fotografij"
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:184
+#, csharp-format
+msgid "Rotating photo \"{0}\""
+msgstr "Vrtenje fotografije \"{0}\""
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:197
+msgid "Directory not found"
+msgstr "Mape ni mogoÄe najti"
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:199
+msgid "File not found"
+msgstr "Datoteke ni mogoÄe najti"
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:217
+#, csharp-format
+msgid "Unable to rotate photo"
+msgid_plural "Unable to rotate {0} photos"
+msgstr[0] "Ni mogoÄe zavrteti {0} fotografij"
+msgstr[1] "Ni mogoÄe zavrteti {0} fotografije"
+msgstr[2] "Ni mogoÄe zavrteti {0} fotografij"
+msgstr[3] "Ni mogoÄe zavrteti {0} fotografij"
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:219
+#, csharp-format
+msgid "The photo could not be rotated because it is on a read only file system or media such as a CDROM. Please check the permissions and try again."
+msgid_plural "{0} photos could not be rotated because they are on a read only file system or media such as a CDROM. Please check the permissions and try again."
+msgstr[0] "{0} fotografij ni bilo mogoÄe zavrteti, ker se nahajajo na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
+msgstr[1] "{0} fotografije ni bilo mogoÄe zavrteti, ker se nahaja na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
+msgstr[2] "{0} fotografij ni bilo mogoÄe zavrteti, ker se nahajati na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
+msgstr[3] "{0} fotografij ni bilo mogoÄe zavrteti, ker se nahajajo na datoteÄnem sistemu le za branje ali na mediju kot je CDROM. Preverite dovoljenja in poskusite znova."
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:246
+#, csharp-format
+msgid "Received error \"{0}\" while attempting to rotate {1}"
+msgstr "Med poskusom vrtenja {1} je priÅlo do napake \"{0}\""
+
+#: ../src/Clients/MainApp/FSpot/RotateCommand.cs:251
+msgid "Error while rotating photo."
+msgstr "Napaka med vrtenjem fotografije."
+
+#: ../src/Clients/MainApp/FSpot/SendEmail.cs:233
+msgid "Preparing email"
+msgstr "Pripravljanje elektronske poÅte"
+
+#: ../src/Clients/MainApp/FSpot/SendEmail.cs:277
+#, csharp-format
+msgid "Exporting picture \"{0}\""
+msgstr "IzvaÅanje slike \"{0}\""
+
+#: ../src/Clients/MainApp/FSpot/SendEmail.cs:296
+msgid "Error processing image"
+msgstr "Napaka med obdelavo slike"
+
+#: ../src/Clients/MainApp/FSpot/SendEmail.cs:297
+#, csharp-format
+msgid "An error occured while processing \"{0}\": {1}"
+msgstr "Med obdelavo \"{0}\" je priÅlo do napake: {1}"
+
+#. Send the mail :)
+#: ../src/Clients/MainApp/FSpot/SendEmail.cs:310
+msgid "My Photos"
+msgstr "Moje fotografije"
+
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:107
+msgid "Rotate photo left"
+msgstr "Vrtenje fotografije v levo"
+
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:112
+msgid "Rotate photo right"
+msgstr "Vrtenje fotografije v desno"
+
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:148
+msgid "Folder"
+msgstr "Mapa"
+
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:373
+msgid "Open"
+msgstr "Odpri"
+
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:376
+msgid "Select Folder"
+msgstr "Izbor mape"
+
+#: ../src/Clients/MainApp/FSpot/SingleView.cs:460
+msgid "Set as Background"
+msgstr "Nastavi kot ozadje"
+
+#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:67
+#, csharp-format
+msgid "Include Photos Tagged \"{0}\""
+msgstr "VkljuÄi fotografije oznaÄene z \"{0}\""
+
+#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:72
+#, csharp-format
+msgid "Exclude Photos Tagged \"{0}\""
+msgstr "IzkljuÄi fotografije oznaÄene z \"{0}\""
+
+#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:77
+msgid "Remove From Search"
+msgstr "Odstrani iz iskanja"
+
+#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:121
+#, csharp-format
+msgid "Find _With"
+msgid_plural "Find _With"
+msgstr[0] "IÅÄi _z"
+msgstr[1] "IÅÄi _z"
+msgstr[2] "IÅÄi _z"
+msgstr[3] "IÅÄi _z"
+
+#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:147
+msgid "All"
+msgstr "Vse"
+
+#: ../src/Clients/MainApp/FSpot/TagQueryWidget.cs:306
+msgid "Drag tags here to search for them"
+msgstr "Za iskanje po oznakah jih povlecite sem"
+
+#: ../src/Clients/MainApp/FSpot/TagSelectionWidget.cs:521
+msgid "Error renaming tag"
+msgstr "Napaka med preimenovanjem oznake"
+
+#: ../src/Clients/MainApp/FSpot/TagSelectionWidget.cs:522
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs:99
+#: ../src/Clients/MainApp/TagCommands.cs:139
+msgid "This name is already in use"
+msgstr "Ime je Åe v uporabi"
+
+#: ../src/Clients/MainApp/FSpot/TagStore.cs:222
+msgid "Favorites"
+msgstr "Priljubljeno"
+
+#: ../src/Clients/MainApp/FSpot/TagStore.cs:227
+msgid "Hidden"
+msgstr "Skrito"
+
+#: ../src/Clients/MainApp/FSpot/TagStore.cs:235
+msgid "People"
+msgstr "Ljudje"
+
+#: ../src/Clients/MainApp/FSpot/TagStore.cs:240
+msgid "Places"
+msgstr "Mesta"
+
+#: ../src/Clients/MainApp/FSpot/TagStore.cs:245
+msgid "Events"
+msgstr "Dogodki"
+
+#. The label for the root category is used in new and edit tag dialogs
+#: ../src/Clients/MainApp/FSpot/TagStore.cs:257
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:441
+msgid "(None)"
+msgstr "(Brez)"
+
+#: ../src/Clients/MainApp/FSpot/Term.cs:336
+msgid " and "
+msgstr " in "
+
+#. Operators.Add (Catalog.GetString (" && "));
+#: ../src/Clients/MainApp/FSpot/Term.cs:338
+msgid ", "
+msgstr ","
+
+#: ../src/Clients/MainApp/FSpot/Term.cs:394
+msgid " or "
+msgstr " ali "
+
+#. OPS The operators we support, case insensitive
+#. private static string op_str = "(?'Ops' or | and |, | \\s+ )";
+#: ../src/Clients/MainApp/FSpot/Term.cs:415
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:7
+#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:202
+#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:557
+msgid "or"
+msgstr "ali"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:123
+msgid "Photo management for GNOME"
+msgstr "Upravljanje fotografij za GNOME"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:124
+msgid "Copyright  2003-2010 Novell Inc."
+msgstr "Avtorske pravice  2003-2010 Novell Inc."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:148
+msgid "translator-credits"
+msgstr "Andrej ÅnidarÅiÄ <andrej znidarsic gmail com>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs:153
+msgid "F-Spot Website"
+msgstr "SpletiÅÄe F-Spot"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs:137
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:10
+#, csharp-format
+msgid "Shift all photos by {0}"
+msgstr "Premik vseh fotografij za {0}"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:109
+msgid "Today"
+msgstr "Danes"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:111
+msgid "Yesterday"
+msgstr "VÄeraj"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:113
+msgid "Last 7 days"
+msgstr "Zadnjih 7 dni"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:115
+msgid "Last 30 days"
+msgstr "Zadnjih 30 dni"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:117
+msgid "Last 90 days"
+msgstr "Zadnjih 90 dni"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:119
+msgid "Last 360 days"
+msgstr "Zadnjih 360 dni"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:121
+msgid "Current Week (Mon-Sun)"
+msgstr "Trenutni Teden (Pon-Ned)"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:123
+msgid "Previous Week (Mon-Sun)"
+msgstr "Predhodni Teden (Pon-Ned)"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:139
+#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:1
+msgid "All Images"
+msgstr "Vse slike"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs:141
+msgid "Customized Range"
+msgstr "Obseg po meri"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs:50
+#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:107
+#, csharp-format
+msgid "Received exception \"{0}\". Unable to save photo {1}"
+msgstr "Prejeta je bila izjema \"{0}\". Ni mogoÄe shraniti fotografije {1}"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs:63
+msgid "Error editing photo"
+msgstr "Napaka med urejanjem fotografije"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:64
+#, csharp-format
+msgid "Edit Icon for Tag {0}"
+msgstr "Urejanje ikone za oznako {0}"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:86
+msgid "Select Photo from file"
+msgstr "Izberi fotografijo iz datoteke"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:108
+#, csharp-format
+msgid ""
+"\n"
+"<b>From Photo</b>\n"
+" You can use one of your library photos as an icon for this tag.\n"
+" However, first you must have at least one photo associated\n"
+" with this tag. Please tag a photo as '{0}' and return here\n"
+" to use it as an icon."
+msgstr ""
+"\n"
+"<b>S Fotografije</b>\n"
+" Kot ikono za to oznako lahko uporabite eno od fotografij iz vaÅe\n"
+" knjiÅnice. Najprej morate imeti vsaj eno fotografijo oznaÄeno\n"
+" s to oznako. OznaÄite fotografijo kot '{0}' in se vrnite sem,\n"
+"da jo lahko uporabite kot ikono."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:186
+msgid "Unable to load image"
+msgstr "Ni mogoÄe naloÅiti slike."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:187
+#, csharp-format
+msgid "Unable to load \"{0}\" as icon for the tag"
+msgstr "Ni mogoÄe naloÅiti \"{0}\" kot ikono za oznako"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs:225
+#, csharp-format
+msgid "Photo {0} of {1}"
+msgstr "Fotografija {0} od {1}"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:45
+msgid "Choose Folder..."
+msgstr "Izbor mape ...."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:164
+msgid "Choose Import source..."
+msgstr "Izbor vira uvoza ..."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:176
+msgid "(No Cameras Detected)"
+msgstr "(Ni zaznanih fotoaparatov)"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:211
+msgid ""
+"Checking this box will remove the imported photos from the camera after the import finished successfully.\n"
+"\n"
+"It is generally recommended to backup your photos before removing them from the camera. <b>Use this option at your own risk!</b>"
+msgstr ""
+"Izbira tega polja bo po uspeÅnemu uvozu odstranila uvoÅene fotografije s fotoaparata.\n"
+"\n"
+"PriporoÄamo da pred odstranitvijo svojih fotografij z digitalnega fotoaparata napravite varnostno kopijo. <b>To moÅnost uporabljate na lastno odgovornost!</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:212
+msgid "Warning"
+msgstr "Opozorilo"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:331
+#, csharp-format
+msgid "Importing Photos: {0} of {1}..."
+msgstr "UvaÅanje fotografij: {0} od {1} ..."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:355
+msgid "Importing photos..."
+msgstr "UvaÅanje fotografij ..."
+
+#. TODO: Using a GtkSpinner would be nicer here.
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs:362
+msgid "Searching for photos... (You can already click Import to continue)"
+msgstr "Iskanje fotografij ... (za nadaljevanje lahko Åe kliknite Uvozi)"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:65
+msgid "Import failures"
+msgstr "Napake uvoza"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:66
+msgid "Some files failed to import"
+msgstr "Uvoz nekaterih datotek je spodletel"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:67
+msgid "Some files could not be imported, they might be corrupt or there might be something wrong with the storage on which they reside."
+msgstr "Nekaterih datotek ni bilo mogoÄe uvoziti. Morda so pokvarjene ali pa je morda nekaj narobe z njihovo shrambo."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs:130
+msgid "Details"
+msgstr "Podrobnosti"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:77
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:100
+msgid "None"
+msgstr "Brez"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:79
+msgid "System profile"
+msgstr "Sistemski profil"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs:117
+msgid "Standard theme"
+msgstr "ObiÄajna tema"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs:44
+msgid "Error loading database."
+msgstr "Napaka med nalaganjem podatkovne zbirke."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs:45
+#, csharp-format
+msgid "F-Spot encountered an error while loading the photo database. The old database has be moved to {0} and a new database has been created."
+msgstr "PriÅlo je do napake med nalaganjem podatkovne zbirke fotografij. Stara podatkovna zbirka je bila premaknjena v {0}, zato je bila ustvarjena nova."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs:81
+msgid "Label"
+msgstr "Oznaka"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs:85
+msgid "Ratio"
+msgstr "Razmerje"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs:78
+msgid "Retry"
+msgstr "Poskusi znova"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs:80
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/pickfolder_dialog.ui.h:1
+msgid "Skip"
+msgstr "PreskoÄi"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:1
+msgid "0000:00:00 00:00:00"
+msgstr "0000:00:00 00:00:00"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:2
+msgid "00:00:00"
+msgstr "00:00:00"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:3
+msgid "5"
+msgstr "5"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:4
+msgid "<b>Action</b>"
+msgstr "<b>Dejanje</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:5
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:6
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:2
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:3
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:3
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:2
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:2
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:2
+msgid "<b>Photos</b>"
+msgstr "<b>Fotografije</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:6
+msgid "<b>Reference Photo</b>"
+msgstr "<b>ReferenÄna fotografija</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:7
+msgid "Adjust Time"
+msgstr "Prilagodi Äas"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:8
+msgid "Adjusted date: "
+msgstr "Prilagojen datum:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:9
+msgid "Current date:"
+msgstr "Trenutni datum:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:11
+msgid "Space all photos by"
+msgstr "Razmakni vse fotografije za"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:12
+msgid "difference:"
+msgstr "razlika:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/AdjustTimeDialog.ui.h:13
+msgid "min. Starting at {0}"
+msgstr "najmanjÅi zaÄetek pri {0}"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:1
+msgid "C_reate"
+msgstr "Ustva_ri"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:2
+msgid "Create _icon for this tag when first used"
+msgstr "Ustvari _ikono za to oznako ob prvi uporabi"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:3
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:3
+msgid "P_arent Tag:"
+msgstr "N_adrejena oznaka:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/CreateTagDialog.ui.h:4
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:5
+msgid "_Tag Name:"
+msgstr "Ime _oznake:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:1
+msgid "<b>End Date</b>"
+msgstr "<b>KonÄni datum</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:2
+msgid "<b>Select period</b>"
+msgstr "<b>Izberi obdobje</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:3
+msgid "<b>Start Date</b>"
+msgstr "<b>ZaÄetni datum</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:4
+msgid "Cancel, do not change the current timeline. "
+msgstr "PrekliÄi, ne spremeni trenutne Äasovnice."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:5
+msgid "Only photos taken within these dates will be displayed."
+msgstr "Prikazane bodo le fotografije znotraj teh datumov."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/DateRangeDialog.ui.h:6
+msgid "Set date range"
+msgstr "Nastavi obseg datumov"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:1
+msgid "Edit Tag"
+msgstr "Urejanje oznake"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:2
+msgid "Edit icon"
+msgstr "Urejanje ikone"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagDialog.ui.h:4
+msgid "_Icon:"
+msgstr "_Ikona:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:1
+msgid "<b>From External Photo</b>"
+msgstr "<b>Iz zunanje fotografije</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:2
+msgid "<b>From Photo</b>"
+msgstr "<b>Iz fotografije</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:3
+msgid "<b>Predefined icons</b>"
+msgstr "<b>Pred doloÄene ikone</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:4
+msgid "<b>Preview</b>"
+msgstr "<b>Predogled</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:5
+msgid "Design icon from"
+msgstr "Oblika ikone od "
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:6
+msgid "Edit Tag Icon"
+msgstr "Urejanje ikone oznake"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/EditTagIconDialog.ui.h:7
+msgid "No _image"
+msgstr "_Brez slike"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:1
+msgid "<b>View all pictures imported</b>"
+msgstr "<b>Ogled vseh uvoÅenih slik</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:2
+msgid "Display only those photos that were imported in specified Rolls."
+msgstr "Prikaz le tistih fotografij, ki so bile uvoÅene v navedenih zvitkih."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:3
+msgid "Filter on selected rolls"
+msgstr "Filter na izbranih zvitkih"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:4
+msgid "Number of photos in selected rolls:"
+msgstr "Åtevilo fotografij v izbranih zvitkih:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:5
+msgid "Show all photos."
+msgstr "PokaÅi vse fotografije."
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:6
+msgid "after"
+msgstr "za"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:7
+#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:202
+#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:558
+msgid "and"
+msgstr "in"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:8
+msgid "at"
+msgstr "ob"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/LastImportRollFilterDialog.ui.h:9
+msgid "between"
+msgstr "med"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:1
+msgid "Color profile for display:"
+msgstr "Barvni profil za zaslon:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:2
+msgid "Color profile for printing:"
+msgstr "Barvni profil za tiskanje:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:3
+msgid "F-Spot Preferences"
+msgstr "MoÅnosti F-Spot"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:4
+msgid "F-Spot appearance:"
+msgstr "Videz F-spot:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:5
+msgid ""
+"Inside the image files when possible\n"
+"<small>Makes them accessible to other image-editing programs.</small>"
+msgstr ""
+"Znotraj slikovnih datotek, Äe je mogoÄe\n"
+"<small>To naredi slike dostopne ostalim programom za urejanje slik.</small>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:7
+msgid ""
+"Never modify image files.\n"
+"<small>Write XMP files next to the images instead.</small>"
+msgstr ""
+"Nikoli ne spreminjaj slikovnih datotek.\n"
+"<small>Namesto tega zapiÅi datoteke XMP poleg slik.</small>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:9
+msgid "Select A Folder"
+msgstr "Izbira mape"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:10
+msgid "Separately from the image files"
+msgstr "LoÄeno od slikovnih datotek"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:11
+msgid "Store tags and descriptions for photos:"
+msgstr "Shranjevanje oznak in opisov fotografij:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/PreferenceDialog.ui.h:12
+msgid "When importing photos, copy them to:"
+msgstr "Pri uvaÅanju fotografij jih kopiraj v:"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RatingFilterDialog.ui.h:1
+msgid "<b>Max Rating</b>"
+msgstr "<b>NajviÅja Ocena</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RatingFilterDialog.ui.h:2
+msgid "<b>Min Rating</b>"
+msgstr "<b>NajniÅja Ocena</b>"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RatingFilterDialog.ui.h:3
+msgid "Set Rating Filter"
+msgstr "Nastavitev filtrov ocen"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/RepairDialog.ui.h:1
+msgid "Repair"
+msgstr "Popravi"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui.h:1
+msgid "Manage your custom selection ratios"
+msgstr "Upravljanje razmerij za izbiranje po meri"
+
+#: ../src/Clients/MainApp/FSpot.UI.Dialog/ui/SelectionRatioDialog.ui.h:2
+msgid "Selection Constraints"
+msgstr "Izbira omejitev"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:55
+#: ../src/Clients/MainApp/FSpot.Widgets/Sidebar.cs:73
+msgid "Edit"
+msgstr "Urejanje"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:223
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:66
+msgid "No selection available"
+msgstr "Na voljo ni nobene izbire"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:224
+msgid "This tool requires an active selection. Please select a region of the photo and try the operation again"
+msgstr "Orodje zahteva dejavno izbiro. Izberite obmoÄje na fotografiji in poskusite znova"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:242
+msgid "Error saving adjusted photo"
+msgid_plural "Error saving adjusted photos"
+msgstr[0] "Napaka med shranjevanjem prilagojenih fotografij"
+msgstr[1] "Napaka med shranjevanjem prilagojene fotografije"
+msgstr[2] "Napaka med shranjevanjem prilagojenih fotografij"
+msgstr[3] "Napaka med shranjevanjem prilagojenih fotografij"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/EditorPage.cs:244
+#, csharp-format
+msgid "Received exception \"{0}\". Note that you have to develop RAW files into JPEG before you can edit them."
+msgstr "Prejeta je bila izjema \"{0}\". Datoteke RAW je treba pred urejanjem razviti v JPEG."
+
+#: ../src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs:497
+msgid "_Horizontal"
+msgstr "_Vodoravno"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs:501
+msgid "_Vertical"
+msgstr "_NavpiÄno"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/FindBar.cs:83
+msgid "Find:"
+msgstr "Najdi:"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs:44
+msgid "Folders"
+msgstr "Mape"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs:159
+msgid "Filesystem"
+msgstr "DatoteÄni sistem"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:125
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:401
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:451
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:457
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:461
+msgid "(Unknown)"
+msgstr "(neznano)"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:305
+msgid "Histogram"
+msgstr "Histogram"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:324
+msgid "Image Information"
+msgstr "Podrobnosti o sliki"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:332
+#, csharp-format
+msgid "{0} Photos"
+msgstr "{0} fotografij"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:334
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:10
+msgid "Name"
+msgstr "Ime"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:346
+msgid "Version"
+msgstr "RazliÄica"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:361
+#: ../src/Clients/MainApp/PhotoVersionMenu.cs:86
+msgid "(No Edits)"
+msgstr "(Ni urejanj)"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:365
+#, csharp-format
+msgid "(One Edit)"
+msgid_plural "({0} Edits)"
+msgstr[0] "({0} urejanj)"
+msgstr[1] "({0} urejanje)"
+msgstr[2] "({0} urejanji)"
+msgstr[3] "({0} urejanja)"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:371
+msgid "Date"
+msgstr "Datum"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:371
+msgid "Show Date"
+msgstr "PokaÅi datum"
+
+#. Note for translators: {0} is a date, {1} and {2} are times.
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:382
+#, csharp-format
+msgid ""
+"On {0} between \n"
+"{1} and {2}"
+msgstr ""
+"Na {0} med \n"
+"{1} in {2}"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:387
+#, csharp-format
+msgid ""
+"Between {0} \n"
+"and {1}"
+msgstr ""
+"Med {0} \n"
+"in {1}"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:393
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:4
+msgid "Size"
+msgstr "Velikost"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:393
+msgid "Show Size"
+msgstr "PokaÅi velikost"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:404
+msgid "Exposure"
+msgstr "Osvetljenost"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:404
+msgid "Show Exposure"
+msgstr "PokaÅi osvetlitev"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:434
+msgid "flash fired"
+msgstr "bliskavica se je sproÅila"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:436
+msgid "flash didn't fire"
+msgstr "bliskavica se ni sproÅila"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:446
+msgid "Focal Length"
+msgstr "GoriÅÄna razdalja"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:446
+msgid "Show Focal Length"
+msgstr "PokaÅi goriÅÄno razdaljo"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:456
+msgid "Camera"
+msgstr "Fotoaparat"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:456
+msgid "Show Camera"
+msgstr "PokaÅi fotoaparat"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:460
+msgid "Creator"
+msgstr "Ustvarjalec"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:460
+msgid "Show Creator"
+msgstr "PokaÅi ustvarjalca"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:464
+msgid "File Size"
+msgstr "Velikost datoteke"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:464
+msgid "Show File Size"
+msgstr "PokaÅi velikost datotek"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:472
+msgid "(File read error)"
+msgstr "(Napaka med branjem datoteke)"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:480
+msgid "Rating"
+msgstr "Ocena"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:480
+msgid "Show Rating"
+msgstr "PokaÅi oceno"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/InfoBox.cs:484
+msgid "Show Tags"
+msgstr "PrikaÅi oznake"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:46
+msgid "Metadata"
+msgstr "Metapodatki"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:127
+msgid "Extended Metadata"
+msgstr "RazÅirjeni metapodatki"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:380
+msgid "No active photo"
+msgstr "Ni dejavnih fotografij"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:382
+#, csharp-format
+msgid "The photo \"{0}\" does not exist"
+msgstr "Fotografija \"{0}\" ne obstaja"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs:384
+msgid "No metadata available"
+msgstr "Metapodatki niso na voljo"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:106
+msgid "Error saving sharpened photo"
+msgstr "Napaka med shranjevanjem izostrene datoteke"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:152
+msgid "Sharpen"
+msgstr "Izostritev"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:162
+msgid "Amount:"
+msgstr "KoliÄina:"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:163
+msgid "Radius:"
+msgstr "Polmer:"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/Sharpener.cs:164
+msgid "Threshold:"
+msgstr "Prag:"
+
+#: ../src/Clients/MainApp/FSpot.Widgets/TagMenu.cs:132
+#: ../src/Clients/MainApp/TagPopup.cs:61
+msgid "Create New Tag..."
+msgstr "Ustvari novo oznako ..."
+
+#. Fixme this should really set parent menu
+#. items insensitve
+#: ../src/Clients/MainApp/PhotoTagMenu.cs:68
+msgid "(No Tags)"
+msgstr "(Ni oznak)"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:91
+msgid "Create New Version"
+msgstr "Ustvari novo razliÄico"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:92
+msgid "Name:"
+msgstr "Ime:"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:96
+msgid "Rename Version"
+msgstr "Preimenuj razliÄico"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:97
+msgid "New name:"
+msgstr "Novo ime:"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:157
+msgid "Delete"
+msgstr "IzbriÅi"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:158
+#, csharp-format
+msgid "Really delete version \"{0}\"?"
+msgstr "Ali zares Åelite izbrisati razliÄico \"{0}\"?"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:159
+msgid "This removes the version and deletes the corresponding file from disk."
+msgstr "To odstrani razliÄico in izbriÅe ustrezno datoteko z diska."
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:204
+msgid "De_tach"
+msgstr "O_dpni"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:205
+#, csharp-format
+msgid "Really detach version \"{0}\" from \"{1}\"?"
+msgstr "ResniÄno odpni razliÄico \"{0}\" od \"{1}\"?"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:206
+msgid "This makes the version appear as a separate photo in the library. To undo, drag the new photo back to its parent."
+msgstr "RazliÄice fotografije se v knjiÅnici pojavijo kot razliÄne fotografije. Za razveljavitve povlecite novo fotografijo nazaj k starÅevski fotografiji. "
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:228
+msgid "Re_parent"
+msgstr "Pri_pni"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:229
+#, csharp-format
+msgid "Really reparent \"{0}\" as version of \"{1}\"?"
+msgid_plural "Really reparent {2} photos as versions of \"{1}\"?"
+msgstr[0] "Ali zares Åelite znova pripeti {2} fotografij kot razliÄice \"{1}\"?"
+msgstr[1] "Ali zares Åelite znova pripeti {2} fotografijo kot razliÄico \"{1}\"?"
+msgstr[2] "Ali zares Åelite znova pripeti {2} fotografiji kot razliÄici \"{1}\"?"
+msgstr[3] "Ali zares Åelite znova pripeti {2} fotografije kot razliÄice \"{1}\"?"
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:232
+msgid "This makes the photos appear as a single one in the library. The versions can be detached using the Photo menu."
+msgstr "Fotografije se v knjiÅnici pojavijo kot ena fotografija. RazliÄice je mogoÄe odpeti v meniju Fotografija."
+
+#: ../src/Clients/MainApp/PhotoVersionCommands.cs:272
+#, csharp-format
+msgid "Received exception \"{0}\"."
+msgstr "Prejeta je bila izjema \"{0}\"."
+
+#: ../src/Clients/MainApp/TagCommands.cs:189
+msgid "Create New Tag"
+msgstr "Ustvari novo oznako"
+
+#: ../src/Clients/MainApp/TagCommands.cs:190
+msgid "Name of New Tag:"
+msgstr "Ime nove oznake:"
+
+#: ../src/Clients/MainApp/TagPopup.cs:51
+#, csharp-format
+msgid "Find"
+msgid_plural "Find"
+msgstr[0] "Iskanje"
+msgstr[1] "Iskanje"
+msgstr[2] "Iskanje"
+msgstr[3] "Iskanje"
+
+#: ../src/Clients/MainApp/TagPopup.cs:67
+msgid "Edit Tag..."
+msgstr "Urejanje oznake ..."
+
+#: ../src/Clients/MainApp/TagPopup.cs:72
+msgid "Delete Tag"
+msgid_plural "Delete Tags"
+msgstr[0] "IzbriÅi oznake"
+msgstr[1] "IzbriÅi oznako"
+msgstr[2] "IzbriÅi oznaki"
+msgstr[3] "IzbriÅi oznake"
+
+#: ../src/Clients/MainApp/TagPopup.cs:78
+msgid "Attach Tag to Selection"
+msgid_plural "Attach Tags to Selection"
+msgstr[0] "Dodajanje oznak izboru"
+msgstr[1] "Dodajanje oznake izboru"
+msgstr[2] "Dodajanje oznak izboru"
+msgstr[3] "Dodajanje oznak izboru"
+
+#: ../src/Clients/MainApp/TagPopup.cs:82
+msgid "Remove Tag From Selection"
+msgid_plural "Remove Tags From Selection"
+msgstr[0] "Odstranitev oznak iz izbora"
+msgstr[1] "Odstranitev oznake iz izbora"
+msgstr[2] "Odstranitev oznak iz izbora"
+msgstr[3] "Odstranitev oznak iz izbora"
+
+#: ../src/Clients/MainApp/TagPopup.cs:88
+msgid "Merge Tags"
+msgstr "ZdruÅi oznake"
+
+#: ../src/Clients/MainApp/ThumbnailCommand.cs:54
+msgid "Updating Thumbnails"
+msgstr "Posodabljanje sliÄic"
+
+#: ../src/Clients/MainApp/ThumbnailCommand.cs:62
+#, csharp-format
+msgid "Updating picture \"{0}\""
+msgstr "Posodabljanje slike \"{0}\""
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:1
+msgid "<b>Co_rrections</b>"
+msgstr "<b>Pop_ravki</b>"
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:2
+msgid "<b>_White Balance</b>"
+msgstr "<b>_RavnoteÅje bele barve</b>"
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:3
+msgid "C_ontrast:"
+msgstr "K_ontrast:"
+
+#. Note for translators: meant as Temperature
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:5
+msgid "Te_mp:"
+msgstr "ZaÄ_asno:"
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:6
+msgid "_Brightness:"
+msgstr "Svet_lost:"
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:7
+msgid "_Exposure:"
+msgstr "Izpos_tavljenost:"
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:8
+msgid "_Hue:"
+msgstr "_Odtenek:"
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:9
+msgid "_Saturation:"
+msgstr "N_asiÄenost:"
+
+#: ../src/Clients/MainApp/ui/color_editor_prefs_window.ui.h:10
+msgid "_Tint:"
+msgstr "_Ärnilo:"
+
+#: ../src/Clients/MainApp/ui/import.ui.h:1
+msgid "C_opy files to the Photos folder"
+msgstr "_Kopiranj datoteke v mapo fotografij"
+
+#: ../src/Clients/MainApp/ui/import.ui.h:2
+msgid "I_nclude subfolders"
+msgstr "_VkljuÄi podmape"
+
+#. Translators: this string means 'source of import'
+#: ../src/Clients/MainApp/ui/import.ui.h:5
+msgid "Import _from:"
+msgstr "Uvozi _iz:"
+
+#: ../src/Clients/MainApp/ui/import.ui.h:6
+msgid "_Attach tags:"
+msgstr "_Pripni oznake:"
+
+#: ../src/Clients/MainApp/ui/import.ui.h:7
+msgid "_Detect duplicates"
+msgstr "_Zaznaj dvojnike"
+
+#: ../src/Clients/MainApp/ui/import.ui.h:8
+msgid "_Import"
+msgstr "_Uvozi"
+
+#: ../src/Clients/MainApp/ui/import.ui.h:9
+msgid "_Remove original files after import"
+msgstr "_Odstrani izvorne datoteke po uvozu"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:1
+msgid "1024 px"
+msgstr "1024 px"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:2
+msgid "320 px"
+msgstr "320 px"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:3
+msgid "480 px"
+msgstr "480 px"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:4
+msgid "640 px"
+msgstr "640 px"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:5
+msgid "800 px"
+msgstr "800 px"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:7
+msgid "<b>Size</b>"
+msgstr "<b>Velikost</b>"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:8
+msgid "<b>Summary</b>"
+msgstr "<b>Povzetek</b>"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:9
+msgid "Create Mail"
+msgstr "Ustvari poÅto"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:10
+msgid "Create a mail with the selected photos (possibly resized) attached"
+msgstr "Ustvari poÅto s pripetimi fotografijami (po moÅnosti spremenjenih velikosti)"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:11
+msgid "Do not send a mail"
+msgstr "Ne poÅlji poÅte"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:12
+msgid "Estimated new size"
+msgstr "Ocenjena nova velikost"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:13
+msgid "Extra large"
+msgstr "Zelo velika"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:14
+msgid "Large"
+msgstr "Velika"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:15
+msgid "Medium"
+msgstr "Srednja"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:16
+msgid "Number of pictures"
+msgstr "Åtevilo slik"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:18
+msgid "Original size (possible very large file size)"
+msgstr "Izvorna velikost (morda zelo velika velikost datotek)"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:19
+msgid "Small"
+msgstr "Majhna"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:20
+msgid "Tiny"
+msgstr "Drobcena"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:21
+msgid "Total original size"
+msgstr "Skupna izvorna velikost"
+
+#: ../src/Clients/MainApp/ui/mail_dialog.ui.h:22
+msgid "_Create Mail"
+msgstr "_Ustvari poÅto"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:1
+msgid "Adjust _Time..."
+msgstr "Prilagodi _Äas ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:2
+msgid "Arrange _by"
+msgstr "Uredi _po"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:4
+msgid "By _Date"
+msgstr "Po _datumu"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:5
+msgid "By _Import Roll"
+msgstr "Po _uvoznem zvitku"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:6
+msgid "By _Rating"
+msgstr "Po _oceni"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:7
+msgid "Copy"
+msgstr "Kopiraj"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:8
+msgid "Create New _Tag..."
+msgstr "Ustvari novo _oznako ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:9
+msgid "Create _New Version..."
+msgstr "Ustvari _novo razliÄico ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:10
+msgid "De_tach Version"
+msgstr "O_dpni razliÄico"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:11
+msgid "Fin_d"
+msgstr "Naj_di"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:12
+msgid "Manage _Extensions"
+msgstr "Upravljanje _razÅiritev"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:13
+msgid "Page Set_up..."
+msgstr "Nas_tavitve strani ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:14
+msgid "Re_fresh Thumbnail"
+msgstr "O_sveÅi sliÄico"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:18
+msgid "Select _All"
+msgstr "Izberi _vse"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:19
+msgid "Select _None"
+msgstr "Ne izberi _niÄesar"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:20
+msgid "Send by _Mail..."
+msgstr "PoÅlji po _poÅti ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:21
+#: ../src/Clients/MainApp/ui/single_view.ui.h:3
+msgid "Set as _Background"
+msgstr "Nastavi kot _ozadje"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:22
+msgid "Side_bar"
+msgstr "Stranska v_rstica"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:23
+msgid "T_ags"
+msgstr "Ozn_ake"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:24
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1118
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1119
+msgid "Tags: "
+msgstr "Oznake:"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:25
+msgid "Thumbnail _elements"
+msgstr "_Elementi sliÄic"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:26
+msgid "Too_lbar"
+msgstr "O_rodna vrstica"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:27
+msgid "View"
+msgstr "Pogled"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:28
+#: ../src/Clients/MainApp/ui/single_view.ui.h:7
+msgid "Zoom _in"
+msgstr "_PribliÅaj"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:29
+#: ../src/Clients/MainApp/ui/single_view.ui.h:8
+msgid "Zoom _out"
+msgstr "_Oddalji"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:30
+#: ../src/Clients/MainApp/ui/single_view.ui.h:9
+msgid "Zoom in"
+msgstr "PribliÅaj"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:31
+#: ../src/Clients/MainApp/ui/single_view.ui.h:10
+msgid "Zoom out"
+msgstr "Oddalji"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:32
+msgid "_Attach Tag"
+msgstr "_Pripni oznake"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:33
+msgid "_Attach Tag to Selection"
+msgstr "_Pripni oznako izboru"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:35
+msgid "_Clear Rating Filter"
+msgstr "_PoÄisti filter ocen"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:36
+msgid "_Clear Roll Filter"
+msgstr "_PoÄisti filter zvitkov"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:37
+msgid "_Close"
+msgstr "_Zapri"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:38
+msgid "_Components"
+msgstr "_Sestavni deli"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:39
+msgid "_Contents"
+msgstr "_Vsebina"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:40
+msgid "_Dates"
+msgstr "_Datumi"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:42
+msgid "_Delete Selected Tag"
+msgstr "_IzbriÅi izbrano oznako"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:43
+msgid "_Delete Version"
+msgstr "_IzbriÅi razliÄico"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:44
+#: ../src/Clients/MainApp/ui/single_view.ui.h:11
+msgid "_Edit"
+msgstr "_Uredi"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:45
+msgid "_Edit Tag..."
+msgstr "_Uredi oznako ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:46
+msgid "_Export to"
+msgstr "_Izvozi v"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:47
+msgid "_Filmstrip"
+msgstr "_Filmski trak"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:48
+#: ../src/Clients/MainApp/ui/single_view.ui.h:13
+msgid "_Fullscreen"
+msgstr "_Celozaslonski naÄin"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:49
+#: ../src/Clients/MainApp/ui/single_view.ui.h:14
+msgid "_Help"
+msgstr "Pomo_Ä"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:50
+msgid "_Hidden"
+msgstr "_Skrito"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:51
+msgid "_Import..."
+msgstr "_Uvozi ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:52
+msgid "_Invert Selection"
+msgstr "Obrni _izbor"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:53
+msgid "_Large"
+msgstr "_Velike"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:54
+msgid "_Last Import Roll"
+msgstr "_Zadnji uvozni zvitek"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:55
+msgid "_Loupe"
+msgstr "_LeÄa"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:56
+msgid "_Medium"
+msgstr "_Srednje"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:57
+#: ../src/Clients/MainApp/ui/single_view.ui.h:15
+msgid "_Photo"
+msgstr "_Fotografija"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:58
+msgid "_Quit"
+msgstr "_KonÄaj"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:59
+msgid "_Ratings"
+msgstr "_Ocene"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:61
+msgid "_Remove Tag From Selection"
+msgstr "_Odstrani oznako iz izbora"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:62
+msgid "_Rename Version"
+msgstr "_Preimenuj razliÄico"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:63
+msgid "_Reverse Order"
+msgstr "_Obrnjen vrstni red"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:64
+msgid "_Select Import Rolls..."
+msgstr "Izberi _uvozne zvitke ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:65
+msgid "_Set Date Range..."
+msgstr "Nastavi _obsega datumov ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:66
+msgid "_Set Rating filter..."
+msgstr "_Nastavi filter ocen ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:67
+msgid "_Sharpen..."
+msgstr "_Izostri ..."
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:68
+#: ../src/Clients/MainApp/ui/single_view.ui.h:16
+msgid "_Slideshow"
+msgstr "_Diapredstavitev"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:69
+msgid "_Small"
+msgstr "_Majhne"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:70
+msgid "_Tag Icons"
+msgstr "_Ikone oznak"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:71
+msgid "_Tags"
+msgstr "O_znake"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:72
+msgid "_Timeline"
+msgstr "_Äasovnica"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:73
+msgid "_Tools"
+msgstr "_Orodja"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:74
+msgid "_Untagged Photos"
+msgstr "_NeoznaÄene fotografije"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:75
+msgid "_Version"
+msgstr "_RazliÄica"
+
+#: ../src/Clients/MainApp/ui/main_window.ui.h:76
+#: ../src/Clients/MainApp/ui/single_view.ui.h:18
+msgid "_View"
+msgstr "_Pogled"
+
+#: ../src/Clients/MainApp/ui/single_view.ui.h:1
+msgid "Display File _Names"
+msgstr "Prikaz imen _datotek"
+
+#: ../src/Clients/MainApp/ui/single_view.ui.h:2
+msgid "F-Spot View"
+msgstr "F-Spot pogled"
+
+#: ../src/Clients/MainApp/ui/single_view.ui.h:4
+msgid "Show or hide the side pane"
+msgstr "PokaÅe ali skrije stranski pladenj"
+
+#: ../src/Clients/MainApp/ui/single_view.ui.h:5
+msgid "Show or hide the toolbar"
+msgstr "PokaÅe ali skrije orodno vrstico"
+
+#: ../src/Clients/MainApp/ui/single_view.ui.h:6
+msgid "Side _pane"
+msgstr "_Stranski pladenj"
+
+#: ../src/Clients/MainApp/ui/single_view.ui.h:12
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:7
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:14
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:13
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:8
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:7
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:8
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:9
+msgid "_Export"
+msgstr "_Izvozi"
+
+#: ../src/Clients/MainApp/ui/single_view.ui.h:17
+msgid "_Toolbar"
+msgstr "_Orodna vrstica"
+
+#: ../src/Clients/MainApp/ui/tag_selection_dialog.ui.h:1
+msgid "Select a Tag..."
+msgstr "Izbor oznake ..."
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:1
+msgid "<b>Image Interpolation</b>"
+msgstr "<b>Interpolacija slike</b>"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:2
+msgid "<b>Transparent Parts</b>"
+msgstr "<b>Prozorni deli</b>"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:3
+msgid "<small><i>Enable this to allow interpolation on zoomed images. You shouldn't disable this for viewing photos, but disabling the interpolation could be usefull in icon design.</i></small>"
+msgstr "<small><i>MoÅnost omogoÄa interpolacijo pribliÅanih slik. Ta moÅnost za ogled fotografij ni priporoÄena, toda njeno onemogoÄanje bi lahko bilo uporabno pri oblikovanju ikon.</i></small>"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:4
+msgid "<small><i>You can choose how to display transparent parts in images. This option has no effect on photos, but setting this as check pattern or custom color could be usefull when viewing icons or other artworks with transparent parts.</i></small>"
+msgstr "<small><i>MogoÄe je izbrati naÄin prikaza prozornih delov slik. Ta moÅnost ne vpliva na fotografije, vendar je lahko koristna pri ogledu ikon in ostalih grafiÄnih podob s prozornimi deli.</i></small>"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:5
+msgid "As _background"
+msgstr "Kot _ozadje"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:6
+msgid "As _custom color: "
+msgstr "Kot barvo _po meri"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:7
+msgid "As check _pattern"
+msgstr "Kot _vzorec Åahovnice"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:8
+msgid "Preferences"
+msgstr "MoÅnosti"
+
+#: ../src/Clients/MainApp/ui/viewer_preferences.ui.h:9
+msgid "_Interpolate image on zoom"
+msgstr "_Interpolacija slike pri pribliÅanju"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:141
+msgid "Page Setup"
+msgstr "Nastavitve strani"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:145
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:149
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:155
+#, csharp-format
+msgid "Paper Size: {0} x {1} mm"
+msgstr "Velikost papirja: {0} x {1} mm"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:152
+msgid "Set Page Size and Orientation"
+msgstr "Nastavi velikost in usmerjenost strani"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:163
+msgid "Photos per page"
+msgstr "Fotografije na stran"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:173
+msgid "Repeat"
+msgstr "Ponavljanje"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:174
+msgid "Print cut marks"
+msgstr "Natisni oznake za izrez"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:180
+msgid "Photos layout"
+msgstr "Razporeditev fotografij"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:182
+msgid "Full Page (no margin)"
+msgstr "Polna stran (brez robov)"
+
+#. Note for translators: "Zoom" is a Fit Mode
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:185
+msgid "Zoom"
+msgstr "PribliÅevanje"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:186
+msgid "Fill"
+msgstr "Zapolni"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:187
+msgid "Scaled"
+msgstr "Prilagojena velikost"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:192
+msgid "White borders"
+msgstr "Bele obrobe"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:198
+msgid "Custom Text"
+msgstr "Besedilo po meri"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:202
+msgid "Photos infos"
+msgstr "Podrobnosti o fotografijah"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:204
+msgid "Print file name"
+msgstr "Natisni ime datoteke"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:205
+msgid "Print photo date"
+msgstr "Natisni datum posnetka fotografije"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:206
+msgid "Print photo time"
+msgstr "Natisni Äas posnetka fotografije"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:207
+msgid "Print photo tags"
+msgstr "Natisni oznake fotografij"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs:208
+msgid "Print photo comment"
+msgstr "Natisni opombe fotografij"
+
+#: ../src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs:88
+msgid "No applications available"
+msgstr "Ni razpoloÅljivih programov"
+
+#: ../src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs:38
+msgid "Blackout"
+msgstr "PoÄrni"
+
+#: ../src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Addins.Editors/BlackoutEditor.cs:46
+msgid "Select the area that you want blacked out."
+msgstr "Izberite podroÄje, ki ga Åelite poÄrniti."
+
+#: ../src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs:41
+msgid "Convert to B/W"
+msgstr "Pretvori v Ärno-blo"
+
+#: ../src/Extensions/Editors/FSpot.Editors.BW/FSpot.Addins.Editors/BWEditor.cs:44
+msgid "Apply"
+msgstr "Uveljavi"
+
+#: ../src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Addins.Editors/FlipEditor.cs:37
+msgid "Flip"
+msgstr "Zrcaljenje"
+
+#: ../src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs:40
+msgid "Pixelate"
+msgstr "Pretvori v toÄke"
+
+#: ../src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Addins.Editors/PixelateEditor.cs:48
+msgid "Select the area that you want pixelated."
+msgstr "Izberite podroÄje, ki ga Åelite pretvoriti v toÄke."
+
+#: ../src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Addins.Editors/ResizeEditor.cs:42
+msgid "Resize"
+msgstr "Spremeni velikost"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:79
+msgid "Transferring Pictures"
+msgstr "PrenaÅanje slik"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:132
+#, csharp-format
+msgid "Transferring picture \"{0}\" To CD"
+msgstr "PrenaÅanje slike \"{0}\" na CD"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:147
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:392
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:421
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:237
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:288
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:255
+msgid "Done Sending Photos"
+msgstr "PoÅiljanje fotografij je konÄano"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:149
+msgid "Transfer Complete"
+msgstr "Prenos je konÄan"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:156
+msgid "Error While Transferring"
+msgstr "Napaka med prenosom"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:164
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:299
+msgid "Error Transferring"
+msgstr "Napaka prenosa"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD/CDExport.cs:174
+msgid "copying..."
+msgstr "kopiranje ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:1
+msgid "<b><i>There are some previously scheduled items to write</i></b>"
+msgstr "<b><i>Obstaja nekaj predhodno razporejenih predmetov za zapis</i></b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:2
+msgid "<b>Photos to Burn</b>"
+msgstr "<b>Fotografije za zapis</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:3
+msgid "Create CD"
+msgstr "Ustvari CD"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:5
+msgid "Size of the exported selection:"
+msgstr "Velikost izvoÅenega izbora:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:6
+msgid "_Browse Previously Scheduled Files"
+msgstr "_Brskaj po predhodno razporejenih datotekah"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.ui.h:8
+msgid "_Write only these photos to CD"
+msgstr "_ZapiÅi le te fotografije na CD"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:111
+msgid "Waiting for authorization"
+msgstr "Äakanje na overitev"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:112
+msgid ""
+"F-Spot will now launch your browser so that you can enable the permission you just selected.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok\" below."
+msgstr ""
+"F-Spot bo sedaj zagnal vaÅ brskalnik, zato da lahko omogoÄite dovoljenja, ki ste jih izbrali.\n"
+"\n"
+"Ko bo Facebook zahteval vrnitev k programu, spodaj kliknite \"V redu\"."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:296
+msgid "Too many images to export"
+msgstr "DoloÄenih je preveÄ slik za izvoz"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:297
+#, csharp-format
+msgid "Facebook only permits {0} photographs per album. Please refine your selection and try again."
+msgstr "Facebook omogoÄa le {0} fotografij na album. Treba je izpopolniti izbiro in poskusiti ponovno. "
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:312
+msgid "Album must have a name"
+msgstr "Album mora imeti ime"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:313
+msgid "Please name your album or choose an existing album."
+msgstr "Poimenujte album ali izberite obstojeÄi album."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:327
+msgid "Creating a new album failed"
+msgstr "Ustvarjanje novega albuma je spodletelo"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:328
+#, csharp-format
+msgid ""
+"An error occurred creating a new album.\n"
+"\n"
+"{0}"
+msgstr ""
+"Med ustvarjanjem novega albuma je priÅlo do napake.\n"
+"\n"
+"{0}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:341
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:516
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:168
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:184
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:174
+msgid "Uploading Pictures"
+msgstr "PoÅiljanje slik"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:369
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:243
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:213
+#, csharp-format
+msgid "Uploading picture \"{0}\" ({1} of {2})"
+msgstr "PoÅiljanje slike \"{0}\" ({1} od {2})"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:383
+#, csharp-format
+msgid "Error Uploading To Facebook: {0}"
+msgstr "Napaka med poÅiljanjem na Facebook: {0}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:384
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:412
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:248
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:229
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:277
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:244
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:321
+msgid "Error"
+msgstr "Napaka"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:394
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:423
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:239
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:290
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:257
+msgid "Upload Complete"
+msgstr "PoÅiljanje je konÄano"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExport.cs:397
+msgid "Visit F-Spot group on Facebook"
+msgstr "ObiÅÄi skupino F-Spot na Facebook"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:231
+msgid "Waiting for authentication"
+msgstr "Äakanje na overitev"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:232
+msgid ""
+"F-Spot will now launch your browser so that you can log into Facebook.\n"
+"\n"
+"Once you are directed by Facebook to return to this application, click \"Ok\" below. F-Spot will cache your session in gnome-keyring, if possible, and re-use it on future Facebook exports."
+msgstr ""
+"Program F-Spot bo zagnal brskalnik za prijavo v Facebook.\n"
+"\n"
+"Ko vas Facebook usmeri v vrnitev v ta program, kliknite \"V redu\" spodaj. F-Spot bo, Äe bo mogoÄe, vaÅo sejo shranil v gnome-keyring in jo uporabil pri prihodnjih izvozih v Facebook."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:237
+msgid "Authenticating..."
+msgstr "Overjanje ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:247
+msgid "Error logging into Facebook"
+msgstr "Napaka med prijavljanjem v Facebook"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:248
+msgid "There was a problem logging into Facebook. Check your credentials and try again."
+msgstr "PriÅlo je do teÅav med prijavljanjem v Facebook. Preverite svoje geslo in poskusite znova. "
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:257
+msgid "Authorizing Session"
+msgstr "PooblaÅÄanje seje"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:266
+msgid "Session established, fetching user info..."
+msgstr "Seja je zagnana, pridobivanje podrobnosti o uporabniku ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:272
+msgid "Session established, fetching friend list..."
+msgstr "Seja je zagnana, pridobivanje seznama prijateljev ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:282
+msgid "Session established, fetching friend details..."
+msgstr "Seja je zagnana, pridobivanje podrobnosti o prijateljih ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:294
+msgid "Session established, fetching photo albums..."
+msgstr "Seja je zagnana, pridobivanje albumov fotografij ..."
+
+#. Note for translators: {0} and {1} are respectively firstname and surname of the user
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:304
+#, csharp-format
+msgid "{0} {1} is logged into Facebook"
+msgstr "{0} {1} je prijavljen v Facebook"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:313
+msgid "Facebook Connection Error"
+msgstr "Napaka povezovanja s Facebook-om"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:314
+#, csharp-format
+msgid ""
+"There was an error when downloading your information from Facebook.\n"
+"\n"
+"Facebook said: {0}"
+msgstr ""
+"PriÅlo je do napake med nalaganjem vaÅih podrobnosti s Facebook-a.\n"
+"\n"
+"Javljena napaka: {0}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook/FacebookExportDialog.cs:343
+msgid "You are not logged in."
+msgstr "Niste prijavljeni."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:1
+msgid "Auto-confirm Photos"
+msgstr "Samodejno potrjevanje fotografij"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:2
+msgid "Caption"
+msgstr "Naslov"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:3
+msgid "Create a new album"
+msgstr "Ustvari nov album"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:4
+msgid "Description"
+msgstr "Opis"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:5
+msgid "Export to Facebook"
+msgstr "Izvozi v Facebook"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:6
+msgid "In this photo"
+msgstr "Na tej fotografiji"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:7
+msgid "Location"
+msgstr "Mesto"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:8
+msgid "Login"
+msgstr "Prijava"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:9
+msgid "Logout"
+msgstr "Odjava"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:11
+msgid "Not logged in"
+msgstr "Ni prijavljen"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:12
+msgid "Permissions:"
+msgstr "Dovoljenja:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:13
+msgid "Stay Connected"
+msgstr "Ostani povezan"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:14
+msgid "Use an existing album"
+msgstr "Uporabi obstojeÄi album"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Facebook/Resources/FacebookExport.ui.h:15
+msgid "Who is this?"
+msgstr "Kdo je to?"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:139
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:5
+msgid "Authorize"
+msgstr "Pooblasti"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:145
+#, csharp-format
+msgid "Return to this window after you have finished the authorization process on {0} and click the \"Complete Authorization\" button below"
+msgstr "Po konÄanem postopku pooblastitve na {0} se vrnite v to okno in kliknite gumb \"KonÄanj pooblastitev\" spodaj"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:146
+msgid "Complete Authorization"
+msgstr "KonÄaj pooblastitev"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:151
+#, csharp-format
+msgid "Logging into {0}"
+msgstr "Prijavljanje v {0}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:152
+msgid "Checking credentials..."
+msgstr "Preverjanje gesla ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:159
+#, csharp-format
+msgid "Welcome {0} you are connected to {1}"
+msgstr "DobrodoÅli {0}, povezani ste na {1}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:162
+#, csharp-format
+msgid "Sign in as a different user"
+msgstr "Prijava kot drug uporabnik"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:167
+#, csharp-format
+msgid "Used {0} of your allowed {1} monthly quota"
+msgstr "Uporabljene je {0} od dovoljene meseÄne kvote {1}."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:270
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:339
+msgid "Unable to log on"
+msgstr "Ni se mogoÄe prijaviti"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:359
+#, csharp-format
+msgid "Waiting for response {0} of {1}"
+msgstr "Äakanje na odziv {0} od {1}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:386
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:210
+#, csharp-format
+msgid "Uploading picture \"{0}\""
+msgstr "PoÅiljanje slike \"{0}\""
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:409
+#, csharp-format
+msgid "Error Uploading To {0}: {1}"
+msgstr "Napaka med poÅiljanjem na {0}: {1}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:496
+msgid "Unable to log on."
+msgstr "Ni se mogoÄe prijaviti."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr/FlickrExport.cs:497
+#, csharp-format
+msgid "F-Spot was unable to log on to {0}. Make sure you have given the authentication using {0} web browser interface."
+msgstr "Ni se mogoÄe prijaviti na {0}. PrepriÄajte se, da ste dali pooblastitev z uporabo vmesnika spletnega brskalnika {0}."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:1
+msgid "<b>Account</b>"
+msgstr "<b>RaÄun</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:3
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:4
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:4
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:4
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:4
+msgid "<b>Style</b>"
+msgstr "<b>Slog</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:4
+msgid "<b>Viewing permissions</b>"
+msgstr "<b>Dovoljenja za ogled</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:7
+msgid "Export tag _hierarchy"
+msgstr "Izvozi _hierarhijo oznak"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:8
+msgid "F-Spot needs your authorization in order to upload photos to your {0} account. Press the \"Authorize\" button to open a web browser and give F-Spot the authorization. "
+msgstr "F-Spot potrebuje pooblastitev za nalaganje fotografij na vaÅ raÄun {0}. Pritisnite gumb \"Pooblastitev\" za odprtje spletnega brskalnika in pooblastitev F-Spota."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:9
+msgid "Ignore _top level tags"
+msgstr "Prezri oznake _zgornjih ravni"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:10
+msgid "Private"
+msgstr "Zasebno"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:11
+msgid "Public"
+msgstr "Javno"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:12
+msgid "Visible to Family"
+msgstr "Vidno druÅini"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:13
+msgid "Visible to Friends"
+msgstr "Vidno prijateljem"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:15
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:8
+msgid "_Export tags"
+msgstr "Izvozi ozna_ke"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:16
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:15
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:11
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:11
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:10
+msgid "_Resize to: "
+msgstr "Sp_remeni velikost na:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:17
+msgid "_View photos in browser when done uploading"
+msgstr "Ogled fotografij _v brskalniku po konÄanem poÅiljanju"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Flickr/Resources/flickr_export.ui.h:18
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:17
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:12
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:12
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:11
+msgid "pixels"
+msgstr "toÄke"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:150
+msgid "Select Export Folder"
+msgstr "Izbor mape za izvoz"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:202
+msgid "Building Gallery"
+msgstr "Gradnja galerije"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:239
+#, csharp-format
+msgid "Exporting \"{0}\"..."
+msgstr "IzvaÅanje \"{0}\" ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:246
+#, csharp-format
+msgid "Error Copying \"{0}\" to Gallery:{2}{1}"
+msgstr "Napaka med kopiranjem \"{0}\" v galerijo: {2}{1}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:272
+#, csharp-format
+msgid "Transferring to \"{0}\""
+msgstr "PrenaÅanje na \"{0}\""
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:273
+msgid "Transferring..."
+msgstr "PrenaÅanje ..."
+
+#. No need to check result here as if result is not true, an Exception will be thrown before
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:278
+msgid "Export Complete."
+msgstr "Izvoz je konÄan."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:280
+msgid "Exporting Photos Completed."
+msgstr "IzvaÅanje fotografij je konÄano."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:345
+msgid "Exporting Photos"
+msgstr "IzvaÅanje fotografij"
+
+#. Note for translators: light as clear, opposite as dark
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:749
+msgid "Light"
+msgstr "Svetlo"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:750
+msgid "Dark"
+msgstr "Temno"
+
+#. Abbreviation of previous
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:930
+msgid "Prev"
+msgstr "Predhodna"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:932
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1173
+msgid "Index"
+msgstr "Kazalo"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1042
+msgid "Gallery generated by"
+msgstr "Galerijo je ustvaril"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1082
+msgid "Show Styles"
+msgstr "PokaÅi sloge"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1083
+msgid "Hide Styles"
+msgstr "Skrij sloge"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1250
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder/FolderExport.cs:1383
+msgid "Page:"
+msgstr "Stran:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:1
+msgid "<b>Destination</b>"
+msgstr "<b>Cilj</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:2
+msgid "<b>Export Method</b>"
+msgstr "<b>NaÄin izvoza</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:5
+msgid "Create _gallery using \"Original\""
+msgstr "Ustvari galerijo z uporabo \"Izvirnika\""
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:6
+msgid "Create standalone _web gallery"
+msgstr "Ustvari samostojno spletno _galerijo"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:7
+msgid "D_escription:"
+msgstr "Op_is:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:8
+msgid "Export _tags"
+msgstr "Izvozi oz_nake"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:9
+msgid "Export tag _icons"
+msgstr "Izvozi _ikone oznak"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:11
+msgid "G_allery Name:"
+msgstr "Ime g_alerije:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:12
+msgid "Open _destination when done exporting"
+msgstr "_Odpiri cilj po konÄanem izvozu"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:14
+msgid "_Folder:"
+msgstr "_Mapa:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Folder/Resources/folder_export.ui.h:16
+msgid "_Save the files only"
+msgstr "_Shrani le datoteke"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:132
+msgid "Invalid URL"
+msgstr "Neveljaven URL"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:133
+msgid "The gallery URL entry does not appear to be a valid URL"
+msgstr "URL galerije ni videti kot veljaven URL"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:143
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:170
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:181
+msgid "Error while connecting to Gallery"
+msgstr "Med povezovanjem z galerijo je priÅlo do napake"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:144
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:171
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:182
+#, csharp-format
+msgid "The following error was encountered while attempting to log in: {0}"
+msgstr "Med poskusom prijave je priÅlo do naslednje napake: {0}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:158
+msgid "A Gallery with this name already exists"
+msgstr "Galerija s tem imenom Åe obstaja"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/AccountDialog.cs:159
+#, csharp-format
+msgid "There is already a Gallery with the same name in your registered Galleries. Please choose a unique name."
+msgstr "Galerija s tem imenom Åe obstaja v vpisanih galerijah. Izberite edinstveno ime."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/FormClient.cs:327
+msgid "Unhandled exception"
+msgstr "Nesprejeta izjema"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAccount.cs:82
+msgid ""
+"Cannot connect to a Gallery for which the version is unknown.\n"
+"Please check that you have Remote plugin 1.0.8 or later"
+msgstr ""
+"Ni se mogoÄe povezati z galerijo neznane razliÄice.\n"
+"NaloÅiti je treba vstavek Remote razliÄice 1.0.8. ali kasnejÅe"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs:95
+msgid "(TopLevel)"
+msgstr "(Vrhnja raven)"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs:149
+msgid "Invalid Gallery name"
+msgstr "Neveljavno ime galerije"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryAddAlbum.cs:150
+msgid ""
+"The gallery name contains invalid characters.\n"
+"Only letters, numbers, - and _ are allowed"
+msgstr ""
+"Ime galerije vsebuje neveljavne znake.\n"
+"Dovoljene so le Ärke, Åtevilke ter - in _"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:228
+#, csharp-format
+msgid "Error uploading picture \"{0}\" to Gallery: {1}"
+msgstr "Napaka med poÅiljanjem slike \"{0}\" v galerijo: {1}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:253
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:312
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:272
+msgid "(No Gallery)"
+msgstr "(Ni galerije)"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:339
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:431
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:363
+msgid "(Not Connected)"
+msgstr "(Ni Povezave)"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:340
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:432
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:364
+msgid "(No Albums)"
+msgstr "(Ni Albumov)"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryExport.cs:381
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:490
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:401
+msgid "No account selected"
+msgstr "Noben raÄun ni bil izbran"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:382
+msgid "Error reading server response"
+msgstr "Napaka med branjem odziva streÅnika"
+
+#. failed to find the response
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:394
+msgid "Server returned response without Gallery content"
+msgstr "StreÅnik je vrnil odgovor brez vsebine Galerije"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:717
+msgid "Error while creating new album"
+msgstr "Napaka med ustvarjanjem novega albuma"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery/GalleryRemote.cs:718
+#, csharp-format
+msgid ""
+"The following error was encountered while attempting to perform the requested operation:\n"
+"{0} ({1})"
+msgstr ""
+"Med poskusom izvajanja zahtevanega opravila je priÅlo do napake:\n"
+"{0} ({1})"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:1
+msgid "_Album Name:"
+msgstr "Ime _albuma:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:2
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_album_dialog.ui.h:3
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_album_dialog.ui.h:3
+msgid "_Description:"
+msgstr "O_pis:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:3
+msgid "_Parent Album:"
+msgstr "_Nadrejeni album:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_album_dialog.ui.h:4
+msgid "_Title:"
+msgstr "_Naslov:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:1
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:1
+msgid "<span weight='bold' size='larger'>Error Connecting to Gallery</span>\n"
+msgstr "<span weight='bold' size='larger'>Napaka med povezovanjem z galerijo</span>\n"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:3
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:5
+msgid "Please verify that the settings for this gallery are correct."
+msgstr "Potrdite, da so nastavitve za to galerijo pravilne."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:4
+msgid "U_RL:"
+msgstr "U_RL:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:5
+msgid "_Gallery Name:"
+msgstr "Ime _galerije:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:6
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:10
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_dialog.ui.h:1
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:10
+msgid "_Password:"
+msgstr "_Geslo:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_add_dialog.ui.h:7
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:11
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_dialog.ui.h:2
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:11
+msgid "_Username:"
+msgstr "_UporabniÅko ime:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:1
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:1
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:1
+msgid "<b>Album</b>"
+msgstr "<b>Album</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:2
+msgid "<b>Gallery</b>"
+msgstr "<b>Galerija</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:6
+msgid "Export _titles and comments"
+msgstr "Izvozi _naslove in opombe"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:7
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:6
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:6
+msgid "Open _album in browser when done uploading"
+msgstr "_Odpri album v brskalniku po konÄanem poÅiljanju"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:9
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:9
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:9
+msgid "_Export to Album:"
+msgstr "Iz_voz v album:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Gallery/Resources/gallery_export_dialog.ui.h:10
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:10
+msgid "_Gallery:"
+msgstr "_Galerija:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs:111
+msgid "Error while creating Album"
+msgstr "Napaka med ustvarjanjem albuma"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/GoogleAddAlbum.cs:112
+#, csharp-format
+msgid "The following error was encountered while attempting to create an album: {0}"
+msgstr "Med poskusom ustvarjanja albuma je priÅlo do naslednje napake: {0}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:206
+#, csharp-format
+msgid "{0} Sent"
+msgstr "{0} poslanih"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:208
+#, csharp-format
+msgid "{0} of approx. {1}"
+msgstr "{0} od pribliÅno {1}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:275
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug/SmugMugExport.cs:242
+#, csharp-format
+msgid "Error Uploading To Gallery: {0}"
+msgstr "Napaka med poÅiljanjem v Galerijo: {0}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:363
+#, csharp-format
+msgid "Available space: {0}, {1}% used out of {2}"
+msgstr "Prostor na voljo: {0}, uporabljenih {1}% od {2}"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb/PicasaWebExport.cs:467
+#, csharp-format
+msgid ""
+"The selected album has a limit of {0} pictures,\n"
+"which would be passed with the current selection of {1} images"
+msgstr ""
+"Izbrani album ima mejo {0} slik,\n"
+"Äemur bi zadostovala trenutna izbira {1} slik"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_album_dialog.ui.h:1
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_album_dialog.ui.h:1
+msgid "Public Album"
+msgstr "Javni album"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_album_dialog.ui.h:2
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_add_album_dialog.ui.h:2
+msgid "_Album Title:"
+msgstr "Naslov _albuma:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:3
+msgid "<span weight='bold' size='larger'>Your Google Account is locked</span>\n"
+msgstr "<span weight='bold' size='larger'>VaÅ raÄun Google je zaklenjen</span>\n"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:6
+msgid ""
+"Please verify that the settings for this gallery are correct.\n"
+"Enter the letters as they are shown in the image in\n"
+"the 'Captcha' field. <i>Letters are not case-sensitive</i>"
+msgstr ""
+"Potrdite, da so nastavitve za to galerijo pravilne.\n"
+"Vnesite Ärke, kot so prikazane na sliki v polju 'Captcha'.\n"
+"<i>Velikost Ärk ni pomembna</i>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_add_dialog.ui.h:9
+msgid "_Captcha:"
+msgstr "_Captcha:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/Resources/google_export_dialog.ui.h:3
+msgid "<b>PicasaWeb Export</b>"
+msgstr "<b>Izvoz PicasaWeb</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:3
+msgid "<b>SmugMug Export</b>"
+msgstr "<b>Izvoz SmugMug</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.SmugMug/Resources/smugmug_export_dialog.ui.h:7
+msgid "_Account:"
+msgstr "_RaÄun:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:310
+msgid "Done sending photos"
+msgstr "PoÅiljanje fotografij je konÄano"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:312
+msgid "Upload complete"
+msgstr "PoÅiljanje je konÄano"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExport.cs:318
+msgid "Error uploading to Tabblo: "
+msgstr "Napaka med poÅiljanjem v Tabblo:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:1
+msgid "<b>F-Spot tags</b>"
+msgstr "<b>Oznake F-Spot</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:3
+msgid "<b>Tabblo account</b>"
+msgstr "<b>RaÄun Tabblo</b>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:4
+msgid "<small><i>F-Spot tags can help you track the export status of photos. Example: Use one tag for the photos that you plan to export, and another one for those already exported. Here, you can tell F-Spot to automatically replace these tags as appropriate.</i></small>"
+msgstr "<small><i>F-Spot oznake lahko olajÅajo sledenje izvoznemu stanju fotografij. Primer: uporaba ene oznake za fotografije, pripravljene na izvoz in druge za fotografije, ki so bile Åe izvoÅene. Tukaj lahko nastavite samodejno zamenjavo oznak.</i></small>"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:6
+msgid "Rem_ove from exported photos:"
+msgstr "_Odstrani iz izvoÅenih fotografij:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:7
+msgid "Select..."
+msgstr "Izberi ..."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TabbloExport.ui.h:8
+msgid "_Attach to exported photos:"
+msgstr "_Pripni izvoÅenim fotografijam:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:1
+msgid "A trust error occured while attempting to access"
+msgstr "Med poskusom dostopa je priÅlo do napake zaupanja"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:2
+msgid "Abort this session"
+msgstr "Prekini to sejo"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:3
+msgid "Always trust this site's certificate"
+msgstr "Vedno zaupaj potrdilu te strani"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:4
+msgid "Do you wish to:"
+msgstr "Ali Åelite: "
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:5
+msgid "Trust Error"
+msgstr "Napaka zaupanja"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Tabblo/Resources/ui/TrustError.ui.h:6
+msgid "Trust the site's certificate this once"
+msgstr "Zaupaj potrdilu te strani tokrat"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:67
+msgid "This tool requires an active selection. Please select one or more pictures and try again"
+msgstr "To orodje zahteva dejavno izbiro. Izberite eno ali veÄ slik in poskusite znova."
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:83
+msgid "Select export folder"
+msgstr "Izbor mape za izvoz"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:121
+msgid "Exporting files"
+msgstr "Izvoz datotek"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs:127
+#, csharp-format
+msgid "Preparing photo \"{0}\""
+msgstr "Pripravljanje fotografije \"{0}\""
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:1
+msgid "_Create"
+msgstr "_Ustvari"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:2
+msgid "_File name:"
+msgstr "_Ime datoteke:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:3
+msgid "_Location:"
+msgstr "_Mesto:"
+
+#: ../src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/zip_export.ui.h:4
+msgid "_Scale:"
+msgstr "M_erilo:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:1
+msgid "<b>Specify the toplevel Photos directories</b>"
+msgstr "<b>Navedite vrhnje mape fotografij</b>"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:2
+msgid "Change Photos directory"
+msgstr "Spremeni mapo fotograij"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:3
+msgid "Change base path (URI) to"
+msgstr "Spremeni osnovno pot (URI) v"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.ui.h:4
+msgid "Old base path (URI) was"
+msgstr "Stara osnovna pot (URI) je bila"
+
+#: ../src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs:51
+msgid "Developing photos"
+msgstr "Razvijanje fotografij"
+
+#: ../src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs:58
+#, csharp-format
+msgid "Developing {0}"
+msgstr "Razvijanje {0}"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:128
+msgid "F-Spot Gallery"
+msgstr "Galerija F-Spot"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:129
+msgid "The web gallery seems to be offline now"
+msgstr "Videti je, da je spletna galerija trenutno nepovezana"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:130
+msgid "Show All"
+msgstr "PokaÅi vse"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:140
+#, csharp-format
+msgid "{0} photo"
+msgid_plural "{0} photos"
+msgstr[0] "{0} fotografij"
+msgstr[1] "{0} fotografija"
+msgstr[2] "{0} fotografiji"
+msgstr[3] "{0} fotografije"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:182
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:8
+msgid "Current View"
+msgstr "Trenutni pogled"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs:185
+msgid "Selected"
+msgstr "Izbrano"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs:111
+msgid "none"
+msgstr "brez"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs:114
+#, csharp-format
+msgid " Gallery: {0}, Photos: {1}, Last client: {3}"
+msgstr " Galerija: {0}, fotografij: {1}, zadnji odjemalec: {3}"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs:178
+msgid "Gallery is inactive"
+msgstr "Galerija je nedejavna"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:1
+msgid ""
+"<small><i>The gallery stays active until you either deactivate it or close\n"
+"F-Spot. Make sure local viewers access it bypassing HTTP proxy.</i></small>"
+msgstr ""
+"<small><i>Galerija ostane dejavna dokler je ne izkljuÄite ali zaprete F-spota.\n"
+"PrepriÄajte se, da lahko do dostopajo krajevni obiskovalci tako da obidejo posredniÅki streÅnik HTTP.</i></small>"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:3
+msgid ""
+"<small><i>When the gallery is active, above is the URL you need to open \n"
+"on another computer to access the shared photos.</i></small>"
+msgstr ""
+"<small><i>Ko je galerija dejavna, je mogoÄe do fotografij v souporabi\n"
+"dostopati preko zgornjega URL-ja.</i></small>"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:5
+msgid "Activates and deactivates the web gallery"
+msgstr "OmogoÄi in onemogoÄi spletno galerijo"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:6
+msgid "Allow viewers to add tags"
+msgstr "Obiskovalcem dovoli dodajanje oznak"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:7
+msgid "Copy URL to clipboard"
+msgstr "Kopiraj URL na odloÅiÅÄe"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:9
+msgid "F-Spot Live Web Gallery"
+msgstr "Åiva spletna galerija F-Spot"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:10
+msgid "Gallery URL:"
+msgstr "URL galerije:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:11
+msgid "Limit number of shared photos to"
+msgstr "Omeji Åtevilo fotografij v souporabi na"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:12
+msgid "Options:"
+msgstr "MoÅnosti:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:13
+msgid "Photos with a Tag"
+msgstr "Fotografije z oznako"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:14
+msgid "Selected Photos"
+msgstr "Izbrane fotografije"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:15
+msgid "Share:"
+msgstr "Souporaba:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui.h:16
+msgid "Views:"
+msgstr "Ogledov:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs:91
+msgid "Error opening the selected file"
+msgstr "Napaka med odpiranjem izbrane datoteke"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs:92
+#, csharp-format
+msgid ""
+"The file you selected is not a valid or supported database.\n"
+"\n"
+"Received exception \"{0}\"."
+msgstr ""
+"Izbrana datoteka ni veljavna ali podprta podatkovna zbirka.\n"
+"\n"
+"Prejeta je bila izjema \"{0}\"."
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs:57
+#, csharp-format
+msgid ""
+"<big>The database refers to files contained in the <b>{0}</b> folder.\n"
+" Please select that folder so I can do the mapping.</big>"
+msgstr ""
+"<big>Podatkovna zbirka se navezuje na datoteke v mapi <b>{0}</b>.\n"
+"Izbrati je treba mapo za preslikavo.</big>"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:1
+msgid "<small><i>Choose the location of the database you want to import from</i></small>"
+msgstr "<small><i>Izbira mesta podatkovne zbirke za uvaÅanje</i></small>"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:2
+msgid ""
+"<small><i>Choose what to import from the selected db.\n"
+"\"New Rolls Only\" is the smart option that will avoid re-importing photos you could have imported during a previous operation.\n"
+"\"A Single Import Roll\" let you choose which roll you want to merge back.\n"
+"\"Everything\" will import everything, creating duplicates if you already imported from that database.</i></small>"
+msgstr ""
+"<small><i>Izberite kaj Åelite uvoziti iz izbrane podatkovne zbirke.\n"
+"\"Samo novi zvitki\" je pametna moÅnost, ki se bo izognila ponovnemu uvaÅanju Åe uvoÅenih fotografij.\n"
+"\"Posamezni uvozni zvitek\" omogoÄa izbiro zvitka za zdruÅevanje.\n"
+"\"Vse\" uvozi vse in ustvari dvojnike, Äe so bile fotografije iz te podatkovne zbirke Åe uvoÅene.</i></small>"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:6
+msgid "<small><i>Copy the images locally or keep them where they are. If you chose the later, be sure that this location will stay accessible from f-spot.</i></small>"
+msgstr "<small><i>Krajevno kopiranje slik ali izbira njihovega trenutnega mesta. V slednjem primeru se je treba prepriÄati, da bo to mesto ostalo dostopno iz f-spot-a.</i></small>"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:7
+msgid "A Single Import Roll"
+msgstr "Posamezen uvozni zvitek"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:8
+msgid "Copy images to photos folder"
+msgstr "Kopiranje slik v mapo fotografij"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:9
+msgid "Database Location:"
+msgstr "Mesto podatkovne zbirke:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:10
+msgid "Everything"
+msgstr "Vse"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:11
+msgid "Import:"
+msgstr "Uvozi:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:12
+msgid "Keep the images at their original location"
+msgstr "ObdrÅi slike na njihovem izvirnem mestu"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:13
+msgid "Merge another F-Spot collection"
+msgstr "ZdruÅitev druge zbirke F-Spot"
+
+#: ../src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/mergedb_dialog.ui.h:14
+msgid "New Rolls Only"
+msgstr "Samo novi zvitki"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:2
+msgid "Delay:"
+msgstr "Zamik:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:3
+msgid "Display:"
+msgstr "Zaslon:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:4
+msgid "Images tagged with:"
+msgstr "Slike oznaÄene z:"
+
+#: ../src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui.h:5
+msgid "Make F-Spot my screensaver"
+msgstr "Naredi F-spot moj ohranjevalnik zaslona"
+
+#: ../src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Addins.Transitions/Cover.cs:45
+msgid "Cover"
+msgstr "Naslovnica"
+
+#: ../src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Addins.Transitions/Dissolve.cs:45
+msgid "Dissolve"
+msgstr "Raztapljanje"
+
+#: ../src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Addins.Transitions/Push.cs:45
+msgid "Push"
+msgstr "Potisk"
+
+#: ../tools/f-spot-screensaver.desktop.in.h:1
+msgid "Display a slideshow from F-Spot"
+msgstr "PrikaÅe F-Spotovo diapredstavitev"
+
+#: ../tools/f-spot-screensaver.desktop.in.h:2
+msgid "F-Spot photos"
+msgstr "F-Spot fotografije"
+
+#~ msgid "(wrong format)"
+#~ msgstr "(napaÄen zapis)"
+
+#~ msgid "(At least one File not found)"
+#~ msgstr "(vsaj ene datoteke ni mogoÄe najti)"
+
+#~ msgid "Show Photo Name"
+#~ msgstr "PokaÅi ime fotografije"
+
+#~ msgid ""
+#~ "Metadata of file {0} may be corrupt, refusing to write to it, falling "
+#~ "back to XMP sidecar."
+#~ msgstr ""
+#~ "Metapodatki datoteke {0} so morda pokvarjeni, zato ne bodo zapisani. "
+#~ "Uporabljena bo dodatna datoteka XMP."
+
+#~ msgid "Rating:"
+#~ msgstr "Ocena:"
+
+#~ msgid ""
+#~ "In order to detect duplicates on pictures you imported before 0.5.0, F-"
+#~ "Spot needs to analyze your image collection. This is not done by default "
+#~ "as it's time consuming. You can Start or Pause this update process using "
+#~ "this dialog."
+#~ msgstr ""
+#~ "Za zaznavanje dvojnikov slik, ki so bile uvoÅene pred 0.5.0, mora F-spot "
+#~ "preuÄiti zbirko slik. To ni storjeno samodejno, ker vzame veliko Äasa. V "
+#~ "temu pogovornemu oknu lahko postopek posodabljanja zaÅenete ali zaÄasno "
+#~ "zaustavite."
+
+#~ msgid ""
+#~ "You currently have {0} photos needing md5 calculation, and {1} pending "
+#~ "jobs"
+#~ msgstr ""
+#~ "Trenutno imate {0} fotografij, ki potrebujejo izraÄun md5 in {1} "
+#~ "ÄakajoÄih poslov"
+
+#~ msgid "Processing images..."
+#~ msgstr "Obdelavanje slik ..."
+
+#~ msgid "Stopped"
+#~ msgstr "Zaustavljeno"
+
+#~ msgid "Strip _metadata"
+#~ msgstr "Odstrani _metapodatke"
+
+#~ msgid "Check for Duplicates..."
+#~ msgstr "Zaznaj dvojnike ..."
+
+#~ msgid "F-Spot Encountered a Fatal Error"
+#~ msgstr "PriÅlo je do usodne napake"
+
+#~ msgid "Error Details"
+#~ msgstr "Podrobnosti napake"
+
+#~ msgid "An unhandled exception was thrown: "
+#~ msgstr "Nesprejeto izjemno dejanje:"
+
+#~ msgid "Attach Tags:"
+#~ msgstr "Pripenjanje oznak:"
+
+#~ msgid "Autorotate"
+#~ msgstr "Samodejno vrtenje"
+
+#~ msgid "_Autorotate"
+#~ msgstr "S_amodejno vrtenje"
+
+#~ msgid "Unknown transform type %d"
+#~ msgstr "Neznana vrsta pretvorbe %d"
+
+#~ msgid "Operation failed"
+#~ msgstr "Dejanje ni uspelo"
+
+#~ msgid "No way to save files of type \"{0}\""
+#~ msgstr "Ni naÄina za shranjevanje datotek vrste \"{0}\""
+
+#~ msgid "Thumbnail Directory"
+#~ msgstr "Mapa sliÄic"
+
+#~ msgid "Exif Directory"
+#~ msgstr "Exif mapa"
+
+#~ msgid "GPS Directory"
+#~ msgstr "GPS mapa"
+
+#~ msgid "InterOperability Directory"
+#~ msgstr "Mapa vzajemnega delovanja"
+
+#~ msgid "Unknown Directory"
+#~ msgstr "Neznana mapa"
+
+#~ msgid "Writing to this file format is not supported"
+#~ msgstr "Pisanje v to vrsto datoteke ni podprto"
+
+#~ msgid "IPTC Information Interchange Model (IIM) Version number"
+#~ msgstr "Åtevilka razliÄice IPTC Informacijsko Izmenjalnega Modela (IIM) "
+
+#~ msgid "OSI Destination routing information"
+#~ msgstr "OSI podrobnosti o potovanju do cilja"
+
+#~ msgid "IPTC file format"
+#~ msgstr "IPTC vrsta datoteke"
+
+#~ msgid "Identifies the provider and product"
+#~ msgstr "DoloÄa ponudnika in izdelek"
+
+#~ msgid "A unique number identifying the envelope"
+#~ msgstr "Edinstveno Åtevilo za doloÄevanje ovojnice"
+
+#~ msgid "A unique number"
+#~ msgstr "Edinstveno Åtevilo"
+
+#~ msgid ""
+#~ "The envelope handling priority between 1 (most urgent) and 9 (least "
+#~ "urgent)"
+#~ msgstr ""
+#~ "Prednost upravljanja ovojnice med 1 (najbolj nujno) in 9 (najmanj nujno)"
+
+#~ msgid "The year, month and day (CCYYMMDD) the service sent the material"
+#~ msgstr "Leto, mesec in dan (LLLLMMDD), ko je storitev poslala material"
+
+#~ msgid "The hour, minute and second (HHMMSS) the service sent the material"
+#~ msgstr "Ura, minuta in sekunda (UUMMSS), ko je storitev poslala material."
+
+#~ msgid "The character set designation"
+#~ msgstr "Imenovanje niza znakov"
+
+#~ msgid "External globally unique object identifier"
+#~ msgstr "Zunanje edinstveno doloÄilo predmeta"
+
+#~ msgid "Abstract Relationship Method (ARM) identifier"
+#~ msgstr "DoloÄilo metode abstraktnega razmerja (ARM)"
+
+#~ msgid "Abstract Relationship Method (ARM) version number."
+#~ msgstr "Åtevilka razliÄice metode abstraktnega razmerja (ARM)"
+
+#~ msgid "Number identifying the IIM version this application record uses"
+#~ msgstr "Åtevilka razliÄice IIM, ki jo uporablja programski zapis"
+
+#~ msgid "Object type reference"
+#~ msgstr "Sklic vrste predmeta"
+
+#~ msgid "Object attribute reference"
+#~ msgstr "Sklic atributov predmeta"
+
+#~ msgid "Object name"
+#~ msgstr "Ime predmeta"
+
+#~ msgid "Status of the objectdata according to the provider"
+#~ msgstr "Stanje podatkov predmeta glede na ponudnika"
+
+#~ msgid "Location within a city or area where the object originates"
+#~ msgstr "Kraj znotraj mesta ali obmoÄja od koder izvira vsebina"
+
+#~ msgid "Name of the city the content is focussing on"
+#~ msgstr "Ime mesta na katerega se osredotoÄa vsebina"
+
+#~ msgid "Copyright information for"
+#~ msgstr "Podrobnosti avtorskih pravic za "
+
+#~ msgid "Full name of the country of the focus of the content"
+#~ msgstr "Polno ime drÅave in osredotoÄenost vsebine"
+
+#~ msgid ""
+#~ "Two or three letter ISO3166 code of the country of the focus of the "
+#~ "content"
+#~ msgstr "Dvo ali tri Ärkovna ISO3166 koda drÅave in osredotoÄenost vsebine"
+
+#~ msgid "Creator of the content"
+#~ msgstr "Ustvarjalec vsebine"
+
+#~ msgid "Provider of the object"
+#~ msgstr "Ponudnik predmeta"
+
+#~ msgid "The title of the author or creator"
+#~ msgstr "Naslov avtorja ali ustvarjalca"
+
+#~ msgid ""
+#~ "The person involved in writing, editing or correcting the object data or "
+#~ "caption/abstract"
+#~ msgstr ""
+#~ "Oseba vkljuÄena v pisanje, urejanje ali popravljanje podatkov o predmetu "
+#~ "ali obnove"
+
+#~ msgid "Headline of the content"
+#~ msgstr "Naslovnica vsebine"
+
+#~ msgid ""
+#~ "Instructions from the creator to the receiver not covered by other fields"
+#~ msgstr ""
+#~ "Navodila od ustvarjalca za uporabnika, ki niso opredeljena z drugimi polji"
+
+#~ msgid "Intellectual genre of the object"
+#~ msgstr "Intelektualna zvrst predmeta"
+
+#~ msgid "Unknown IIM DataSet"
+#~ msgstr "Neznan IIM niz podatkov"
+
+#~ msgid "Title"
+#~ msgstr "Naslov"
+
+#~ msgid "Copyright"
+#~ msgstr "Avtorske pravice"
+
+#~ msgid "Subject and Keywords"
+#~ msgstr "Predmet in kljuÄne besede"
+
+#~ msgid "Compression"
+#~ msgstr "Stiskanje"
+
+#~ msgid "Planar Configuration"
+#~ msgstr "Nastavitev ravnine"
+
+#~ msgid "Orientation"
+#~ msgstr "Usmerjenost"
+
+#~ msgid "Photometric Interpretation"
+#~ msgstr "FotometriÄno tolmaÄenje"
+
+#~ msgid "Resolution Unit"
+#~ msgstr "Enota loÄljivosti"
+
+#~ msgid "Exposure Program"
+#~ msgstr "Program osvetlitve"
+
+#~ msgid "Metering Mode"
+#~ msgstr "NaÄin umerjanja"
+
+#~ msgid "Exposure Mode"
+#~ msgstr "NaÄin osvetlitve"
+
+#~ msgid "Custom Rendered"
+#~ msgstr "Izris po meri"
+
+#~ msgid "Components Configuration"
+#~ msgstr "Nastavitve enot"
+
+#~ msgid "Light Source"
+#~ msgstr "Vir svetlobe"
+
+#~ msgid "Sensing Method"
+#~ msgstr "Metoda zaznavanja"
+
+#~ msgid "Color Space"
+#~ msgstr "Barvni prostor"
+
+#~ msgid "White Balance"
+#~ msgstr "UravnoteÅenje beline"
+
+#~ msgid "Focal Plane Resolution Unit"
+#~ msgstr "Enota ploskovne loÄljivosti ÅariÅÄa."
+
+#~ msgid "File Source Type"
+#~ msgstr "Vrsta izvorne datoteke"
+
+#~ msgid "Scene Capture Type"
+#~ msgstr "Vrsta zajema scene"
+
+#~ msgid "Gain Control"
+#~ msgstr "Nadzor ojaÄitve"
+
+#~ msgid "Contrast"
+#~ msgstr "Kontrast"
+
+#~ msgid "Saturation"
+#~ msgstr "NasiÄenost"
+
+#~ msgid "Sharpness"
+#~ msgstr "Ostrina"
+
+#~ msgid "Scene Type"
+#~ msgstr "Vrsta scene"
+
+#~ msgid ""
+#~ "Specify if an original size picture should be rotated or not. Smaller "
+#~ "sizes are automatically rotated."
+#~ msgstr ""
+#~ "DoloÄa ali naj bo originalna slika zavrtena ali ne. ManjÅe velikosti so "
+#~ "samodejno zavrtene."
+
+#~ msgid "Unable to create temporary file"
+#~ msgstr "Ni mogoÄe ustvariti zaÄasne datoteke "
+
+#~ msgid "No Extended Metadata Available"
+#~ msgstr "RazÅirjeni metapodatki niso na voljo"
+
+#~ msgid "Country"
+#~ msgstr "DrÅava"
+
+#~ msgid "City"
+#~ msgstr "Mesto"
+
+#~ msgid "State"
+#~ msgstr "Regija"
+
+#~ msgid "Comment:"
+#~ msgstr "Opomba:"
+
+#~ msgid "Open _Folder..."
+#~ msgstr "Odpri _Mapo ..."
+
+#~ msgid "_New Window"
+#~ msgstr "_Novo Okno"
+
+#~ msgid "\n"
+#~ msgstr "\n"
+
+#~ msgid "<b>{0}</b>."
+#~ msgstr "<b>{0}</b>."
+
+#~ msgid "<small></small>"
+#~ msgstr "<small></small>"
+
+#~ msgid "Photo 0 of 0"
+#~ msgstr "Fotografija 0 od 0"
+
+#~ msgid "Preview"
+#~ msgstr "Predogled"
+
+#~ msgid "Path"
+#~ msgstr "Pot"
+
+#~ msgid "File"
+#~ msgstr "Datoteka"
+
+#~ msgid "Select Tag"
+#~ msgstr "Izbor oznake"
+
+#~ msgid "Downloading Previews"
+#~ msgstr "Nalaganje predogledov"
+
+#~ msgid "Downloading Preview of {0}"
+#~ msgstr "Nalaganje predogleda {0}"
+
+#~ msgid "Copying file {0} of {1}"
+#~ msgstr "Kopiranje datoteke {0} od {1}"
+
+#~ msgid "Error transferring file"
+#~ msgstr "Napaka med prenosom datoteke"
+
+#~ msgid "Download Complete"
+#~ msgstr "Prenos konÄan"
+
+#~ msgid "Done Copying Files"
+#~ msgstr "Kopiranje datotek konÄano"
+
+#~ msgid "Transferring \"{0}\" from camera"
+#~ msgstr "PrenaÅanje \"{0}\" s fotoaparata"
+
+#~ msgid "Port"
+#~ msgstr "Vrata"
+
+#~ msgid "Import error"
+#~ msgstr "Napaka uvaÅanja"
+
+#~ msgid "Error importing {0}{2}{2}{1}"
+#~ msgstr "Napaka med uvaÅanjem {0}{2}{2}{1}"
+
+#~ msgid " "
+#~ msgstr " "
+
+#~ msgid "<b></b>"
+#~ msgstr "<b></b>"
+
+#~ msgid "CD"
+#~ msgstr "CD"
+
+#~ msgid "Camera Selection"
+#~ msgstr "Izbira fotoaparata"
+
+#~ msgid "E-_Mail:"
+#~ msgstr "_E-poÅta:"
+
+#~ msgid "E_xport titles and comments"
+#~ msgstr "Izvozi _naslove in opombe"
+
+#~ msgid "G_allery:"
+#~ msgstr "G_alerija:"
+
+#~ msgid "Gallery"
+#~ msgstr "Galerija"
+
+#~ msgid "Pause"
+#~ msgstr "Premor"
+
+#~ msgid "Select Photos to Copy From Camera..."
+#~ msgstr "Izbor fotografij za kopiranje s fotoaparata"
+
+#~ msgid "Select the camera from which you want to transfer files"
+#~ msgstr "Izbor fotoaparata za prenos datotek"
+
+#~ msgid "Selected Camera: "
+#~ msgstr "Izbran fotoaparat:"
+
+#~ msgid "Strip image _metadata"
+#~ msgstr "Odstrani _metapodatke slike"
+
+#~ msgid "_Flickr"
+#~ msgstr "_Flickr"
+
+#~ msgid "_Gallery"
+#~ msgstr "_Galerija"
+
+#~ msgid "_Open album in browser when done uploading"
+#~ msgstr "_Odpri album v brskalniku po konÄanem nalaganju"
+
+#~ msgid "_Open destination when done exporting"
+#~ msgstr "_Odpiri cilj po konÄanem izvozu"
+
+#~ msgid "_Scale photos to no larger than: "
+#~ msgstr "_Spreminjanje velikosti fotografij na ne veÄ kot: "
+
+#~ msgid "_Strip metadata"
+#~ msgstr "O_dstrani metapodatke"
+
+#~ msgid "_URI:"
+#~ msgstr "_URI:"
+
+#~ msgid "_Virtual Filesystem"
+#~ msgstr "_Navidezni datoteÄni sistem"
+
+#~ msgid "x"
+#~ msgstr "x"
+
+#~ msgid "Done Loading"
+#~ msgstr "Nalaganje konÄano"
+
+#~ msgid "Directory does not exist."
+#~ msgstr "Mapa ne obstaja"
+
+#~ msgid ""
+#~ "The directory you selected \"{0}\" does not exist. Please choose a "
+#~ "different directory"
+#~ msgstr "Mapa \"{0}\", ki ste jo izbrali, ne obstaja. Izberite drugo mapo."
+
+#~ msgid "No cameras detected."
+#~ msgstr "Noben fotoaparat ni bil zaznan."
+
+#~ msgid ""
+#~ "F-Spot was unable to find any cameras attached to this system. Double "
+#~ "check that the camera is connected and has power"
+#~ msgstr ""
+#~ "Program F-spot ni zaznal v sistem povezanih fotoaparatov. Dvakrat "
+#~ "preverite, ali je fotoaparat povezan in priÅgan."
+
+#~ msgid "Error connecting to camera"
+#~ msgstr "Napaka med povezovanjem s fotoaparatom"
+
+#~ msgid "Received error \"{0}\" while connecting to camera"
+#~ msgstr "Med povezovanjem s fotoaparatom je bila prejeta napaka \"{0}\""
+
+#~ msgid "Reparented ({0})"
+#~ msgstr "RazliÄica slike ({0})"
+
+#~ msgid "Could not create a new version"
+#~ msgstr "Ni mogoÄe ustvariti nove razliÄice"
+
+#~ msgid "Received exception \"{0}\". Unable to create version \"{1}\""
+#~ msgstr ""
+#~ "Prejeta je bila napaka \"{0}\". Ni mogoÄe ustvariti razliÄice \"{1}\""
+
+#~ msgid "Really Delete?"
+#~ msgstr "ResniÄen izbris?"
+
+#~ msgid "Cancel"
+#~ msgstr "PrekliÄi"
+
+#~ msgid "Could not delete a version"
+#~ msgstr "Ni mogoÄe izbrisati razliÄice"
+
+#~ msgid "Received exception \"{0}\". Unable to delete version \"{1}\""
+#~ msgstr ""
+#~ "Prejeta je bila napaka \"{0}\". Ni mogoÄe izbrisati razliÄice \"{1}\""
+
+#~ msgid "Could not rename a version"
+#~ msgstr "Ni mogoÄe preimenovati razliÄice"
+
+#~ msgid "Received exception \"{0}\". Unable to rename version to \"{1}\""
+#~ msgstr ""
+#~ "Prejeta je bila napaka \"{0}\". Ni mogoÄe preimenovati razliÄice v \"{1}\""
+
+#~ msgid "Error: Error while transferring; Aborting"
+#~ msgstr "Napaka: napaka med prenosom; preklicano"
+
+#~ msgid "Error: File Already Exists; Aborting"
+#~ msgstr "Napaka: datoteka Åe obstaja; preklicano"
+
+#~ msgid "Edit Selected Tag..."
+#~ msgstr "Uredi izbrane oznake ..."
+
+#~ msgid "_Edit Selected Tag..."
+#~ msgstr "_Uredi izbrane oznake ..."
+
+#~ msgid "Package"
+#~ msgstr "Paket"
+
+#~ msgid "Extension Installation"
+#~ msgstr "Namestitev razÅiritev"
+
+#~ msgid "<b>Select the extensions to install and click on Next</b>"
+#~ msgstr "<b>Izberite razÅiritve za namestitev in kliknite Naprej</b> "
+
+#~ msgid "Install from:"
+#~ msgstr "NameÅÄanje iz: "
+
+#~ msgid "_Repositories..."
+#~ msgstr "Sk_ladiÅÄa ..."
+
+#~ msgid "Show all packages"
+#~ msgstr "PokaÅi vse pakete"
+
+#~ msgid "Show new versions only"
+#~ msgstr "PokaÅi le nove razliÄice"
+
+#~ msgid "Show updates only"
+#~ msgstr "PokaÅi le posodobitve"
+
+#~ msgid "_Unselect All"
+#~ msgstr "_PoÄisti ves izbor"
+
+#~ msgid "label124"
+#~ msgstr "oznaka123"
+
+#~ msgid "Overall Progress:"
+#~ msgstr "Skupni napredek:"
+
+#~ msgid "Downloading extensions..."
+#~ msgstr "PrenaÅanje razÅiritev ..."
+
+#~ msgid "Extension Manager"
+#~ msgstr "Upravljalnik razÅiritev"
+
+#~ msgid "Additional extensions are required to perform this operation."
+#~ msgstr "Za izvajanje dejanja so obvezne dodatne razÅiritve."
+
+#~ msgid "The following extensions will be installed:"
+#~ msgstr "NameÅÄene bodo sledeÄe razÅiritve:"
+
+#~ msgid "<big><b>Extension Manager</b></big>"
+#~ msgstr "<big><b>Upravljalnik razÅiritev</b></big> "
+
+#~ msgid "The following extensions are currently installed:"
+#~ msgstr "Trenutno so nameÅÄene sledeÄe razÅiritve:"
+
+#~ msgid "_Install Extensions..."
+#~ msgstr "_Namesti razÅiritve ..."
+
+#~ msgid "_Uninstall..."
+#~ msgstr "_Odstrani ..."
+
+#~ msgid "Enable"
+#~ msgstr "OmogoÄi"
+
+#~ msgid "Disable"
+#~ msgstr "OnemogoÄi"
+
+#~ msgid "Extension Repository Management"
+#~ msgstr "Upravljanje skladiÅÄa razÅiritev"
+
+#~ msgid "Add New Repository"
+#~ msgstr "Dodajanje novega skladiÅÄa"
+
+#~ msgid "Select the location of the repository you want to register:"
+#~ msgstr "Izbor mesta skladiÅÄa za registracijo:"
+
+#~ msgid "Register an on-line repository"
+#~ msgstr "Registracija spletnega skladiÅÄa"
+
+#~ msgid "Url:"
+#~ msgstr "URL:"
+
+#~ msgid "Register a local repository"
+#~ msgstr "Registracija krajevnega skladiÅÄa."
+
+#~ msgid "Path:"
+#~ msgstr "Pot:"
+
+#~ msgid "Browse..."
+#~ msgstr "Prebrskaj ..."
+
+#~ msgid "Version:"
+#~ msgstr "RazliÄica:"
+
+#~ msgid "Author:"
+#~ msgstr "Avtor:"
+
+#~ msgid "Copyright:"
+#~ msgstr "Avtorske pravice:"
+
+#~ msgid "Extension Dependencies:"
+#~ msgstr "Odvisnosti razÅiritve:"
+
+#~ msgid "All registered repositories"
+#~ msgstr "Vsa registrirana skladiÅÄa"
+
+#~ msgid "Are you sure you want to cancel the installation?"
+#~ msgstr "Ali ste prepriÄani, da Åelite preklicati namestitev?"
+
+#~ msgid "The following packages will be uninstalled:"
+#~ msgstr "SledeÄi paketi bodo odstranjeni:"
+
+#~ msgid ""
+#~ "There are other extensions that depend on the previous ones which will "
+#~ "also be uninstalled:"
+#~ msgstr "Druge razÅiritve so odvisne od prejÅnjih in bodo tudi odstranjene:"
+
+#~ msgid ""
+#~ "The selected extensions can't be installed because there are dependency "
+#~ "conflicts."
+#~ msgstr ""
+#~ "Izbrane razÅiritve ne morejo biti nameÅÄene zaradi spora odvisnosti."
+
+#~ msgid "The following packages will be installed:"
+#~ msgstr "NameÅÄeni bodo sledeÄi paketi:"
+
+#~ msgid " (in user directory)"
+#~ msgstr "(v uporabnikovi mapi)"
+
+#~ msgid "The following packages need to be uninstalled:"
+#~ msgstr "Odstranjeni bodo sledeÄi paketi:"
+
+#~ msgid "The following dependencies could not be resolved:"
+#~ msgstr "Ni bilo zadoÅÄeno sledeÄim odvisnostim:"
+
+#~ msgid "The installation has been successfully completed."
+#~ msgstr "Namestitev je uspeÅno konÄana."
+
+#~ msgid "The installation failed!"
+#~ msgstr "Namestitev je spodletela!"
+
+#~ msgid "The installation has completed with warnings."
+#~ msgstr "Namestitev je zakljuÄena z opozorili."
+
+#~ msgid "The uninstallation has been successfully completed."
+#~ msgstr "Odstranjevanje namestitve je bilo uspeÅno zakljuÄeno."
+
+#~ msgid "The uninstallation failed!"
+#~ msgstr "Odstranjevanje namestitve je spodletelo!"
+
+#~ msgid "The uninstallation has completed with warnings."
+#~ msgstr "Odstranjevanje namestitve je bilo zakljuÄeno z opozorili."
+
+#~ msgid "Repository"
+#~ msgstr "SkladiÅÄe"
+
+#~ msgid "Installation cancelled"
+#~ msgstr "Namestitev je bila preklicana"
+
+#~ msgid "Some of the required extensions were not found"
+#~ msgstr "Nekaj zahtevanih razÅiritev ni bilo najdenih"
+
+#~ msgid "Installation failed"
+#~ msgstr "Namestitev ni uspela"
+
+#~ msgid "Extension"
+#~ msgstr "RazÅiritev"
+
+#~ msgid "Other"
+#~ msgstr "Ostalo"
+
+#~ msgid "Exception occurred: {0}"
+#~ msgstr "PriÅlo je do izjemne napake: {0}"
+
+#~ msgid "Disabled extensions can't be loaded."
+#~ msgstr "OnemogoÄene razÅiritve ne morejo biti naloÅene."
+
+#~ msgid "Loading {0} extension"
+#~ msgstr "Nalaganje razÅiritve {0}"
+
+#~ msgid "The required extension '{0}' is disabled."
+#~ msgstr "Zahtevana razÅiritev '{0}' je onemogoÄena."
+
+#~ msgid "The required extension '{0}' is not installed."
+#~ msgstr "Zahtevana razÅiritev '{0}' ni nameÅÄena."
+
+#~ msgid "(provided by {0})"
+#~ msgstr "(ponudnik {0})"
+
+#~ msgid "my photos"
+#~ msgstr "moje fotografije"
+
+#~ msgid "Copy Locat_ion"
+#~ msgstr "Kopiraj _mesto"
+
+#~ msgid "Reveal"
+#~ msgstr "Razodeni"
+
+#~ msgid "Wipe"
+#~ msgstr "DokonÄno poÄisti"
+
+#~ msgid "Split"
+#~ msgstr "Razdelitev"
diff --git a/po/sort-potfiles b/po/sort-potfiles
old mode 100755
new mode 100644
diff --git a/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj b/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj
index 05d9db3..f5e1fa1 100644
--- a/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj
+++ b/src/Clients/MainApp.UnitTest/MainApp.UnitTest.csproj
@@ -1,85 +1,85 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>MainApp.UnitTest</RootNamespace>
- <AssemblyName>MainApp.UnitTest</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug</OutputPath>
- <DefineConstants>DEBUG;</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Release</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
- <Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="FSpot\TestOf_AndTerm.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{A2A7E62B-8AE1-44F3-BB1B-B8E2DE7916C4}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>MainApp.UnitTest</RootNamespace>
+ <AssemblyName>MainApp.UnitTest</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug</OutputPath>
+ <DefineConstants>DEBUG;</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Release</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+ <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+ <Reference Include="System" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="FSpot\TestOf_AndTerm.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
index 6e8b053..a3917d7 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/Adjustment.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 System.Collections.Generic;
-
-using Cms;
-
+//
+
+using System.Collections.Generic;
+
+using Cms;
+
using Gdk;
namespace FSpot.ColorAdjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
index 7ef9b81..9c3bc36 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/AutoStretch.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.Collections.Generic;
-
-using Cms;
-
-using Gdk;
-
+//
+
+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 ed5c9da..6e77e65 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/Desaturate.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 System.Collections.Generic;
-
-using Cms;
-
+//
+
+using System.Collections.Generic;
+
+using Cms;
+
using Gdk;
namespace FSpot.ColorAdjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
index 5a12982..9bfac37 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/FullColorAdjustment.cs
@@ -25,11 +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 System.Collections.Generic;
-
+//
+
+using System;
+using System.Collections.Generic;
+
using Gdk;
namespace FSpot.ColorAdjustment {
diff --git a/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs b/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
index c44c65f..532432c 100644
--- a/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.cs
+++ b/src/Clients/MainApp/FSpot.ColorAdjustment/SepiaTone.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 System.Collections.Generic;
-
-using Cms;
-
+//
+
+using System.Collections.Generic;
+
+using Cms;
+
using Gdk;
namespace FSpot.ColorAdjustment {
diff --git a/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs b/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
index 3ab9ade..5ddd90a 100644
--- a/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/ColorEditor.cs
@@ -27,16 +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 FSpot.ColorAdjustment;
-
-using Gdk;
-using Gtk;
-using GtkBeans;
-
+//
+
+using System;
+
+using FSpot.ColorAdjustment;
+
+using Gdk;
+using Gtk;
+using GtkBeans;
+
using Mono.Unix;
namespace FSpot.Editors {
diff --git a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
index 2c791f9..80f24c0 100644
--- a/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/CropEditor.cs
@@ -25,24 +25,24 @@
// 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 FSpot.UI.Dialog;
-using FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
-using Hyena;
-
+//
+
+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;
-namespace FSpot.Editors {
+namespace FSpot.Editors {
// FIXME: This is never used
class CropEditor : Editor {
private TreeStore constraints_store;
diff --git a/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs b/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
index 8850631..86074f6 100644
--- a/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/DesaturateEditor.cs
@@ -33,7 +33,7 @@ using Gdk;
using Mono.Unix;
-namespace FSpot.Editors {
+namespace FSpot.Editors {
// FIXME: This is never used
class DesaturateEditor : Editor {
public DesaturateEditor () : base (Catalog.GetString ("Desaturate"), "color-desaturate") {
diff --git a/src/Clients/MainApp/FSpot.Editors/Editor.cs b/src/Clients/MainApp/FSpot.Editors/Editor.cs
index 9f034ec..8502298 100644
--- a/src/Clients/MainApp/FSpot.Editors/Editor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/Editor.cs
@@ -193,10 +193,10 @@ namespace FSpot.Editors {
protected virtual Pixbuf ProcessFast (Pixbuf input, Cms.Profile input_profile) {
return Process (input, input_profile);
- }
-
- public bool HasSettings { get; protected set; }
-
+ }
+
+ public bool HasSettings { get; protected set; }
+
private Pixbuf original;
private Pixbuf preview;
protected void UpdatePreview () {
diff --git a/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs b/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
index 3327045..ff57f84 100644
--- a/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/SepiaEditor.cs
@@ -33,7 +33,7 @@ using Gdk;
using Mono.Unix;
-namespace FSpot.Editors {
+namespace FSpot.Editors {
// FIXME: This is never used
class SepiaEditor : Editor {
public SepiaEditor () : base (Catalog.GetString ("Sepia Tone"), "color-sepia") {
diff --git a/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs b/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
index cc69226..8170a96 100644
--- a/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/SoftFocusEditor.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 FSpot.Widgets;
-
-using Gdk;
-using Gtk;
-
-using Mono.Unix;
-
+//
+
+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 c720d98..75b9da1 100644
--- a/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
+++ b/src/Clients/MainApp/FSpot.Editors/TiltEditor.cs
@@ -27,24 +27,24 @@
// 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 FSpot.Widgets;
-
-using Gdk;
-using Gtk;
-
-using Mono.Unix;
-
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Widgets;
+
+using Gdk;
+using Gtk;
+
+using Mono.Unix;
+
using Pinta.Core;
namespace FSpot.Editors
{
- // TODO: there were keybindings (left/right) to adjust tilt, maybe they should be added back.
+ // TODO: there were keybindings (left/right) to adjust tilt, maybe they should be added back.
// FIXME: This is never used
class TiltEditor : Editor
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
index 1609e4d..9259d21 100644
--- a/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/CommandMenuItemNode.cs
@@ -25,10 +25,10 @@
// 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 Mono.Addins;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
index 6bb5260..f748d75 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ComplexMenuItemNode.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 System;
-
-using Hyena.Widgets;
-
+//
+
+using System;
+
+using Hyena.Widgets;
+
using Mono.Addins;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
index 30a9059..f768fd7 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ExportMenuItemNode.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 System;
-
-using FSpot.Core;
-
+//
+
+using System;
+
+using FSpot.Core;
+
using Mono.Addins;
namespace FSpot.Extensions
diff --git a/src/Clients/MainApp/FSpot.Extensions/IExporter.cs b/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
index 83be35c..a7f5da8 100644
--- a/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/IExporter.cs
@@ -27,9 +27,9 @@
// 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.Core;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Extensions/PhotoSelectionCondition.cs b/src/Clients/MainApp/FSpot.Extensions/PhotoSelectionCondition.cs
index 9b48f23..e659bd7 100644
--- a/src/Clients/MainApp/FSpot.Extensions/PhotoSelectionCondition.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/PhotoSelectionCondition.cs
@@ -51,15 +51,15 @@ namespace FSpot.Extensions
int count = App.Instance.Organizer.Selection.Count;
string val = conditionNode.GetAttribute ("selection");
if (val.Length > 0) {
- foreach (string selection in val.Split(','))
- {
+ foreach (string selection in val.Split(','))
+ {
if (selection == "multiple" && count > 1) {
return true;
- }
+ }
if (selection == "single" && count == 1) {
return true;
- }
- }
+ }
+ }
}
return false;
}
diff --git a/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs b/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
index 29e12c8..83a86a6 100644
--- a/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/SidebarPage.cs
@@ -25,20 +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 Gtk;
-
+//
+
+using System;
+
+using Gtk;
+
using Mono.Addins;
namespace FSpot.Extensions
{
public class SidebarPage {
- // The widget shown on the sidebar page.
- public Widget SidebarWidget { get; private set; }
-
+ // The widget shown on the sidebar page.
+ public Widget SidebarWidget { get; private set; }
+
// Whether this page can be selected
private bool can_select;
public bool CanSelect {
@@ -52,12 +52,12 @@ namespace FSpot.Extensions
public event EventHandler CanSelectChanged;
- // The label of the sidebar page.
- public string Label { get; private set; }
-
- // The icon name, used for the selector
- public string IconName { get; private set; }
-
+ // The label of the sidebar page.
+ public string Label { get; private set; }
+
+ // The icon name, used for the selector
+ public string IconName { get; private set; }
+
// The sidebar onto which this page is attached
private Gtk.Widget sidebar;
public Gtk.Widget Sidebar {
diff --git a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
index bacadc2..d1aa998 100644
--- a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
@@ -25,10 +25,10 @@
// 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.Transitions;
-
+//
+
+using FSpot.Transitions;
+
using Mono.Addins;
namespace FSpot.Extensions
@@ -41,7 +41,7 @@ namespace FSpot.Extensions
SlideShowTransition transition = null;
public SlideShowTransition Transition {
- get { return transition ?? (transition = Addin.CreateInstance(class_name) as SlideShowTransition); }
+ get { return transition ?? (transition = Addin.CreateInstance(class_name) as SlideShowTransition); }
}
}
}
\ No newline at end of file
diff --git a/src/Clients/MainApp/FSpot.Extensions/ViewModeCondition.cs b/src/Clients/MainApp/FSpot.Extensions/ViewModeCondition.cs
index 487be1f..f19d321 100644
--- a/src/Clients/MainApp/FSpot.Extensions/ViewModeCondition.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/ViewModeCondition.cs
@@ -73,15 +73,15 @@ namespace FSpot.Extensions
{
string val = conditionNode.GetAttribute ("mode");
if (val.Length > 0) {
- foreach (string mode in val.Split(','))
- {
+ foreach (string mode in val.Split(','))
+ {
if (mode == "single" && Mode == ViewMode.Single) {
return true;
- }
+ }
if (mode == "library" && Mode == ViewMode.Library) {
return true;
- }
- }
+ }
+ }
}
return false;
}
diff --git a/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs b/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
index f64dea3..93271d1 100644
--- a/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/JpegFilter.cs
@@ -30,19 +30,19 @@
//
namespace FSpot.Filters {
- public class JpegFilter : IFilter {
- public uint Quality { get; set; }
-
+ public class JpegFilter : IFilter {
+ public uint Quality { get; set; }
+
public JpegFilter (uint quality)
{
Quality = quality;
}
- public JpegFilter()
- {
- Quality = 95;
- }
-
+ public JpegFilter()
+ {
+ Quality = 95;
+ }
+
public bool Convert (FilterRequest req)
{
var source = req.Current;
diff --git a/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs b/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
index 98fbb80..9567ad5 100644
--- a/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/ResizeFilter.cs
@@ -35,14 +35,14 @@ using Gdk;
namespace FSpot.Filters {
public class ResizeFilter : IFilter
- {
+ {
public ResizeFilter (uint size)
{
Size = size;
- }
-
- public uint Size { get; set; }
-
+ }
+
+ public uint Size { get; set; }
+
public bool Convert (FilterRequest req)
{
string source = req.Current.LocalPath;
diff --git a/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs b/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
index 173dec8..4c980f0 100644
--- a/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
+++ b/src/Clients/MainApp/FSpot.Filters/SharpFilter.cs
@@ -27,10 +27,10 @@
// 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.Imaging;
-
+//
+
+using FSpot.Imaging;
+
using Gdk;
namespace FSpot.Filters {
diff --git a/src/Clients/MainApp/FSpot.Imaging/Ciff.cs b/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
index 7799998..ea62699 100644
--- a/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/Ciff.cs
@@ -185,8 +185,8 @@ namespace FSpot.Imaging.Ciff {
byte [] data = GetEmbeddedJpeg ();
if (data != null)
- return new System.IO.MemoryStream (data);
- return DCRawFile.RawPixbufStream (Uri);
+ return new System.IO.MemoryStream (data);
+ return DCRawFile.RawPixbufStream (Uri);
}
private byte [] GetEmbeddedJpeg ()
@@ -195,12 +195,12 @@ namespace FSpot.Imaging.Ciff {
}
protected override void Close ()
- {
- if (stream == null)
- return;
-
+ {
+ if (stream == null)
+ return;
+
stream.Close ();
- stream = null;
+ stream = null;
}
}
}
diff --git a/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs b/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
index 53d9f2f..43a1594 100644
--- a/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/ImageFile.cs
@@ -28,15 +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.Collections.Generic;
-using System.Linq;
-using Hyena;
-
-using TagLib.Image;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using Hyena;
+
+using TagLib.Image;
+
using GFileInfo = GLib.FileInfo;
namespace FSpot.Imaging
@@ -141,11 +141,11 @@ namespace FSpot.Imaging
Type t = null;
if (NameTable.TryGetValue (mime, out t))
- return t;
-
+ return t;
+
if (NameTable.TryGetValue (extension, out t))
- return t;
-
+ return t;
+
return null;
}
@@ -179,22 +179,22 @@ namespace FSpot.Imaging
".rw2",
};
- var extension = uri.GetExtension ().ToLower ();
- return raw_extensions.Any(ext => ext == extension);
+ var extension = uri.GetExtension ().ToLower ();
+ return raw_extensions.Any(ext => ext == extension);
}
public static bool IsJpeg (SafeUri uri)
{
- string [] jpg_extensions = {
- ".jpg",
- ".jpeg",
- ".jpe",
- ".jfi",
- ".jfif",
- ".jif"
+ string [] jpg_extensions = {
+ ".jpg",
+ ".jpeg",
+ ".jpe",
+ ".jfi",
+ ".jfif",
+ ".jif"
};
- var extension = uri.GetExtension ().ToLower ();
+ var extension = uri.GetExtension ().ToLower ();
return jpg_extensions.Any(ext => ext == extension);
}
#endregion
diff --git a/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs b/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
index 9d95323..20d48cd 100644
--- a/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/InternalProcess.cs
@@ -46,11 +46,11 @@ namespace FSpot.Imaging {
internal class InternalProcess {
int stdin;
- int stdout;
- IOChannel output;
-
- public IOChannel StandardInput { get; private set; }
-
+ int stdout;
+ IOChannel output;
+
+ public IOChannel StandardInput { get; private set; }
+
public IOChannel StandardOutput {
get {
return output;
diff --git a/src/Clients/MainApp/FSpot.Imaging/RafFile.cs b/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
index 791095a..96f57e9 100644
--- a/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/RafFile.cs
@@ -56,8 +56,8 @@ namespace FSpot.Imaging {
byte [] data = GetEmbeddedJpeg ();
if (data != null)
- return new System.IO.MemoryStream (data);
- return DCRawFile.RawPixbufStream (Uri);
+ return new System.IO.MemoryStream (data);
+ return DCRawFile.RawPixbufStream (Uri);
}
private byte [] GetEmbeddedJpeg ()
diff --git a/src/Clients/MainApp/FSpot.Imaging/Tiff.cs b/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
index 20754d6..dfe226c 100644
--- a/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
+++ b/src/Clients/MainApp/FSpot.Imaging/Tiff.cs
@@ -195,12 +195,12 @@ namespace FSpot.Imaging
}
}
- public override System.IO.Stream PixbufStream ()
- {
+ public override System.IO.Stream PixbufStream ()
+ {
if (jpeg_data != null)
- return new MemoryStream (jpeg_data);
- return DCRawFile.RawPixbufStream (Uri);
- }
+ return new MemoryStream (jpeg_data);
+ return DCRawFile.RawPixbufStream (Uri);
+ }
}
public class Cr2File : BaseImageFile
diff --git a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
index c408231..282aa07 100644
--- a/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
+++ b/src/Clients/MainApp/FSpot.Import/FileImportSource.cs
@@ -25,18 +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 System.Threading;
-
-using FSpot.Core;
-using FSpot.Imaging;
-using FSpot.Utils;
-
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Gtk;
+
using Hyena;
namespace FSpot.Import
@@ -55,18 +55,18 @@ namespace FSpot.Import
public FileImportSource (SafeUri root, string name, string icon_name)
{
Root = root;
- Name = name;
-
- if (root == null)
- return;
-
+ Name = name;
+
+ if (root == null)
+ return;
+
if (IsIPodPhoto) {
IconName = "multimedia-player";
} else if (IsCamera) {
IconName = "media-flash";
} else {
IconName = icon_name;
- }
+ }
}
public void StartPhotoScan (ImportController controller, PhotoList photo_list)
diff --git a/src/Clients/MainApp/FSpot.Import/ImportController.cs b/src/Clients/MainApp/FSpot.Import/ImportController.cs
index fa03d1c..24741d1 100644
--- a/src/Clients/MainApp/FSpot.Import/ImportController.cs
+++ b/src/Clients/MainApp/FSpot.Import/ImportController.cs
@@ -25,17 +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 System.Threading;
-
-using FSpot.Core;
-using FSpot.Utils;
-
-using Hyena;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Core;
+using FSpot.Utils;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Import
@@ -132,7 +132,7 @@ namespace FSpot.Import
private List<IImportSource> sources;
public IEnumerable<IImportSource> Sources {
- get { return sources ?? (sources = ScanSources()); }
+ get { return sources ?? (sources = ScanSources()); }
}
List<IImportSource> ScanSources ()
@@ -472,21 +472,21 @@ namespace FSpot.Import
{
var parts = uri.AbsolutePath.Split('/');
SafeUri current = new SafeUri (uri.Scheme + ":///", true);
- foreach (string t in parts)
- {
+ foreach (string t in parts)
+ {
current = current.Append (t);
var file = GLib.FileFactory.NewForUri (current);
if (!file.Exists) {
file.MakeDirectory (null);
- }
+ }
}
}
#endregion
-#region Tagging
-
- readonly List<Tag> attach_tags = new List<Tag> ();
+#region Tagging
+
+ readonly List<Tag> attach_tags = new List<Tag> ();
readonly TagStore tag_store = App.Instance.Database.Tags;
// Set the tags that will be added on import.
diff --git a/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs b/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
index 93727a7..bc853be 100644
--- a/src/Clients/MainApp/FSpot.Import/MetadataImporter.cs
+++ b/src/Clients/MainApp/FSpot.Import/MetadataImporter.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.Collections.Generic;
-
-using FSpot.Core;
-using FSpot.Utils;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Utils;
+
using Mono.Unix;
namespace FSpot.Import {
diff --git a/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs b/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
index 197da86..ea59113 100644
--- a/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
+++ b/src/Clients/MainApp/FSpot.Jobs/SyncMetadataJob.cs
@@ -27,15 +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 Banshee.Kernel;
-
-using FSpot.Core;
-using FSpot.Utils;
-
+//
+
+using System;
+
+using Banshee.Kernel;
+
+using FSpot.Core;
+using FSpot.Utils;
+
using Hyena;
namespace FSpot.Jobs {
diff --git a/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs b/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
index ea8ae80..8798c54 100644
--- a/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/AreaPreparedEventArgs.cs
@@ -34,7 +34,7 @@ namespace FSpot.Loaders {
{
public bool ReducedResolution { get; private set; }
- public AreaPreparedEventArgs (bool reduced_resolution)
+ public AreaPreparedEventArgs (bool reduced_resolution)
{
ReducedResolution = reduced_resolution;
}
diff --git a/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs b/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
index fdb0726..93b0d62 100644
--- a/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/AreaUpdatedEventArgs.cs
@@ -34,7 +34,7 @@ namespace FSpot.Loaders {
{
public Gdk.Rectangle Area { get; private set; }
- public AreaUpdatedEventArgs (Gdk.Rectangle area)
+ public AreaUpdatedEventArgs (Gdk.Rectangle area)
{
Area = area;
}
diff --git a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
index fc73175..9e2b581 100644
--- a/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
+++ b/src/Clients/MainApp/FSpot.Loaders/GdkImageLoader.cs
@@ -1,51 +1,51 @@
-//
-// 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;
-
+//
+// 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
{
public class GdkImageLoader : Gdk.PixbufLoader, IImageLoader
{
-#region public api
-
+#region public api
+
~GdkImageLoader ()
{
if (!is_disposed) {
@@ -92,15 +92,15 @@ namespace FSpot.Loaders
Pixbuf thumb;
new public Pixbuf Pixbuf {
- get { return thumb != null ? thumb : base.Pixbuf; }
- }
-
- public bool Loading { get; private set; }
-
- bool notify_prepared = false;
-
- public bool Prepared { get; private set; }
-
+ get { return thumb != null ? thumb : base.Pixbuf; }
+ }
+
+ public bool Loading { get; private set; }
+
+ bool notify_prepared = false;
+
+ public bool Prepared { get; private set; }
+
ImageOrientation pixbuf_orientation = ImageOrientation.TopLeft;
public ImageOrientation PixbufOrientation {
@@ -174,14 +174,14 @@ namespace FSpot.Loaders
byte[] buffer = new byte [count];
bool notify_completed = false;
Rectangle damage;
- object sync_handle = new object ();
-
- public GdkImageLoader()
- {
- Prepared = false;
- Loading = false;
- }
-
+ object sync_handle = new object ();
+
+ public GdkImageLoader()
+ {
+ Prepared = false;
+ Loading = false;
+ }
+
void HandleReadDone (IAsyncResult ar)
{
if (is_disposed)
diff --git a/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs b/src/Clients/MainApp/FSpot.Loaders/ImageLoader.cs
index 25a3205..c052229 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 System;
-using System.Collections.Generic;
-
-using FSpot.Imaging;
-
+//
+
+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 317309c..f7ab572 100644
--- a/src/Clients/MainApp/FSpot.Query/HiddenTag.cs
+++ b/src/Clients/MainApp/FSpot.Query/HiddenTag.cs
@@ -42,11 +42,11 @@ namespace FSpot.Query
private static HiddenTag hide_hidden_tag;
public static HiddenTag ShowHiddenTag {
- get { return show_hidden_tag ?? (show_hidden_tag = new HiddenTag(true)); }
+ get { return show_hidden_tag ?? (show_hidden_tag = new HiddenTag(true)); }
}
public static HiddenTag HideHiddenTag {
- get { return hide_hidden_tag ?? (hide_hidden_tag = new HiddenTag(false)); }
+ get { return hide_hidden_tag ?? (hide_hidden_tag = new HiddenTag(false)); }
}
@@ -63,8 +63,8 @@ namespace FSpot.Query
if ( ! show_hidden && hidden != null)
return String.Format (" photos.id NOT IN (SELECT photo_id FROM photo_tags WHERE tag_id = {0}) ",
- hidden.Id);
- return null;
+ hidden.Id);
+ return null;
}
}
}
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
index 1592aaa..f176fad 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/AboutDialog.cs
@@ -25,13 +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.IO;
-
-using Hyena;
-
+//
+
+using System;
+using System.IO;
+
+using Hyena;
+
using Mono.Unix;
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 183aec0..254ab1a 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/AdjustTimeDialog.cs
@@ -29,18 +29,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 FSpot.Core;
-using FSpot.Database;
-using FSpot.Widgets;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Widgets;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.UI.Dialog {
@@ -197,10 +197,10 @@ namespace FSpot.UI.Dialog {
date -= span;
}
- foreach (Photo t in photos)
- {
+ foreach (Photo t in photos)
+ {
t.Time = date + accum;
- accum += span;
+ accum += span;
}
db.Photos.Commit (photos);
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
index da3f475..fe99e24 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/BuilderDialog.cs
@@ -25,8 +25,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.
-//
-
+//
+
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 7bd21b3..42711d5 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/DateRangeDialog.cs
@@ -27,15 +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 FSpot.Query;
-using FSpot.Widgets;
-
-using Gtk;
-
+//
+
+using System;
+
+using FSpot.Query;
+using FSpot.Widgets;
+
+using Gtk;
+
using Mono.Unix;
namespace FSpot.UI.Dialog
@@ -126,12 +126,12 @@ namespace FSpot.UI.Dialog
return Catalog.GetString("Previous Week (Mon-Sun)");
case "thismonth":
if (today.Year == (today.AddMonths(-1)).Year) // Same year for current and previous month. Present only MONTH
- return today.ToString("MMMM");
- return today.ToString("MMMM, yyyy");
+ return today.ToString("MMMM");
+ return today.ToString("MMMM, yyyy");
case "previousmonth":
if (today.Year == (today.AddMonths(-1)).Year) // Same year for current and previous month. Present only MONTH
- return (today.AddMonths(-1)).ToString("MMMM");
- return (today.AddMonths(-1)).ToString("MMMM, yyyy");
+ return (today.AddMonths(-1)).ToString("MMMM");
+ return (today.AddMonths(-1)).ToString("MMMM, yyyy");
case "thisyear":
return today.ToString("yyyy");
case "previousyear":
@@ -223,8 +223,8 @@ namespace FSpot.UI.Dialog
default:
clear = true;
break;
- }
- return clear ? null : new DateRange (startdate, enddate.Add (new System.TimeSpan(23,59,59)));
+ }
+ return clear ? null : new DateRange (startdate, enddate.Add (new System.TimeSpan(23,59,59)));
}
void HandleDateEditChanged (object o, EventArgs args)
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
index 9a4e314..6946cbd 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditExceptionDialog.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 System;
-
-using FSpot.Core;
-
-using Gtk;
-
-using Hyena;
-using Hyena.Widgets;
-
+//
+
+using System;
+
+using FSpot.Core;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
namespace FSpot.UI.Dialog
{
public class EditException : Exception
- {
- public IPhoto Item { get; private set; }
-
+ {
+ public IPhoto Item { get; private set; }
+
public EditException (IPhoto item, Exception e) : base (
String.Format (Catalog.GetString ("Received exception \"{0}\". Unable to save photo {1}"),
e.Message, item.Name), e)
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
index 163d90f..cd6f436 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagDialog.cs
@@ -1,39 +1,39 @@
-//
-// 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;
-
+//
+// 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;
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 af31adf..ba0f3ae 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/EditTagIconDialog.cs
@@ -27,21 +27,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 FSpot.Core;
-using FSpot.Database;
-using FSpot.Imaging;
-using FSpot.Utils;
-using FSpot.Widgets;
-
-using Gtk;
-
-using Hyena;
-using Hyena.Widgets;
-
+//
+
+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;
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 e0da81a..caec53c 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ImportDialog.cs
@@ -25,19 +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 FSpot.Import;
-using FSpot.Utils;
-using FSpot.Widgets;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+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
@@ -265,9 +265,9 @@ namespace FSpot.UI.Dialog
if (sources_combo.Active == current_index) {
Log.Debug ("Skipping double fire!");
return;
- }
- current_index = sources_combo.Active;
-
+ }
+ current_index = sources_combo.Active;
+
TreeIter iter;
sources_combo.GetActiveIter (out iter);
var source = Sources.GetValue (iter, 0) as IImportSource;
@@ -276,9 +276,9 @@ namespace FSpot.UI.Dialog
if (label == select_folder_label) {
ShowFolderSelector ();
return;
- }
+ }
sources_combo.Active = 0;
- return;
+ return;
}
Controller.ActiveSource = source;
}
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
index 0a1c5de..707d39e 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ImportFailureDialog.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.Collections.Generic;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.UI.Dialog
@@ -47,12 +47,12 @@ namespace FSpot.UI.Dialog
private Label header_label;
private Hyena.Widgets.WrapLabel message_label;
private TreeView list_view;
- private Expander details_expander;
-
- protected AccelGroup AccelGroup { get; private set; }
-
-
- public ImportFailureDialog (IEnumerable<SafeUri> files)
+ private Expander details_expander;
+
+ protected AccelGroup AccelGroup { get; private set; }
+
+
+ public ImportFailureDialog (IEnumerable<SafeUri> files)
{
BuildUI ();
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
index 5e3a230..cbec65d 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/LastRollDialog.cs
@@ -1,40 +1,40 @@
-//
-// 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 System.Linq;
-using FSpot.Core;
-using FSpot.Query;
-
+//
+// 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 System.Linq;
+using FSpot.Core;
+using FSpot.Query;
+
using Gtk;
namespace FSpot.UI.Dialog
@@ -98,8 +98,8 @@ namespace FSpot.UI.Dialog
{
Roll [] selected_rolls = SelectedRolls ();
uint sum = 0;
- if (selected_rolls != null)
- sum = selected_rolls.Aggregate(sum, (current, roll) => current + rollstore.PhotosInRoll(roll));
+ if (selected_rolls != null)
+ sum = selected_rolls.Aggregate(sum, (current, roll) => current + rollstore.PhotosInRoll(roll));
photos_in_selected_rolls.Text = sum.ToString ();
}
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
index acb30b9..2087e3c 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/PreferenceDialog.cs
@@ -27,16 +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.IO;
-using System.Linq;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+using System.IO;
+using System.Linq;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.UI.Dialog {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ProgressDialog.cs
index 85a8635..c9b130e 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 System;
-
-using Gtk;
-
+//
+
+using System;
+
+using Gtk;
+
using Mono.Unix;
namespace FSpot.UI.Dialog {
@@ -51,14 +51,14 @@ namespace FSpot.UI.Dialog {
None
};
- private int total_count;
-
- public ProgressBar Bar { get; private set; }
-
- public Label Message { get; private set; }
-
- public Button Button { get; private set; }
-
+ private int total_count;
+
+ public ProgressBar Bar { get; private set; }
+
+ public Label Message { get; private set; }
+
+ public Button Button { get; private set; }
+
public ProgressDialog (string title, CancelButtonType cancel_button_type, int total_count, Gtk.Window parent_window)
{
Title = title;
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
index d765c61..822908b 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RatingFilterDialog.cs
@@ -29,13 +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 FSpot.Query;
-using FSpot.Widgets;
-
-using Gtk;
-
+//
+
+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 ba1f9e9..29e686b 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDbDialog.cs
@@ -27,15 +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 Gtk;
-
-using Hyena;
-using Hyena.Widgets;
-
+//
+
+using System;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
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 dc387b0..54fc74d 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/RepairDialog.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.IO;
-
-using FSpot.Core;
-using FSpot.Widgets;
-
+//
+
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Widgets;
+
using Gtk;
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 3b29d07..787bc61 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/SelectionRatioDialog.cs
@@ -25,17 +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 System.IO;
-using System.Xml.Serialization;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Xml.Serialization;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.UI.Dialog {
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
index 9db97e5..1d9638c 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/TagSelectionDialog.cs
@@ -29,10 +29,10 @@
// 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.Core;
+
using Gtk;
namespace FSpot.UI.Dialog {
@@ -52,7 +52,7 @@ namespace FSpot.UI.Dialog {
public new Tag[] Run ()
{
int response = base.Run ();
- return (ResponseType) response == ResponseType.Ok ? tag_selection_widget.TagHighlight : null;
+ return (ResponseType) response == ResponseType.Ok ? tag_selection_widget.TagHighlight : null;
}
public new void Hide ()
diff --git a/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs b/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs
index 7cdf9af..df62de5 100644
--- a/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs
+++ b/src/Clients/MainApp/FSpot.UI.Dialog/ThreadProgressDialog.cs
@@ -29,14 +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.Collections.Generic;
-using System.Threading;
-
-using FSpot.Utils;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Utils;
+
using Gtk;
namespace FSpot.UI.Dialog {
diff --git a/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs b/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
index 65e13ad..734956d 100644
--- a/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/BrowseablePointerGridView.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 System;
-
-using FSpot.Core;
-
+//
+
+using System;
+
+using FSpot.Core;
+
using Gdk;
diff --git a/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.cs b/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.cs
index f0fbe7f..1300462 100644
--- a/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/CollectionCellGridView.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 FSpot.Core;
-using FSpot.Utils;
-
-using Gdk;
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Utils;
+
+using Gdk;
using Gtk;
@@ -67,7 +67,7 @@ namespace FSpot.Widgets
{
}
- public CollectionGridView (IBrowsableCollection collection)
+ public CollectionGridView (IBrowsableCollection collection)
{
Collection = collection;
@@ -188,10 +188,10 @@ namespace FSpot.Widgets
}
protected override int CellCount {
- get
- {
- return Collection == null ? 0 : Collection.Count;
- }
+ get
+ {
+ return Collection == null ? 0 : Collection.Count;
+ }
}
#endregion
@@ -212,11 +212,11 @@ namespace FSpot.Widgets
private bool display_dates = true;
public bool DisplayDates {
- get
- {
- return MinCellWidth > 100 && display_dates;
- }
-
+ get
+ {
+ return MinCellWidth > 100 && display_dates;
+ }
+
set {
display_dates = value;
QueueResize ();
@@ -236,10 +236,10 @@ namespace FSpot.Widgets
private bool display_ratings = true;
public bool DisplayRatings {
- get {
- return MinCellWidth > 100 && display_ratings;
- }
-
+ get {
+ return MinCellWidth > 100 && display_ratings;
+ }
+
set {
display_ratings = value;
QueueResize ();
@@ -506,11 +506,11 @@ namespace FSpot.Widgets
InvalidateCell (throb_cell);
if (throb_state++ < throb_state_max) {
return true;
- }
-
+ }
+
throb_cell = -1;
throb_timer_id = 0;
- return false;
+ return false;
}
private int ThrobExpansion (int cell, bool selected)
diff --git a/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs b/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
index 2aeb345..a2a7dc8 100644
--- a/src/Clients/MainApp/FSpot.Widgets/EditorPage.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/EditorPage.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.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 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;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs b/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
index 99b7416..10182fb 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Filmstrip.cs
@@ -34,18 +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.Generic;
-
-using FSpot.Bling;
-using FSpot.Core;
-using FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
+// * 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
@@ -109,10 +109,10 @@ namespace FSpot.Widgets
throw new ArgumentException ("ThumbSize is negative!");
thumb_size = value;
}
- }
-
- public bool SquaredThumbs { get; set; }
-
+ }
+
+ public bool SquaredThumbs { get; set; }
+
Pixbuf background_tile;
public Pixbuf BackgroundTile {
get {
@@ -211,9 +211,9 @@ namespace FSpot.Widgets
}
BrowsablePointer selection;
- DisposableCache<SafeUri, Pixbuf> thumb_cache;
-
- public Filmstrip (BrowsablePointer selection, bool squared_thumbs = true)
+ DisposableCache<SafeUri, Pixbuf> thumb_cache;
+
+ public Filmstrip (BrowsablePointer selection, bool squared_thumbs = true)
{
CanFocus = true;
this.selection = selection;
@@ -518,8 +518,8 @@ namespace FSpot.Widgets
pos = key;
ActiveItem = start_indexes [pos];
return true;
- }
-
+ }
+
protected virtual Pixbuf GetPixbuf (int i, bool highlighted = false)
{
Pixbuf current = null;
diff --git a/src/Clients/MainApp/FSpot.Widgets/FindBar.cs b/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
index 700969c..732364e 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FindBar.cs
@@ -29,26 +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 System;
-using System.Text;
-using System.Text.RegularExpressions;
-
-using FSpot.Core;
-using FSpot.Query;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+using System.Text;
+using System.Text.RegularExpressions;
+
+using FSpot.Core;
+using FSpot.Query;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Widgets {
- public class FindBar : HighlightedBox {
+ public class FindBar : HighlightedBox {
private string last_entry_text = String.Empty;
private int open_parens = 0, close_parens = 0;
- private PhotoQuery query;
+ private PhotoQuery query;
private HBox box;
/*
@@ -58,18 +58,18 @@ namespace FSpot.Widgets {
get {
return (Entry.Completion as LogicEntryCompletion).Completing;
}
- }
-
- public Entry Entry { get; private set; }
-
- public Term RootTerm { get; private set; }
-
+ }
+
+ public Entry Entry { get; private set; }
+
+ public Term RootTerm { get; private set; }
+
/*
* Constructor
*/
public FindBar (PhotoQuery query, TreeModel model) : base(new HBox())
- {
- RootTerm = null;
+ {
+ RootTerm = null;
this.query = query;
box = Child as HBox;
@@ -109,12 +109,12 @@ namespace FSpot.Widgets {
//int start = args.Position - args.Length;
- foreach (char c in args.Text)
- {
+ foreach (char c in args.Text)
+ {
if (c == '(')
open_parens++;
else if (c == ')')
- close_parens++;
+ close_parens++;
}
int pos = Entry.Position + 1;
@@ -138,14 +138,14 @@ namespace FSpot.Widgets {
//Log.DebugFormat ("start {0} end {1} len {2} last {3}", args.StartPos, args.EndPos, length, last_entry_text);
string txt = length < 0 ? last_entry_text : last_entry_text.Substring (args.StartPos, length);
- foreach (char t in txt)
- {
+ foreach (char t in txt)
+ {
if (t == '(')
open_parens--;
else if (t == ')')
- close_parens--;
- }
-
+ close_parens--;
+ }
+
last_entry_text = Entry.Text;
QueueUpdate ();
@@ -304,8 +304,8 @@ namespace FSpot.Widgets {
RootTerm = parent;
return true;
- }
-
+ }
+
Term us = null;
if (op != null && op != String.Empty) {
us = Term.TermFromOperator (op, parent, null);
@@ -356,7 +356,7 @@ namespace FSpot.Widgets {
us.Invert(false);
}
- return true;
+ return true;
}
private bool updating = false;
@@ -468,12 +468,12 @@ namespace FSpot.Widgets {
if (txt [pos] == one)
sames++;
- else if (txt [pos] == two)
- {
+ else if (txt [pos] == two)
+ {
if (sames == 0)
- return pos;
- sames--;
- }
+ return pos;
+ sames--;
+ }
}
return -1;
@@ -488,13 +488,13 @@ namespace FSpot.Widgets {
}
public class LogicEntryCompletion : EntryCompletion {
- private Entry entry;
-
- public bool Completing { get; private set; }
-
+ private Entry entry;
+
+ public bool Completing { get; private set; }
+
public LogicEntryCompletion (Entry entry, TreeModel tree_model)
- {
- Completing = false;
+ {
+ Completing = false;
this.entry = entry;
Model = new DependentListStore(tree_model);
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
index 0324fe2..5dc9145 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreeModel.cs
@@ -27,16 +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 FSpot.Core;
-using FSpot.Database;
-
-using Gtk;
-
-using Hyena;
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Database;
+
+using Gtk;
+
+using Hyena;
using Hyena.Data.Sqlite;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
index f26e92c..0542ac4 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreePage.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 FSpot.Extensions;
-
-using Gtk;
-
+//
+
+using FSpot.Extensions;
+
+using Gtk;
+
using Mono.Unix;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs b/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
index e388210..523f010 100644
--- a/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/FolderTreeView.cs
@@ -27,15 +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 FSpot.Utils;
-
-using Gtk;
-
-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 18a5dc9..76de59c 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ImageInfo.cs
@@ -27,18 +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 FSpot.Imaging;
-using FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
+//
+
+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/InfoBox.cs b/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
index b79f897..75348bc 100644
--- a/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/InfoBox.cs
@@ -29,20 +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 System;
-using System.Collections.Generic;
-using Cairo;
-using FSpot.Core;
-using FSpot.Imaging;
-using FSpot.Utils;
-
-using Gtk;
-
-using Mono.Unix;
-
-using GFile = GLib.File;
+//
+
+using System;
+using System.Collections.Generic;
+using Cairo;
+using FSpot.Core;
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Gtk;
+
+using Mono.Unix;
+
+using GFile = GLib.File;
using GFileInfo = GLib.FileInfo;
// FIXME TODO: We want to use something like EClippedLabel here throughout so it handles small sizes
@@ -383,10 +383,10 @@ namespace FSpot.Widgets
first.Time.ToShortDateString (),
first.Time.ToShortTimeString (),
last.Time.ToShortTimeString ());
- }
+ }
return String.Format (Catalog.GetString ("Between {0} \nand {1}"),
first.Time.ToShortDateString (),
- last.Time.ToShortDateString ());
+ last.Time.ToShortDateString ());
});
AddLabelEntry ("size", Catalog.GetString ("Size"), Catalog.GetString ("Show Size"),
@@ -399,8 +399,8 @@ namespace FSpot.Widgets
}
if (width != 0 && height != 0)
- return String.Format ("{0}x{1}", width, height);
- return Catalog.GetString ("(Unknown)");
+ return String.Format ("{0}x{1}", width, height);
+ return Catalog.GetString ("(Unknown)");
}, null);
AddLabelEntry ("exposure", Catalog.GetString ("Exposure"), Catalog.GetString ("Show Exposure"),
@@ -450,8 +450,8 @@ namespace FSpot.Widgets
var focal_length = metadata.ImageTag.FocalLength;
if (focal_length == null)
- return Catalog.GetString ("(Unknown)");
- return String.Format ("{0} mm", focal_length.Value);
+ return Catalog.GetString ("(Unknown)");
+ return String.Format ("{0} mm", focal_length.Value);
}, null);
AddLabelEntry ("camera", Catalog.GetString ("Camera"), Catalog.GetString ("Show Camera"), false,
@@ -720,18 +720,18 @@ namespace FSpot.Widgets
return String.Format ("{0}/{1}_visible/{2}/{3}", PREF_PREFIX, parent, item, context);
}
- private bool VisibilityForContext (ViewContext context, string item, bool default_value)
- {
- string visible = Preferences.Get<string> (PrefKeyForContext (context, item));
- return visible == null ? default_value : visible == "1";
- }
-
- private bool VisibilityForContext (ViewContext context, string parent, string item, bool default_value)
- {
- string visible = Preferences.Get<string> (PrefKeyForContext (context, parent, item));
- return visible == null ? default_value : visible == "1";
- }
-
+ private bool VisibilityForContext (ViewContext context, string item, bool default_value)
+ {
+ string visible = Preferences.Get<string> (PrefKeyForContext (context, item));
+ return visible == null ? default_value : visible == "1";
+ }
+
+ private bool VisibilityForContext (ViewContext context, string parent, string item, bool default_value)
+ {
+ string visible = Preferences.Get<string> (PrefKeyForContext (context, parent, item));
+ return visible == null ? default_value : visible == "1";
+ }
+
private void SetVisibilityForContext (ViewContext context, string item, bool visible)
{
Preferences.Set (PrefKeyForContext (context, item), visible ? "1" : "0");
diff --git a/src/Clients/MainApp/FSpot.Widgets/Loupe.cs b/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
index 01dba05..f9cde2f 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Loupe.cs
@@ -25,19 +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 Cairo;
-
-using FSpot.Core;
-using FSpot.Gui;
-using FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Core;
+using FSpot.Gui;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Hyena;
namespace FSpot.Widgets {
@@ -298,17 +298,17 @@ namespace FSpot.Widgets {
CairoHelper.SetSourcePixbuf (g, source, -source.Width / 2, -source.Height / 2);
g.Arc (0, 0, radius, 0, 2 * Math.PI);
- g.Fill ();
-
- if (overlay == null)
- return;
-
+ g.Fill ();
+
+ if (overlay == null)
+ return;
+
CairoHelper.SetSourcePixbuf (g, overlay, -overlay.Width / 2, -overlay.Height / 2);
g.Arc (0, 0, radius, angle, angle + Math.PI);
g.ClosePath ();
g.FillPreserve ();
g.Source = new SolidPattern (new Cairo.Color (1.0, 1.0, 1.0, 1.0));
- g.Stroke ();
+ g.Stroke ();
}
protected override bool OnExposeEvent (Gdk.EventExpose args)
@@ -351,8 +351,8 @@ namespace FSpot.Widgets {
if (!rotate) {
return MoveWindow ();
- }
-
+ }
+
Gdk.Point initial = start_root;
Gdk.Point hot = start_hot;
Gdk.Point win = Gdk.Point.Zero;
@@ -372,7 +372,7 @@ namespace FSpot.Widgets {
double angle = Vector.AngleBetween (v1, v2);
Angle = start_angle + angle;
- return false;
+ return false;
}
private bool MoveWindow ()
@@ -449,8 +449,8 @@ namespace FSpot.Widgets {
case Gdk.Key.v:
App.Instance.Organizer.HideLoupe ();
args.RetVal = true;
- break;
- }
+ break;
+ }
}
protected override void OnDestroyed ()
diff --git a/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs b/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
index c182731..b3cda8b 100644
--- a/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/MetadataDisplay.cs
@@ -25,17 +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 FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Utils;
-
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Utils;
+
+using Gtk;
+
using Mono.Unix;
namespace FSpot.Widgets {
@@ -63,17 +63,17 @@ namespace FSpot.Widgets {
VBox main_vbox;
Label metadata_message;
- State display;
-
- public MetadataDisplayPage Page { get; set; }
-
+ State display;
+
+ public MetadataDisplayPage Page { get; set; }
+
// stores list of the expanded expanders
List<string> open_list;
ListStore extended_metadata;
- bool up_to_date = false;
-
+ bool up_to_date = false;
+
new enum State {
metadata,
message
diff --git a/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs b/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
index a0ad833..8b21c45 100644
--- a/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/PhotoImageView.cs
@@ -29,50 +29,50 @@
// 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.Loaders;
-
-using Gdk;
-
-using Hyena;
-
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Loaders;
+
+using Gdk;
+
+using Hyena;
+
using TagLib.Image;
namespace FSpot.Widgets {
public class PhotoImageView : ImageView {
#region public API
- protected PhotoImageView (IntPtr raw) : base (raw)
- {
- ShowProgress = true;
- }
-
+ protected PhotoImageView (IntPtr raw) : base (raw)
+ {
+ ShowProgress = true;
+ }
+
public PhotoImageView (IBrowsableCollection query) : this (new BrowsablePointer (query, -1))
{
}
- public PhotoImageView (BrowsablePointer item)
- {
- ShowProgress = true;
+ public PhotoImageView (BrowsablePointer item)
+ {
+ ShowProgress = true;
Accelerometer.OrientationChanged += HandleOrientationChanged;
Preferences.SettingChanged += OnPreferencesChanged;
this.Item = item;
item.Changed += HandlePhotoItemChanged;
- }
-
- public BrowsablePointer Item { get; protected set; }
-
+ }
+
+ public BrowsablePointer Item { get; protected set; }
+
public IBrowsableCollection Query {
get { return Item.Collection; }
- }
-
- public Loupe Loupe { get; protected set; }
-
+ }
+
+ public Loupe Loupe { get; protected set; }
+
public Gdk.Pixbuf CompletePixbuf ()
{
//FIXME: this should be an async call
@@ -277,17 +277,17 @@ namespace FSpot.Widgets {
if (prev != this.Pixbuf && prev != null)
prev.Dispose ();
}
-#endregion
-
+#endregion
+
protected Loupe sharpener;
void HandleOrientationChanged (object sender, EventArgs e)
{
Reload ();
- }
-
- private bool ShowProgress { get; set; }
-
+ }
+
+ private bool ShowProgress { get; set; }
+
void LoadErrorImage (System.Exception e)
{
// FIXME we should check the exception type and do something
diff --git a/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs b/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
index 4265081..18147f1 100644
--- a/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/PreviewPopup.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 Cairo;
-
-using FSpot.Core;
-using FSpot.Gui;
-using FSpot.Utils;
-using FSpot.Widgets;
-
+//
+
+using System;
+
+using Cairo;
+
+using FSpot.Core;
+using FSpot.Gui;
+using FSpot.Utils;
+using FSpot.Widgets;
+
using Gdk;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot.Widgets/QueryView.cs b/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
index 1771fcf..1924e73 100644
--- a/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/QueryView.cs
@@ -33,11 +33,11 @@
// QueryView.cs
//
// Copyright (C) 2004 Novell, Inc.
-//
-
-using FSpot.Core;
-
-using Gdk;
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs b/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
index 404f95f..976d5ec 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SelectionCollectionGridView.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.Collections.Generic;
-
-using FSpot.Core;
-
-using Gdk;
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
@@ -211,8 +211,8 @@ namespace FSpot.Widgets
if (evnt.Button == 3) {
ContextMenu (evnt, cell_num);
return true;
- }
- return false;
+ }
+ return false;
}
return false;
diff --git a/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs b/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
index b34443f..9483520 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Sharpener.cs
@@ -27,16 +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 FSpot.UI.Dialog;
-
-using Gtk;
-
-using Hyena.Widgets;
-
+//
+
+using System;
+
+using FSpot.UI.Dialog;
+
+using Gtk;
+
+using Hyena.Widgets;
+
using Mono.Unix;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs b/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
index 8386b7e..1082338 100644
--- a/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/Sidebar.cs
@@ -25,17 +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 FSpot.Core;
-using FSpot.Extensions;
-
-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;
namespace FSpot.Widgets
@@ -60,7 +60,7 @@ namespace FSpot.Widgets
}
public string PageForContext (ViewContext context) {
- string name = Preferences.Get<string> (PrefKeyForContext (context)) ?? DefaultForContext (context);
+ string name = Preferences.Get<string> (PrefKeyForContext (context)) ?? DefaultForContext (context);
return name;
}
@@ -92,9 +92,9 @@ namespace FSpot.Widgets
public event IBrowsableCollectionChangedHandler SelectionChanged;
public event IBrowsableCollectionItemsChangedHandler SelectionItemsChanged;
- // The photos selected.
- public IBrowsableCollection Selection { get; private set; }
-
+ // The photos selected.
+ public IBrowsableCollection Selection { get; private set; }
+
public event EventHandler ContextChanged;
private ViewContext view_context = ViewContext.Unknown;
@@ -109,7 +109,7 @@ namespace FSpot.Widgets
private readonly ISidebarContextSwitchStrategy ContextSwitchStrategy;
- public Sidebar ()
+ public Sidebar ()
{
ContextSwitchStrategy = new MRUSidebarContextSwitchStrategy ();
ContextChanged += HandleContextChanged;
diff --git a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
index cd11570..d8a5f16 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
@@ -25,21 +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 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 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;
namespace FSpot.Widgets
@@ -55,7 +55,7 @@ namespace FSpot.Widgets
{
}
- public SlideShow (BrowsablePointer item, uint interval_ms, bool init)
+ public SlideShow (BrowsablePointer item, uint interval_ms, bool init)
{
this.item = item;
DoubleBuffered = false;
diff --git a/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs b/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
index e5e3c56..d615d67 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SoftFocus.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SoftFocus.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 Cairo;
-
-using Pinta.Core;
-using Point = Gdk.Point;
-
+//
+
+using System;
+
+using Cairo;
+
+using Pinta.Core;
+using Point = Gdk.Point;
+
namespace FSpot.Widgets {
public class SoftFocus : IDisposable {
ImageInfo info;
double radius;
- double amount;
+ double amount;
ImageInfo blur;
Pattern mask;
@@ -53,10 +53,10 @@ namespace FSpot.Widgets {
Center.Y = info.Bounds.Height / 2;
Amount = 3;
Radius = .5;
- }
-
- public Point Center { get; set; }
-
+ }
+
+ public Point Center { get; set; }
+
public double Amount {
get { return amount; }
set {
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs b/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
index 13322c7..a805889 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagEntry.cs
@@ -30,12 +30,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.Linq;
-using System.Text;
-
+//
+
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
using FSpot.Core;
namespace FSpot.Widgets
@@ -49,14 +49,14 @@ namespace FSpot.Widgets
public event TagsAttachedHandler TagsAttached;
public event TagsRemovedHandler TagsRemoved;
- TagStore tag_store;
-
+ TagStore tag_store;
+
protected TagEntry (System.IntPtr raw)
{
Raw = raw;
}
- public TagEntry (TagStore tag_store, bool update_on_focus_out = true)
+ public TagEntry (TagStore tag_store, bool update_on_focus_out = true)
{
this.tag_store = tag_store;
this.KeyPressEvent += HandleKeyPressEvent;
@@ -127,8 +127,8 @@ namespace FSpot.Widgets
public string [] GetTypedTagNames ()
{
- string [] tagnames = Text.Split (new char [] {','});
-
+ string [] tagnames = Text.Split (new char [] {','});
+
return tagnames.Select(t => t.Trim()).Where(s => s.Length > 0).ToArray();
}
@@ -289,11 +289,11 @@ namespace FSpot.Widgets
TagsRemoved (this, remove_tags.ToArray ());
}
- private static bool IsTagInList (IEnumerable<string> tags, string tag)
- {
- return tags.Any(t => t == tag);
- }
-
+ private static bool IsTagInList (IEnumerable<string> tags, string tag)
+ {
+ return tags.Any(t => t == tag);
+ }
+
private void HandleFocusOutEvent (object o, Gtk.FocusOutEventArgs args)
{
Update ();
diff --git a/src/Clients/MainApp/FSpot.Widgets/TagView.cs b/src/Clients/MainApp/FSpot.Widgets/TagView.cs
index 471104e..14633a2 100644
--- a/src/Clients/MainApp/FSpot.Widgets/TagView.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/TagView.cs
@@ -29,13 +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 FSpot.Core;
-
-using Gdk;
+//
+
+using System;
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
namespace FSpot.Widgets {
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
index 9d70414..9fe496a 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailCaptionRenderer.cs
@@ -25,11 +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 Gdk;
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
index 5934d8d..6ec45e8 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDateCaptionRenderer.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.Collections.Generic;
-
-using FSpot.Core;
-
-using Gdk;
-using Gtk;
-
+//
+
+using System.Collections.Generic;
+
+using FSpot.Core;
+
+using Gdk;
+using Gtk;
+
using Hyena.Gui;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
index 6249838..1a87378 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailDecorationRenderer.cs
@@ -25,11 +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 Gdk;
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
index 8d99f8a..b0360ae 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailRatingDecorationRenderer.cs
@@ -25,11 +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 Gdk;
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
index 1dd9a83..36b319d 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTagsCaptionRenderer.cs
@@ -25,11 +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 Gdk;
+//
+
+using FSpot.Core;
+
+using Gdk;
using Gtk;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
index b49f9ed..7cd45a2 100644
--- a/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/ThumbnailTextCaptionRenderer.cs
@@ -25,13 +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.Core;
-
-using Gdk;
-using Gtk;
-
+//
+
+using FSpot.Core;
+
+using Gdk;
+using Gtk;
+
using Hyena.Gui;
namespace FSpot.Widgets
diff --git a/src/Clients/MainApp/FSpot/FullScreenView.cs b/src/Clients/MainApp/FSpot/FullScreenView.cs
index c54ca85..dba79a7 100644
--- a/src/Clients/MainApp/FSpot/FullScreenView.cs
+++ b/src/Clients/MainApp/FSpot/FullScreenView.cs
@@ -45,7 +45,7 @@ using Mono.Unix;
namespace FSpot {
[Binding(Gdk.Key.Escape, "Quit")]
public class FullScreenView : Gtk.Window {
- private ScrolledView scroll;
+ private ScrolledView scroll;
private Notebook notebook;
private ControlOverlay controls;
private SlideShow display;
@@ -308,10 +308,10 @@ namespace FSpot {
controls.Visibility = ControlOverlay.VisibilityType.Partial;
scroll.ShowControls ();
}
- }
-
- public PhotoImageView View { get; private set; }
-
+ }
+
+ public PhotoImageView View { get; private set; }
+
private void HandleButtonPressEvent (object sender, Gtk.ButtonPressEventArgs args)
{
if (args.Event.Type == Gdk.EventType.ButtonPress
diff --git a/src/Clients/MainApp/FSpot/GroupSelector.cs b/src/Clients/MainApp/FSpot/GroupSelector.cs
index 1cfc4b1..2498f28 100644
--- a/src/Clients/MainApp/FSpot/GroupSelector.cs
+++ b/src/Clients/MainApp/FSpot/GroupSelector.cs
@@ -295,7 +295,7 @@ namespace FSpot {
private bool BoxXHit (double x, out int position)
{
x -= BoxX (0);
- position = (int) (x / BoxWidth);
+ position = (int) (x / BoxWidth);
bool result = true;
if (position < 0) {
@@ -304,7 +304,7 @@ namespace FSpot {
} else if (position >= box_counts.Length) {
position = box_counts.Length -1;
result = false;
- }
+ }
return result;
}
@@ -592,9 +592,9 @@ namespace FSpot {
selector.GdkWindow.InvalidateRect (now, false);
}
}
- get {
- return Dragging ? drag_offset : 0;
- }
+ get {
+ return Dragging ? drag_offset : 0;
+ }
}
public virtual void StartDrag (double x, double y, uint time)
@@ -617,11 +617,11 @@ namespace FSpot {
return true;
}
- protected bool PositionValid (int position)
- {
- return position >= 0 && position <= selector.box_counts.Length - 1;
- }
-
+ protected bool PositionValid (int position)
+ {
+ return position >= 0 && position <= selector.box_counts.Length - 1;
+ }
+
public virtual void UpdateDrag (double x, double y)
{
Rectangle bounds = Bounds ();
@@ -705,10 +705,10 @@ namespace FSpot {
if (update)
PositionChanged ();
- }
-
- public int Position { get; private set; }
-
+ }
+
+ public int Position { get; private set; }
+
public abstract void Draw (Rectangle area);
public abstract void PositionChanged ();
@@ -1169,6 +1169,6 @@ namespace FSpot {
Mode = RangeType.Min;
UpdateButtons ();
- }
+ }
}
}
diff --git a/src/Clients/MainApp/FSpot/JobStore.cs b/src/Clients/MainApp/FSpot/JobStore.cs
index 79c02a0..f8fa1f3 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;
-
-using Banshee.Kernel;
-
-using FSpot.Core;
-using FSpot.Database;
-using FSpot.Jobs;
-
-using Hyena;
+//
+
+using System;
+
+using Banshee.Kernel;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Jobs;
+
+using Hyena;
using Hyena.Data.Sqlite;
namespace FSpot {
@@ -75,12 +75,12 @@ namespace FSpot {
}
}
- public void Run ()
- {
- Status = JobStatus.Running;
- Status = Execute () ? JobStatus.Finished : JobStatus.Failed;
- }
-
+ public void Run ()
+ {
+ Status = JobStatus.Running;
+ Status = Execute () ? JobStatus.Finished : JobStatus.Failed;
+ }
+
protected abstract bool Execute ();
}
diff --git a/src/Clients/MainApp/FSpot/Literal.cs b/src/Clients/MainApp/FSpot/Literal.cs
index d678eef..136c77a 100644
--- a/src/Clients/MainApp/FSpot/Literal.cs
+++ b/src/Clients/MainApp/FSpot/Literal.cs
@@ -32,17 +32,17 @@
// 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.Generic;
-using System.Text;
-
-using FSpot.Core;
-
-using Gdk;
-using Gtk;
-
+// 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;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/MainWindow.cs b/src/Clients/MainApp/FSpot/MainWindow.cs
index 5668ca7..be55a41 100644
--- a/src/Clients/MainApp/FSpot/MainWindow.cs
+++ b/src/Clients/MainApp/FSpot/MainWindow.cs
@@ -565,19 +565,19 @@ namespace FSpot
}
private Photo CurrentPhoto {
- get
- {
- int active = ActiveIndex ();
- return active >= 0 ? query[active] as Photo : null;
- }
+ get
+ {
+ int active = ActiveIndex ();
+ return active >= 0 ? query[active] as Photo : null;
+ }
}
// Index into the PhotoQuery. If -1, no photo is selected or multiple photos are selected.
- private int ActiveIndex ()
- {
- return Selection.Count == 1 ? SelectedIds() [0] : PHOTO_IDX_NONE;
- }
-
+ private int ActiveIndex ()
+ {
+ return Selection.Count == 1 ? SelectedIds() [0] : PHOTO_IDX_NONE;
+ }
+
// Switching mode.
public enum ModeType {
IconView,
@@ -672,17 +672,17 @@ namespace FSpot
FSpot.Extensions.ExportMenuItemNode.SelectedImages = () => new PhotoList(SelectedPhotos());
}
- private void HandleDbItemsChanged (object sender, DbItemEventArgs<Photo> args)
- {
- foreach (Photo p in args.Items.Where(p => p != null).Where(p => write_metadata))
- {
- FSpot.Jobs.SyncMetadataJob.Create (Database.Jobs, p);
- }
-
+ private void HandleDbItemsChanged (object sender, DbItemEventArgs<Photo> args)
+ {
+ foreach (Photo p in args.Items.Where(p => p != null).Where(p => write_metadata))
+ {
+ FSpot.Jobs.SyncMetadataJob.Create (Database.Jobs, p);
+ }
+
if (args is PhotoEventArgs && (args as PhotoEventArgs).Changes.TimeChanged)
- query.RequestReload ();
- }
-
+ query.RequestReload ();
+ }
+
private void HandleTagsChanged (object sender, DbItemEventArgs<Tag> args)
{
icon_view.QueueDraw ();
@@ -1412,7 +1412,7 @@ namespace FSpot
public void HandleTagMenuActivate (object sender, EventArgs args)
{
// We have a Gtk.Action for UI menus, so the "Edit > Remove tag" item needs special treatment
- MenuItem parent = sender as MenuItem ?? uimanager.GetWidget("/ui/menubar1/edit2/remove_tag") as MenuItem;
+ MenuItem parent = sender as MenuItem ?? uimanager.GetWidget("/ui/menubar1/edit2/remove_tag") as MenuItem;
if (parent != null && parent.Submenu is PhotoTagMenu) {
PhotoTagMenu menu = (PhotoTagMenu) parent.Submenu;
@@ -2461,9 +2461,9 @@ namespace FSpot
if (photo != null)
JumpTo (query.IndexOf (photo));
- } catch (Exception ex)
- {
- Log.DebugException(ex);
+ } catch (Exception ex)
+ {
+ Log.DebugException(ex);
}
}
@@ -2982,7 +2982,7 @@ namespace FSpot
find_bar.Hide ();
}
- query_widget.ShowBar ();
+ query_widget.ShowBar ();
}
public void HideSidebar (object o, EventArgs args) {
diff --git a/src/Clients/MainApp/FSpot/MetaStore.cs b/src/Clients/MainApp/FSpot/MetaStore.cs
index b0d958d..b3ad4b8 100644
--- a/src/Clients/MainApp/FSpot/MetaStore.cs
+++ b/src/Clients/MainApp/FSpot/MetaStore.cs
@@ -32,8 +32,8 @@
using System;
using FSpot.Core;
-using FSpot.Database;
-
+using FSpot.Database;
+
using Hyena;
using Hyena.Data.Sqlite;
@@ -101,9 +101,9 @@ namespace FSpot {
try {
string id = Database.Query<string> ("SELECT id FROM tags WHERE name = 'Hidden'");
Create (hidden, id);
- } catch (Exception ex)
- {
- Log.DebugException(ex);
+ } catch (Exception ex)
+ {
+ Log.DebugException(ex);
}
}
diff --git a/src/Clients/MainApp/FSpot/Photo.cs b/src/Clients/MainApp/FSpot/Photo.cs
index 6c199b3..801df1e 100644
--- a/src/Clients/MainApp/FSpot/Photo.cs
+++ b/src/Clients/MainApp/FSpot/Photo.cs
@@ -222,7 +222,7 @@ namespace FSpot
return null;
PhotoVersion v = versions [version_id];
- return v != null ? v.Uri : null;
+ return v != null ? v.Uri : null;
}
public IPhotoVersion DefaultVersion {
@@ -273,8 +273,8 @@ namespace FSpot
}
return version;
- }
-
+ }
+
public void DeleteVersion (uint version_id, bool remove_original)
{
DeleteVersion (version_id, remove_original, false);
@@ -366,8 +366,8 @@ namespace FSpot
public uint CreateVersion (string name, uint base_version_id, bool create)
{
return CreateVersion (name, null, base_version_id, create);
- }
-
+ }
+
private uint CreateVersion (string name, string extension, uint base_version_id, bool create, bool is_protected = false)
{
extension = extension ?? VersionUri (base_version_id).GetExtension ();
@@ -586,24 +586,24 @@ namespace FSpot
#endregion
#region IComparable implementation
- public int CompareTo (object obj)
- {
+ public int CompareTo (object obj)
+ {
if (this.GetType () == obj.GetType ())
- return this.Compare((Photo)obj);
-
+ return this.Compare((Photo)obj);
+
if (obj is DateTime)
- return this.time.CompareTo ((DateTime)obj);
-
- throw new Exception ("Object must be of type Photo");
- }
-
- public int CompareTo (Photo photo)
- {
- int result = Id.CompareTo (photo.Id);
-
- return result == 0 ? 0 : this.Compare (photo);
- }
-
+ return this.time.CompareTo ((DateTime)obj);
+
+ throw new Exception ("Object must be of type Photo");
+ }
+
+ public int CompareTo (Photo photo)
+ {
+ int result = Id.CompareTo (photo.Id);
+
+ return result == 0 ? 0 : this.Compare (photo);
+ }
+
#endregion
}
}
diff --git a/src/Clients/MainApp/FSpot/PhotoPopup.cs b/src/Clients/MainApp/FSpot/PhotoPopup.cs
index 45b275d..db4e089 100644
--- a/src/Clients/MainApp/FSpot/PhotoPopup.cs
+++ b/src/Clients/MainApp/FSpot/PhotoPopup.cs
@@ -52,13 +52,13 @@ namespace FSpot
{
}
- public PhotoPopup (Widget parent)
+ public PhotoPopup (Widget parent)
{
foreach (MenuNode node in AddinManager.GetExtensionNodes ("/FSpot/Menus/PhotoPopup"))
Append (node.GetMenuItem (parent));
ShowAll ();
- }
-
+ }
+
public void Activate (Widget toplevel, Gdk.EventButton eb = null)
{
if (eb != null)
diff --git a/src/Clients/MainApp/FSpot/PhotoQuery.cs b/src/Clients/MainApp/FSpot/PhotoQuery.cs
index c8626c3..b592280 100644
--- a/src/Clients/MainApp/FSpot/PhotoQuery.cs
+++ b/src/Clients/MainApp/FSpot/PhotoQuery.cs
@@ -84,7 +84,7 @@ namespace FSpot {
}
}
- PhotoCache cache;
+ PhotoCache cache;
private Term terms;
static int query_count = 0;
@@ -141,14 +141,14 @@ namespace FSpot {
[Obsolete ("DO NOT USE Items on PhotoQuery")]
public IPhoto [] Items {
get { throw new NotImplementedException (); }
- }
-
- public PhotoStore Store { get; private set; }
-
+ }
+
+ public PhotoStore Store { get; private set; }
+
//Query Conditions
private Dictionary<Type, IQueryCondition> conditions;
private Dictionary<Type, IQueryCondition> Conditions {
- get { return conditions ?? (conditions = new Dictionary<Type, IQueryCondition>()); }
+ get { return conditions ?? (conditions = new Dictionary<Type, IQueryCondition>()); }
}
internal bool SetCondition (IQueryCondition condition)
diff --git a/src/Clients/MainApp/FSpot/PhotoStore.cs b/src/Clients/MainApp/FSpot/PhotoStore.cs
index 8830cc6..5ff99ae 100644
--- a/src/Clients/MainApp/FSpot/PhotoStore.cs
+++ b/src/Clients/MainApp/FSpot/PhotoStore.cs
@@ -31,20 +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 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 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;
namespace FSpot {
@@ -407,10 +407,10 @@ namespace FSpot {
EmitRemoved (items);
List<string> query_builder = new List<string> (items.Length);
- foreach (Photo t in items)
- {
+ foreach (Photo t in items)
+ {
query_builder.Add (String.Format ("{0}", t.Id));
- RemoveFromCache (t);
+ RemoveFromCache (t);
}
String id_list = String.Join ("','", query_builder.ToArray ());
diff --git a/src/Clients/MainApp/FSpot/PhotoVersion.cs b/src/Clients/MainApp/FSpot/PhotoVersion.cs
index 20eb22b..3ec8d4f 100644
--- a/src/Clients/MainApp/FSpot/PhotoVersion.cs
+++ b/src/Clients/MainApp/FSpot/PhotoVersion.cs
@@ -25,10 +25,10 @@
// 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.Core;
+
using Hyena;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/PhotoView.cs b/src/Clients/MainApp/FSpot/PhotoView.cs
index a2a8066..77da723 100644
--- a/src/Clients/MainApp/FSpot/PhotoView.cs
+++ b/src/Clients/MainApp/FSpot/PhotoView.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.Utils;
-using FSpot.Widgets;
-
-using Gdk;
-using Gtk;
-
+//
+
+using System;
+
+using FSpot.Core;
+using FSpot.Utils;
+using FSpot.Widgets;
+
+using Gdk;
+using Gtk;
+
using Mono.Unix;
namespace FSpot {
@@ -157,13 +157,13 @@ namespace FSpot {
private void HandleButtonPressEvent (object sender, ButtonPressEventArgs args)
{
if (args.Event.Type == EventType.TwoButtonPress && args.Event.Button == 1 && DoubleClicked != null)
- DoubleClicked (this, null);
-
- if (args.Event.Type != EventType.ButtonPress || args.Event.Button != 3)
- return;
-
+ DoubleClicked (this, null);
+
+ if (args.Event.Type != EventType.ButtonPress || args.Event.Button != 3)
+ return;
+
PhotoPopup popup = new PhotoPopup ();
- popup.Activate (this.Toplevel, args.Event);
+ popup.Activate (this.Toplevel, args.Event);
}
protected override bool OnPopupMenu ()
@@ -253,8 +253,8 @@ namespace FSpot {
PlaceFilmstrip ((Orientation) Preferences.Get<int> (key));
break;
}
- }
-
+ }
+
public void PlaceFilmstrip (Orientation pos, bool force = false)
{
if (!force && filmstrip.Orientation == pos)
@@ -291,7 +291,7 @@ namespace FSpot {
set { filmstrip.Visible = value; }
}
- public PhotoView (IBrowsableCollection query)
+ public PhotoView (IBrowsableCollection query)
{
Query = query;
diff --git a/src/Clients/MainApp/FSpot/PixbufCache.cs b/src/Clients/MainApp/FSpot/PixbufCache.cs
index 01f4736..54bf0e3 100644
--- a/src/Clients/MainApp/FSpot/PixbufCache.cs
+++ b/src/Clients/MainApp/FSpot/PixbufCache.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.Collections.Generic;
-using System.Threading;
-
-using FSpot.Utils;
-
+//
+
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Utils;
+
using Hyena;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/Preferences.cs b/src/Clients/MainApp/FSpot/Preferences.cs
index c1dee47..bf5c79d 100644
--- a/src/Clients/MainApp/FSpot/Preferences.cs
+++ b/src/Clients/MainApp/FSpot/Preferences.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.Collections.Generic;
-
-using FSpot.Core;
-using FSpot.Platform;
-
-using Hyena;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Platform;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/PrintOperation.cs b/src/Clients/MainApp/FSpot/PrintOperation.cs
index 8880d24..51d70b8 100644
--- a/src/Clients/MainApp/FSpot/PrintOperation.cs
+++ b/src/Clients/MainApp/FSpot/PrintOperation.cs
@@ -25,19 +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.Runtime.InteropServices;
-
-using Cairo;
-
-using FSpot.Core;
-using FSpot.Imaging;
-using FSpot.Widgets;
-
-using Hyena;
-
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+using Cairo;
+
+using FSpot.Core;
+using FSpot.Imaging;
+using FSpot.Widgets;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/ProgressItem.cs b/src/Clients/MainApp/FSpot/ProgressItem.cs
index 25fba74..fb7b4e5 100644
--- a/src/Clients/MainApp/FSpot/ProgressItem.cs
+++ b/src/Clients/MainApp/FSpot/ProgressItem.cs
@@ -28,7 +28,7 @@
//
namespace FSpot {
- public class ProgressItem {
+ public class ProgressItem {
public delegate void ChangedHandler (ProgressItem item);
public event ChangedHandler Changed;
diff --git a/src/Clients/MainApp/FSpot/QueryWidget.cs b/src/Clients/MainApp/FSpot/QueryWidget.cs
index 92a487c..941435c 100644
--- a/src/Clients/MainApp/FSpot/QueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/QueryWidget.cs
@@ -31,19 +31,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 FSpot.Core;
-using FSpot.Database;
-using FSpot.Widgets;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Database;
+using FSpot.Widgets;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
diff --git a/src/Clients/MainApp/FSpot/RollStore.cs b/src/Clients/MainApp/FSpot/RollStore.cs
index f2c6c3a..cf2d898 100644
--- a/src/Clients/MainApp/FSpot/RollStore.cs
+++ b/src/Clients/MainApp/FSpot/RollStore.cs
@@ -1,43 +1,43 @@
-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 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
@@ -111,8 +111,8 @@ namespace FSpot
reader.Dispose ();
}
return number_of_photos;
- }
-
+ }
+
public Roll [] GetRolls (int limit = -1)
{
List<Roll> rolls = new List<Roll> ();
diff --git a/src/Clients/MainApp/FSpot/RotateCommand.cs b/src/Clients/MainApp/FSpot/RotateCommand.cs
index 4bc412b..f841675 100644
--- a/src/Clients/MainApp/FSpot/RotateCommand.cs
+++ b/src/Clients/MainApp/FSpot/RotateCommand.cs
@@ -145,11 +145,11 @@ namespace FSpot {
op = new RotateOperation (Items [Index], direction);
if (op.Step ())
- return true;
+ return true;
Index++;
- op = null;
-
+ op = null;
+
return (Index < Items.Length);
}
}
diff --git a/src/Clients/MainApp/FSpot/SelectionDataExtensions.cs b/src/Clients/MainApp/FSpot/SelectionDataExtensions.cs
index ad39e72..8f42e1c 100644
--- a/src/Clients/MainApp/FSpot/SelectionDataExtensions.cs
+++ b/src/Clients/MainApp/FSpot/SelectionDataExtensions.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.Linq;
-using System.Text;
-
-using FSpot.Core;
-using FSpot.Utils;
-
-using Gdk;
+//
+
+using System;
+using System.Linq;
+using System.Text;
+
+using FSpot.Core;
+using FSpot.Utils;
+
+using Gdk;
using Gtk;
namespace FSpot
diff --git a/src/Clients/MainApp/FSpot/SendEmail.cs b/src/Clients/MainApp/FSpot/SendEmail.cs
index 6f88298..3e90da2 100644
--- a/src/Clients/MainApp/FSpot/SendEmail.cs
+++ b/src/Clients/MainApp/FSpot/SendEmail.cs
@@ -31,20 +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 System;
-
-using FSpot.Core;
-using FSpot.Filters;
-using FSpot.UI.Dialog;
-using FSpot.Widgets;
-
-using Gtk;
-
-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
@@ -99,7 +99,7 @@ namespace FSpot
case 2 : small_size.Active = true; break;
case 3 : medium_size.Active = true; break;
case 4 : large_size.Active = true; break;
- case 5 : x_large_size.Active = true; break;
+ case 5 : x_large_size.Active = true; break;
}
diff --git a/src/Clients/MainApp/FSpot/SingleView.cs b/src/Clients/MainApp/FSpot/SingleView.cs
index b62c0f3..55860d8 100644
--- a/src/Clients/MainApp/FSpot/SingleView.cs
+++ b/src/Clients/MainApp/FSpot/SingleView.cs
@@ -29,24 +29,24 @@
// 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.Extensions;
-using FSpot.Platform;
-using FSpot.UI.Dialog;
-using FSpot.Utils;
-using FSpot.Widgets;
-
-using Gdk;
-using Gtk;
-
-using Hyena;
-
-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;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/TagQueryWidget.cs b/src/Clients/MainApp/FSpot/TagQueryWidget.cs
index bbd8098..3f8b77e 100644
--- a/src/Clients/MainApp/FSpot/TagQueryWidget.cs
+++ b/src/Clients/MainApp/FSpot/TagQueryWidget.cs
@@ -27,18 +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 FSpot.Core;
-using FSpot.Query;
-using FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+using FSpot.Query;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Mono.Unix;
namespace FSpot
@@ -141,8 +141,8 @@ namespace FSpot
if (LogicWidget.Root == null || LogicWidget.Root.SubTerms.Count == 0) {
//Console.WriteLine ("root is null or has no terms");
return null;
- }
-
+ }
+
//Console.WriteLine ("root is not null and has terms");
Gtk.Menu m = new Gtk.Menu ();
@@ -167,7 +167,7 @@ namespace FSpot
if (sensitive_items == 0)
all_item.Sensitive = false;
- return m;
+ return m;
}
private static bool AppendTerm (List<string> parts, Term term, Tag single_tag)
@@ -208,15 +208,15 @@ namespace FSpot
}
public class GrabHandle : DrawingArea {
- public GrabHandle (int w, int h)
+ public GrabHandle (int w, int h)
{
Size (w, h);
Orientation = Gtk.Orientation.Horizontal;
Show ();
- }
-
- public Orientation Orientation { get; set; }
-
+ }
+
+ public Orientation Orientation { get; set; }
+
protected override bool OnExposeEvent (Gdk.EventExpose evnt)
{
bool ret = base.OnExposeEvent(evnt);
@@ -270,7 +270,7 @@ namespace FSpot
DragDropTargets.TagQueryEntry
};
- public LogicWidget (PhotoQuery query, TagStore tag_store)
+ public LogicWidget (PhotoQuery query, TagStore tag_store)
{
//SetFlag (WidgetFlags.NoWindow);
this.query = query;
diff --git a/src/Clients/MainApp/FSpot/TagSelectionWidget.cs b/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
index f86ead7..4f35b2d 100644
--- a/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
+++ b/src/Clients/MainApp/FSpot/TagSelectionWidget.cs
@@ -27,21 +27,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 FSpot.Core;
-using FSpot.Database;
-using FSpot.Utils;
-using FSpot.Widgets;
-
-using Gdk;
-using Gtk;
-
-using Hyena.Widgets;
-
+//
+
+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;
@@ -265,7 +265,7 @@ namespace FSpot {
Model.GetValue (parent, IdColumn, ref value);
iter = parent;
- return tag.Id == (uint) value;
+ return tag.Id == (uint) value;
}
// Copy a branch of the tree to a new parent
diff --git a/src/Clients/MainApp/FSpot/TagStore.cs b/src/Clients/MainApp/FSpot/TagStore.cs
index ba65bb0..805b332 100644
--- a/src/Clients/MainApp/FSpot/TagStore.cs
+++ b/src/Clients/MainApp/FSpot/TagStore.cs
@@ -29,20 +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 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 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;
namespace FSpot {
@@ -67,14 +67,14 @@ namespace FSpot {
return Compare (t1, t2);
}
- public int Compare (Tag t1, Tag t2)
- {
+ public int Compare (Tag t1, Tag t2)
+ {
if (t1.IsAncestorOf (t2))
- return 1;
+ return 1;
if (t2.IsAncestorOf (t1))
- return -1;
- return 0;
- }
+ return -1;
+ return 0;
+ }
}
public class TagStore : DbStore<Tag> {
@@ -310,11 +310,11 @@ namespace FSpot {
return new_category;
}
- public override Tag Get (uint id)
- {
- return id == 0 ? RootCategory : LookupInCache (id);
- }
-
+ public override Tag Get (uint id)
+ {
+ return id == 0 ? RootCategory : LookupInCache (id);
+ }
+
public override void Remove (Tag tag)
{
Category category = tag as Category;
diff --git a/src/Clients/MainApp/FSpot/Term.cs b/src/Clients/MainApp/FSpot/Term.cs
index 0775aba..869b722 100644
--- a/src/Clients/MainApp/FSpot/Term.cs
+++ b/src/Clients/MainApp/FSpot/Term.cs
@@ -32,18 +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.Generic;
-using System.Text;
-
-using FSpot.Core;
-
-using Gtk;
-
-using Hyena;
-
+// 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;
namespace FSpot
@@ -83,10 +83,10 @@ namespace FSpot
/// last Literal in term, else null
/// </value>
public Term Last {
- get
- {
- return SubTerms.Count > 0 ? SubTerms [SubTerms.Count - 1] : null;
- }
+ get
+ {
+ return SubTerms.Count > 0 ? SubTerms [SubTerms.Count - 1] : null;
+ }
}
public int Count {
@@ -148,8 +148,8 @@ namespace FSpot
else
subterm.Parent = this;
}
- }
-
+ }
+
public List<Term> FindByTag (Tag t, bool recursive = true)
{
List<Term> results = new List<Term> ();
@@ -312,12 +312,12 @@ else
if (AndTerm.Operators.Contains (op))
//Console.WriteLine ("AND!");
- return new AndTerm (parent, after);
+ return new AndTerm (parent, after);
if (OrTerm.Operators.Contains (op))
//Console.WriteLine ("OR!");
- return new OrTerm (parent, after);
-
+ return new OrTerm (parent, after);
+
Log.DebugFormat ("Do not have Term for operator {0}", op);
return null;
}
diff --git a/src/Clients/MainApp/FSpot/ThumbnailCache.cs b/src/Clients/MainApp/FSpot/ThumbnailCache.cs
index 43952a9..dde1336 100644
--- a/src/Clients/MainApp/FSpot/ThumbnailCache.cs
+++ b/src/Clients/MainApp/FSpot/ThumbnailCache.cs
@@ -30,15 +30,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.Utils;
-
-using Gdk;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Utils;
+
+using Gdk;
+
using Hyena;
namespace FSpot
@@ -60,8 +60,8 @@ namespace FSpot
private const int DEFAULT_CACHE_SIZE = 2;
private int max_count;
private List<Thumbnail> pixbuf_mru;
- private Dictionary<SafeUri,Thumbnail> pixbuf_hash;
-
+ private Dictionary<SafeUri,Thumbnail> pixbuf_hash;
+
#endregion
#region Public API
@@ -70,15 +70,15 @@ namespace FSpot
this.max_count = max_count;
pixbuf_mru = new List<Thumbnail> (max_count);
pixbuf_hash = new Dictionary<SafeUri, Thumbnail> ();
- }
-
- static ThumbnailCache()
- {
- Default = new ThumbnailCache (DEFAULT_CACHE_SIZE);
- }
-
- public static ThumbnailCache Default { get; private set; }
-
+ }
+
+ static ThumbnailCache()
+ {
+ Default = new ThumbnailCache (DEFAULT_CACHE_SIZE);
+ }
+
+ public static ThumbnailCache Default { get; private set; }
+
public void AddThumbnail (SafeUri uri, Pixbuf pixbuf)
{
Thumbnail thumbnail = new Thumbnail ();
@@ -104,7 +104,7 @@ namespace FSpot
pixbuf_mru.Remove (item);
pixbuf_mru.Insert (0, item);
- return item.pixbuf == null ? null : item.pixbuf.ShallowCopy ();
+ return item.pixbuf == null ? null : item.pixbuf.ShallowCopy ();
}
public void RemoveThumbnailForUri (SafeUri uri)
diff --git a/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs b/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
index dcd5fae..17e43ad 100644
--- a/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
+++ b/src/Clients/MainApp/FSpot/ThumbnailGenerator.cs
@@ -29,12 +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 FSpot.Utils;
-
-using Hyena;
-
+//
+
+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 cf8e4d3..2fb5367 100644
--- a/src/Clients/MainApp/FSpot/TimeAdaptor.cs
+++ b/src/Clients/MainApp/FSpot/TimeAdaptor.cs
@@ -31,15 +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.Collections.Generic;
-using System.Threading;
-
-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 {
@@ -86,25 +86,25 @@ namespace FSpot {
DateTime start = DateFromIndex (item);
if ((start.Month == 12 && !order_ascending) || (start.Month == 1 && order_ascending))
- return start.Year.ToString ();
-
- return null;
+ return start.Year.ToString ();
+
+ return null;
}
- public override int Value (int item)
- {
+ public override int Value (int item)
+ {
if (order_ascending)
- return years [startyear + item/12][item % 12];
-
- return years [endyear - item/12][11 - item % 12];
- }
-
+ return years [startyear + item/12][item % 12];
+
+ return years [endyear - item/12][11 - item % 12];
+ }
+
public DateTime DateFromIndex (int item)
{
item = Math.Max (item, 0);
item = Math.Min (years.Count * 12 - 1, item);
- return order_ascending ? DateFromIndexAscending (item) : DateFromIndexDescending (item);
+ return order_ascending ? DateFromIndexAscending (item) : DateFromIndexDescending (item);
}
private DateTime DateFromIndexAscending (int item)
diff --git a/src/Clients/MainApp/FSpot/UriCollection.cs b/src/Clients/MainApp/FSpot/UriCollection.cs
index 45c3dc5..f7843ef 100644
--- a/src/Clients/MainApp/FSpot/UriCollection.cs
+++ b/src/Clients/MainApp/FSpot/UriCollection.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.Collections.Generic;
-using System.Xml;
-
-using FSpot.Core;
-using FSpot.Imaging;
-
+//
+
+using System.Collections.Generic;
+using System.Xml;
+
+using FSpot.Core;
+using FSpot.Imaging;
+
using Hyena;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs b/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
index d3a4213..9120a20 100644
--- a/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
+++ b/src/Clients/MainApp/FSpot/XScreenSaverSlide.cs
@@ -27,11 +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 System;
-
-using Gdk;
+//
+
+using System;
+
+using Gdk;
using Gtk;
namespace FSpot {
diff --git a/src/Clients/MainApp/FSpot/main.cs b/src/Clients/MainApp/FSpot/main.cs
index fb16380..eceb83a 100644
--- a/src/Clients/MainApp/FSpot/main.cs
+++ b/src/Clients/MainApp/FSpot/main.cs
@@ -31,22 +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 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 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;
namespace FSpot
@@ -299,9 +299,9 @@ namespace FSpot
GtkUtil.TryLoadIcon (FSpot.Core.Global.IconTheme, "f-spot", 32, (Gtk.IconLookupFlags)0),
GtkUtil.TryLoadIcon (FSpot.Core.Global.IconTheme, "f-spot", 48, (Gtk.IconLookupFlags)0)
};
- } catch (Exception ex)
- {
- Log.DebugException(ex);
+ } catch (Exception ex)
+ {
+ Log.DebugException(ex);
}
CleanRoomStartup.Startup (Startup);
diff --git a/src/Clients/MainApp/ImageLoaderThread.cs b/src/Clients/MainApp/ImageLoaderThread.cs
index 4368429..2ac34a7 100644
--- a/src/Clients/MainApp/ImageLoaderThread.cs
+++ b/src/Clients/MainApp/ImageLoaderThread.cs
@@ -29,18 +29,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.Collections;
-using System.Collections.Generic;
-using System.Threading;
-
-using FSpot.Imaging;
-using FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
+//
+
+using System.Collections;
+using System.Collections.Generic;
+using System.Threading;
+
+using FSpot.Imaging;
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
using Hyena;
public class ImageLoaderThread
@@ -63,10 +63,10 @@ public class ImageLoaderThread
private Pixbuf result;
public Pixbuf Result {
- get
- {
- return result == null ? null : result.ShallowCopy ();
- }
+ get
+ {
+ return result == null ? null : result.ShallowCopy ();
+ }
set { result = value; }
}
@@ -190,8 +190,8 @@ public class ImageLoaderThread
foreach (var thread in instances) {
thread.Cleanup ();
}
- }
-
+ }
+
public virtual void Request (SafeUri uri, int order, int width = 0, int height = 0)
{
lock (queue) {
diff --git a/src/Clients/MainApp/MainApp.csproj b/src/Clients/MainApp/MainApp.csproj
index 4dcaac7..5827f1a 100644
--- a/src/Clients/MainApp/MainApp.csproj
+++ b/src/Clients/MainApp/MainApp.csproj
@@ -1,425 +1,425 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{27EC05FB-0223-4B26-8157-E49AF81D0007}</ProjectGuid>
- <OutputType>Exe</OutputType>
- <RootNamespace>MainApp</RootNamespace>
- <AssemblyName>f-spot</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG ENABLE_TESTS</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <Externalconsole>true</Externalconsole>
- <EnvironmentVariables>
- <EnvironmentVariables>
- <Variable name="GTK_MODULES" value="" />
- </EnvironmentVariables>
- </EnvironmentVariables>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="DependentListStore.cs" />
- <Compile Include="FSpot\Accelerometer.cs" />
- <Compile Include="FSpot\App.cs" />
- <Compile Include="FSpot\BitConverter.cs" />
- <Compile Include="FSpot.ColorAdjustment\Adjustment.cs" />
- <Compile Include="FSpot.ColorAdjustment\AutoStretch.cs" />
- <Compile Include="FSpot.ColorAdjustment\Desaturate.cs" />
- <Compile Include="FSpot.ColorAdjustment\FullColorAdjustment.cs" />
- <Compile Include="FSpot.ColorAdjustment\SepiaTone.cs" />
- <Compile Include="FSpot\ColorManagement.cs" />
- <Compile Include="FSpot\ControlOverlay.cs" />
- <Compile Include="FSpot.Database\Db.cs" />
- <Compile Include="FSpot.Database\FSpotDatabaseConnection.cs" />
- <Compile Include="FSpot.Database\Tests\UpdaterTests.cs" />
- <Compile Include="FSpot.Database\Updater.cs" />
- <Compile Include="FSpot\DragDropTargets.cs" />
- <Compile Include="FSpot.Editors\AutoStretchEditor.cs" />
- <Compile Include="FSpot.Editors\ColorEditor.cs" />
- <Compile Include="FSpot.Editors\CropEditor.cs" />
- <Compile Include="FSpot.Editors\DesaturateEditor.cs" />
- <Compile Include="FSpot.Editors\Editor.cs" />
- <Compile Include="FSpot.Editors\RedEyeEditor.cs" />
- <Compile Include="FSpot.Editors\SepiaEditor.cs" />
- <Compile Include="FSpot.Editors\SoftFocusEditor.cs" />
- <Compile Include="FSpot.Editors\TiltEditor.cs" />
- <Compile Include="FSpot.Extensions\CommandMenuItemNode.cs" />
- <Compile Include="FSpot.Extensions\ComplexMenuItemNode.cs" />
- <Compile Include="FSpot.Extensions\ExportMenuItemNode.cs" />
- <Compile Include="FSpot.Extensions\ICommand.cs" />
- <Compile Include="FSpot.Extensions\IExporter.cs" />
- <Compile Include="FSpot.Extensions\IMenuGenerator.cs" />
- <Compile Include="FSpot.Extensions\IService.cs" />
- <Compile Include="FSpot.Extensions\MenuNode.cs" />
- <Compile Include="FSpot.Extensions\PhotoSelectionCondition.cs" />
- <Compile Include="FSpot.Extensions\PopupCommands.cs" />
- <Compile Include="FSpot.Extensions\ServiceNode.cs" />
- <Compile Include="FSpot.Extensions\SidebarPage.cs" />
- <Compile Include="FSpot.Extensions\SidebarPageNode.cs" />
- <Compile Include="FSpot.Extensions\TransitionNode.cs" />
- <Compile Include="FSpot.Extensions\ViewModeCondition.cs" />
- <Compile Include="FSpot.Filters\ChmodFilter.cs" />
- <Compile Include="FSpot.Filters\FilterRequest.cs" />
- <Compile Include="FSpot.Filters\FilterSet.cs" />
- <Compile Include="FSpot.Filters\IFilter.cs" />
- <Compile Include="FSpot.Filters\JpegFilter.cs" />
- <Compile Include="FSpot.Filters\ResizeFilter.cs" />
- <Compile Include="FSpot.Filters\SharpFilter.cs" />
- <Compile Include="FSpot.Filters\UniqueNameFilter.cs" />
- <Compile Include="FSpot.Filters\WhiteListFilter.cs" />
- <Compile Include="FSpot\FolderQueryWidget.cs" />
- <Compile Include="FSpot\FullScreenView.cs" />
- <Compile Include="FSpot\GroupAdaptor.cs" />
- <Compile Include="FSpot\GroupSelector.cs" />
- <Compile Include="FSpot\Histogram.cs" />
- <Compile Include="FSpot.Imaging\Ciff.cs" />
- <Compile Include="FSpot.Imaging\DCRawFile.cs" />
- <Compile Include="FSpot.Imaging\ImageFile.cs" />
- <Compile Include="FSpot.Imaging\InternalProcess.cs" />
- <Compile Include="FSpot.Imaging\IOChannel.cs" />
- <Compile Include="FSpot.Imaging\RafFile.cs" />
- <Compile Include="FSpot.Imaging\Tests\ImageFileTests.cs" />
- <Compile Include="FSpot.Imaging\Tiff.cs" />
- <Compile Include="FSpot.Import\FileImportSource.cs" />
- <Compile Include="FSpot.Import\ImportController.cs" />
- <Compile Include="FSpot.Import\MetadataImporter.cs" />
- <Compile Include="FSpot\InfoOverlay.cs" />
- <Compile Include="FSpot\ItemAction.cs" />
- <Compile Include="FSpot.Jobs\CalculateHashJob.cs" />
- <Compile Include="FSpot.Jobs\SyncMetadataJob.cs" />
- <Compile Include="FSpot.Loaders\AreaPreparedEventArgs.cs" />
- <Compile Include="FSpot.Loaders\AreaUpdatedEventArgs.cs" />
- <Compile Include="FSpot.Loaders\GdkImageLoader.cs" />
- <Compile Include="FSpot.Loaders\IImageLoader.cs" />
- <Compile Include="FSpot.Loaders\ImageLoader.cs" />
- <Compile Include="FSpot\main.cs" />
- <Compile Include="FSpot\MainWindow.cs" />
- <Compile Include="FSpot\Photo.cs" />
- <Compile Include="FSpot\PhotoEventArgs.cs" />
- <Compile Include="FSpot\PhotoLoader.cs" />
- <Compile Include="FSpot\PhotoPopup.cs" />
- <Compile Include="FSpot\PhotoQuery.cs" />
- <Compile Include="FSpot\PhotoVersion.cs" />
- <Compile Include="FSpot\PhotoView.cs" />
- <Compile Include="FSpot\PixbufCache.cs" />
- <Compile Include="FSpot\Preferences.cs" />
- <Compile Include="FSpot\PrintOperation.cs" />
- <Compile Include="FSpot\ProgressItem.cs" />
- <Compile Include="FSpot.Query\HiddenTag.cs" />
- <Compile Include="FSpot\QueryWidget.cs" />
- <Compile Include="FSpot\RotateCommand.cs" />
- <Compile Include="FSpot\SelectionDataExtensions.cs" />
- <Compile Include="FSpot\SendEmail.cs" />
- <Compile Include="FSpot\SingleView.cs" />
- <Compile Include="FSpot\TagQueryWidget.cs" />
- <Compile Include="FSpot\TagSelectionWidget.cs" />
- <Compile Include="FSpot\Term.cs" />
- <Compile Include="FSpot\ThumbnailCache.cs" />
- <Compile Include="FSpot\ThumbnailGenerator.cs" />
- <Compile Include="FSpot\TimeAdaptor.cs" />
- <Compile Include="FSpot.UI.Dialog\AboutDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\AdjustTimeDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\BuilderDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\DateRangeDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\EditExceptionDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\EditTagDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\EditTagIconDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\ImportDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\ImportFailureDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\LastRollDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\PreferenceDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\ProgressDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\RatingFilterDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\RepairDbDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\RepairDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\SelectionRatioDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\TagSelectionDialog.cs" />
- <Compile Include="FSpot.UI.Dialog\ThreadProgressDialog.cs" />
- <Compile Include="FSpot\UriCollection.cs" />
- <Compile Include="FSpot.Widgets\CellRendererTextProgress.cs" />
- <Compile Include="FSpot.Widgets\EditorPage.cs" />
- <Compile Include="FSpot.Widgets\Filmstrip.cs" />
- <Compile Include="FSpot.Widgets\FindBar.cs" />
- <Compile Include="FSpot.Widgets\FolderTreeModel.cs" />
- <Compile Include="FSpot.Widgets\FolderTreePage.cs" />
- <Compile Include="FSpot.Widgets\FolderTreeView.cs" />
- <Compile Include="FSpot.Widgets\ImageInfo.cs" />
- <Compile Include="FSpot.Widgets\InfoBox.cs" />
- <Compile Include="FSpot.Widgets\Loupe.cs" />
- <Compile Include="FSpot.Widgets\MetadataDisplay.cs" />
- <Compile Include="FSpot.Widgets\PhotoImageView.cs" />
- <Compile Include="FSpot.Widgets\PreviewPopup.cs" />
- <Compile Include="FSpot.Widgets\QueryView.cs" />
- <Compile Include="FSpot.Widgets\RatingMenuItem.cs" />
- <Compile Include="FSpot.Widgets\Sharpener.cs" />
- <Compile Include="FSpot.Widgets\Sidebar.cs" />
- <Compile Include="FSpot.Widgets\SlideShow.cs" />
- <Compile Include="FSpot.Widgets\SoftFocus.cs" />
- <Compile Include="FSpot.Widgets\TagEntry.cs" />
- <Compile Include="FSpot.Widgets\TagMenu.cs" />
- <Compile Include="FSpot.Widgets\TagView.cs" />
- <Compile Include="FSpot.Widgets\Tests\FindBarTests.cs" />
- <Compile Include="FSpot.Widgets\TrayView.cs" />
- <Compile Include="FSpot.Widgets\ViewContext.cs" />
- <Compile Include="FSpot\XScreenSaverSlide.cs" />
- <Compile Include="ImageLoaderThread.cs" />
- <Compile Include="PhotoTagMenu.cs" />
- <Compile Include="PhotoVersionCommands.cs" />
- <Compile Include="PhotoVersionMenu.cs" />
- <Compile Include="PixbufUtils.cs" />
- <Compile Include="TagCommands.cs" />
- <Compile Include="TagPopup.cs" />
- <Compile Include="ThumbnailCommand.cs" />
- <Compile Include="FSpot\ExportStore.cs" />
- <Compile Include="FSpot\JobStore.cs" />
- <Compile Include="FSpot\MetaStore.cs" />
- <Compile Include="FSpot\PhotoStore.cs" />
- <Compile Include="FSpot\RollStore.cs" />
- <Compile Include="FSpot\TagStore.cs" />
- <Compile Include="FSpot.Database\DbException.cs" />
- <Compile Include="FSpot.Database\DbStore.cs" />
- <Compile Include="FSpot.Widgets\ThumbnailCaptionRenderer.cs" />
- <Compile Include="FSpot.Widgets\ThumbnailDateCaptionRenderer.cs" />
- <Compile Include="FSpot.Widgets\ThumbnailDecorationRenderer.cs" />
- <Compile Include="FSpot.Widgets\ThumbnailFilenameCaptionRenderer.cs" />
- <Compile Include="FSpot.Widgets\ThumbnailRatingDecorationRenderer.cs" />
- <Compile Include="FSpot.Widgets\ThumbnailTagsCaptionRenderer.cs" />
- <Compile Include="FSpot.Widgets\ThumbnailTextCaptionRenderer.cs" />
- <Compile Include="FSpot.Widgets\SelectionCollectionGridView.cs" />
- <Compile Include="FSpot.Widgets\CollectionCellGridView.cs" />
- <Compile Include="FSpot.Widgets\BrowseablePointerGridView.cs" />
- <Compile Include="Pinta\ColorBgra.cs" />
- <Compile Include="Pinta\CairoExtensions.cs" />
- <Compile Include="Pinta\GaussianBlurEffect.cs" />
- <Compile Include="FSpot\Literal.cs" />
- <Compile Include="FSpot.Imaging\IImageFile.cs" />
- <Compile Include="FSpot.Import\IImportSource.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="..\..\..\COPYING">
- <LogicalName>COPYING</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="..\..\..\icons\f-spot-not.png">
- <LogicalName>f-spot-not.png</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="..\..\..\icons\f-spot-128.png">
- <LogicalName>f-spot-128.png</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="..\..\..\icons\flower.png">
- <LogicalName>flower.png</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\import.ui">
- <LogicalName>import.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\mail_dialog.ui">
- <LogicalName>mail_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\main_window.ui">
- <LogicalName>main_window.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\single_view.ui">
- <LogicalName>single_view.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\version_name_dialog.ui">
- <LogicalName>version_name_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\viewer_preferences.ui">
- <LogicalName>viewer_preferences.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\tag_selection_dialog.ui">
- <LogicalName>tag_selection_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\AdjustTimeDialog.ui">
- <LogicalName>AdjustTimeDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\DateRangeDialog.ui">
- <LogicalName>DateRangeDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagDialog.ui">
- <LogicalName>EditTagDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagIconDialog.ui">
- <LogicalName>EditTagIconDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\PreferenceDialog.ui">
- <LogicalName>PreferenceDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\RatingFilterDialog.ui">
- <LogicalName>RatingFilterDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\CreateTagDialog.ui">
- <LogicalName>CreateTagDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\LastImportRollFilterDialog.ui">
- <LogicalName>LastImportRollFilterDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\RepairDialog.ui">
- <LogicalName>RepairDialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.addin.xml">
- <LogicalName>FSpot.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="ui\color_editor_prefs_window.ui">
- <LogicalName>color_editor_prefs_window.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="FSpot.UI.Dialog\ui\SelectionRatioDialog.ui">
- <LogicalName>SelectionRatioDialog.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </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="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="System.Data" />
- <Reference Include="Mono.Posix" />
- <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
- <Private>False</Private>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="System.Xml" />
- <Reference Include="System" />
- <Reference Include="Mono.Addins.Setup, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
- <Private>False</Private>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
- <Private>False</Private>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
- <Reference Include="Mono.Simd" />
- <Reference Include="unique-sharp">
- <HintPath>..\..\..\lib\unique-sharp\unique\unique-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="Mono.Cairo" />
- <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
- <Name>Hyena.Data.Sqlite</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\FSpot.JobScheduler\FSpot.JobScheduler.csproj">
- <Project>{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}</Project>
- <Name>FSpot.JobScheduler</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\FSpot.Platform\FSpot.Platform.csproj">
- <Project>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</Project>
- <Name>FSpot.Platform</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\FSpot.Query\FSpot.Query.csproj">
- <Project>{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}</Project>
- <Name>FSpot.Query</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\FSpot.Bling\FSpot.Bling.csproj">
- <Project>{7281334F-0B1D-4383-9EA2-6740D56ADCDE}</Project>
- <Name>FSpot.Bling</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{27EC05FB-0223-4B26-8157-E49AF81D0007}</ProjectGuid>
+ <OutputType>Exe</OutputType>
+ <RootNamespace>MainApp</RootNamespace>
+ <AssemblyName>f-spot</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG ENABLE_TESTS</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <Externalconsole>true</Externalconsole>
+ <EnvironmentVariables>
+ <EnvironmentVariables>
+ <Variable name="GTK_MODULES" value="" />
+ </EnvironmentVariables>
+ </EnvironmentVariables>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="DependentListStore.cs" />
+ <Compile Include="FSpot\Accelerometer.cs" />
+ <Compile Include="FSpot\App.cs" />
+ <Compile Include="FSpot\BitConverter.cs" />
+ <Compile Include="FSpot.ColorAdjustment\Adjustment.cs" />
+ <Compile Include="FSpot.ColorAdjustment\AutoStretch.cs" />
+ <Compile Include="FSpot.ColorAdjustment\Desaturate.cs" />
+ <Compile Include="FSpot.ColorAdjustment\FullColorAdjustment.cs" />
+ <Compile Include="FSpot.ColorAdjustment\SepiaTone.cs" />
+ <Compile Include="FSpot\ColorManagement.cs" />
+ <Compile Include="FSpot\ControlOverlay.cs" />
+ <Compile Include="FSpot.Database\Db.cs" />
+ <Compile Include="FSpot.Database\FSpotDatabaseConnection.cs" />
+ <Compile Include="FSpot.Database\Tests\UpdaterTests.cs" />
+ <Compile Include="FSpot.Database\Updater.cs" />
+ <Compile Include="FSpot\DragDropTargets.cs" />
+ <Compile Include="FSpot.Editors\AutoStretchEditor.cs" />
+ <Compile Include="FSpot.Editors\ColorEditor.cs" />
+ <Compile Include="FSpot.Editors\CropEditor.cs" />
+ <Compile Include="FSpot.Editors\DesaturateEditor.cs" />
+ <Compile Include="FSpot.Editors\Editor.cs" />
+ <Compile Include="FSpot.Editors\RedEyeEditor.cs" />
+ <Compile Include="FSpot.Editors\SepiaEditor.cs" />
+ <Compile Include="FSpot.Editors\SoftFocusEditor.cs" />
+ <Compile Include="FSpot.Editors\TiltEditor.cs" />
+ <Compile Include="FSpot.Extensions\CommandMenuItemNode.cs" />
+ <Compile Include="FSpot.Extensions\ComplexMenuItemNode.cs" />
+ <Compile Include="FSpot.Extensions\ExportMenuItemNode.cs" />
+ <Compile Include="FSpot.Extensions\ICommand.cs" />
+ <Compile Include="FSpot.Extensions\IExporter.cs" />
+ <Compile Include="FSpot.Extensions\IMenuGenerator.cs" />
+ <Compile Include="FSpot.Extensions\IService.cs" />
+ <Compile Include="FSpot.Extensions\MenuNode.cs" />
+ <Compile Include="FSpot.Extensions\PhotoSelectionCondition.cs" />
+ <Compile Include="FSpot.Extensions\PopupCommands.cs" />
+ <Compile Include="FSpot.Extensions\ServiceNode.cs" />
+ <Compile Include="FSpot.Extensions\SidebarPage.cs" />
+ <Compile Include="FSpot.Extensions\SidebarPageNode.cs" />
+ <Compile Include="FSpot.Extensions\TransitionNode.cs" />
+ <Compile Include="FSpot.Extensions\ViewModeCondition.cs" />
+ <Compile Include="FSpot.Filters\ChmodFilter.cs" />
+ <Compile Include="FSpot.Filters\FilterRequest.cs" />
+ <Compile Include="FSpot.Filters\FilterSet.cs" />
+ <Compile Include="FSpot.Filters\IFilter.cs" />
+ <Compile Include="FSpot.Filters\JpegFilter.cs" />
+ <Compile Include="FSpot.Filters\ResizeFilter.cs" />
+ <Compile Include="FSpot.Filters\SharpFilter.cs" />
+ <Compile Include="FSpot.Filters\UniqueNameFilter.cs" />
+ <Compile Include="FSpot.Filters\WhiteListFilter.cs" />
+ <Compile Include="FSpot\FolderQueryWidget.cs" />
+ <Compile Include="FSpot\FullScreenView.cs" />
+ <Compile Include="FSpot\GroupAdaptor.cs" />
+ <Compile Include="FSpot\GroupSelector.cs" />
+ <Compile Include="FSpot\Histogram.cs" />
+ <Compile Include="FSpot.Imaging\Ciff.cs" />
+ <Compile Include="FSpot.Imaging\DCRawFile.cs" />
+ <Compile Include="FSpot.Imaging\ImageFile.cs" />
+ <Compile Include="FSpot.Imaging\InternalProcess.cs" />
+ <Compile Include="FSpot.Imaging\IOChannel.cs" />
+ <Compile Include="FSpot.Imaging\RafFile.cs" />
+ <Compile Include="FSpot.Imaging\Tests\ImageFileTests.cs" />
+ <Compile Include="FSpot.Imaging\Tiff.cs" />
+ <Compile Include="FSpot.Import\FileImportSource.cs" />
+ <Compile Include="FSpot.Import\ImportController.cs" />
+ <Compile Include="FSpot.Import\MetadataImporter.cs" />
+ <Compile Include="FSpot\InfoOverlay.cs" />
+ <Compile Include="FSpot\ItemAction.cs" />
+ <Compile Include="FSpot.Jobs\CalculateHashJob.cs" />
+ <Compile Include="FSpot.Jobs\SyncMetadataJob.cs" />
+ <Compile Include="FSpot.Loaders\AreaPreparedEventArgs.cs" />
+ <Compile Include="FSpot.Loaders\AreaUpdatedEventArgs.cs" />
+ <Compile Include="FSpot.Loaders\GdkImageLoader.cs" />
+ <Compile Include="FSpot.Loaders\IImageLoader.cs" />
+ <Compile Include="FSpot.Loaders\ImageLoader.cs" />
+ <Compile Include="FSpot\main.cs" />
+ <Compile Include="FSpot\MainWindow.cs" />
+ <Compile Include="FSpot\Photo.cs" />
+ <Compile Include="FSpot\PhotoEventArgs.cs" />
+ <Compile Include="FSpot\PhotoLoader.cs" />
+ <Compile Include="FSpot\PhotoPopup.cs" />
+ <Compile Include="FSpot\PhotoQuery.cs" />
+ <Compile Include="FSpot\PhotoVersion.cs" />
+ <Compile Include="FSpot\PhotoView.cs" />
+ <Compile Include="FSpot\PixbufCache.cs" />
+ <Compile Include="FSpot\Preferences.cs" />
+ <Compile Include="FSpot\PrintOperation.cs" />
+ <Compile Include="FSpot\ProgressItem.cs" />
+ <Compile Include="FSpot.Query\HiddenTag.cs" />
+ <Compile Include="FSpot\QueryWidget.cs" />
+ <Compile Include="FSpot\RotateCommand.cs" />
+ <Compile Include="FSpot\SelectionDataExtensions.cs" />
+ <Compile Include="FSpot\SendEmail.cs" />
+ <Compile Include="FSpot\SingleView.cs" />
+ <Compile Include="FSpot\TagQueryWidget.cs" />
+ <Compile Include="FSpot\TagSelectionWidget.cs" />
+ <Compile Include="FSpot\Term.cs" />
+ <Compile Include="FSpot\ThumbnailCache.cs" />
+ <Compile Include="FSpot\ThumbnailGenerator.cs" />
+ <Compile Include="FSpot\TimeAdaptor.cs" />
+ <Compile Include="FSpot.UI.Dialog\AboutDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\AdjustTimeDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\BuilderDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\DateRangeDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\EditExceptionDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\EditTagDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\EditTagIconDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\ImportDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\ImportFailureDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\LastRollDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\PreferenceDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\ProgressDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\RatingFilterDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\RepairDbDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\RepairDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\SelectionRatioDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\TagSelectionDialog.cs" />
+ <Compile Include="FSpot.UI.Dialog\ThreadProgressDialog.cs" />
+ <Compile Include="FSpot\UriCollection.cs" />
+ <Compile Include="FSpot.Widgets\CellRendererTextProgress.cs" />
+ <Compile Include="FSpot.Widgets\EditorPage.cs" />
+ <Compile Include="FSpot.Widgets\Filmstrip.cs" />
+ <Compile Include="FSpot.Widgets\FindBar.cs" />
+ <Compile Include="FSpot.Widgets\FolderTreeModel.cs" />
+ <Compile Include="FSpot.Widgets\FolderTreePage.cs" />
+ <Compile Include="FSpot.Widgets\FolderTreeView.cs" />
+ <Compile Include="FSpot.Widgets\ImageInfo.cs" />
+ <Compile Include="FSpot.Widgets\InfoBox.cs" />
+ <Compile Include="FSpot.Widgets\Loupe.cs" />
+ <Compile Include="FSpot.Widgets\MetadataDisplay.cs" />
+ <Compile Include="FSpot.Widgets\PhotoImageView.cs" />
+ <Compile Include="FSpot.Widgets\PreviewPopup.cs" />
+ <Compile Include="FSpot.Widgets\QueryView.cs" />
+ <Compile Include="FSpot.Widgets\RatingMenuItem.cs" />
+ <Compile Include="FSpot.Widgets\Sharpener.cs" />
+ <Compile Include="FSpot.Widgets\Sidebar.cs" />
+ <Compile Include="FSpot.Widgets\SlideShow.cs" />
+ <Compile Include="FSpot.Widgets\SoftFocus.cs" />
+ <Compile Include="FSpot.Widgets\TagEntry.cs" />
+ <Compile Include="FSpot.Widgets\TagMenu.cs" />
+ <Compile Include="FSpot.Widgets\TagView.cs" />
+ <Compile Include="FSpot.Widgets\Tests\FindBarTests.cs" />
+ <Compile Include="FSpot.Widgets\TrayView.cs" />
+ <Compile Include="FSpot.Widgets\ViewContext.cs" />
+ <Compile Include="FSpot\XScreenSaverSlide.cs" />
+ <Compile Include="ImageLoaderThread.cs" />
+ <Compile Include="PhotoTagMenu.cs" />
+ <Compile Include="PhotoVersionCommands.cs" />
+ <Compile Include="PhotoVersionMenu.cs" />
+ <Compile Include="PixbufUtils.cs" />
+ <Compile Include="TagCommands.cs" />
+ <Compile Include="TagPopup.cs" />
+ <Compile Include="ThumbnailCommand.cs" />
+ <Compile Include="FSpot\ExportStore.cs" />
+ <Compile Include="FSpot\JobStore.cs" />
+ <Compile Include="FSpot\MetaStore.cs" />
+ <Compile Include="FSpot\PhotoStore.cs" />
+ <Compile Include="FSpot\RollStore.cs" />
+ <Compile Include="FSpot\TagStore.cs" />
+ <Compile Include="FSpot.Database\DbException.cs" />
+ <Compile Include="FSpot.Database\DbStore.cs" />
+ <Compile Include="FSpot.Widgets\ThumbnailCaptionRenderer.cs" />
+ <Compile Include="FSpot.Widgets\ThumbnailDateCaptionRenderer.cs" />
+ <Compile Include="FSpot.Widgets\ThumbnailDecorationRenderer.cs" />
+ <Compile Include="FSpot.Widgets\ThumbnailFilenameCaptionRenderer.cs" />
+ <Compile Include="FSpot.Widgets\ThumbnailRatingDecorationRenderer.cs" />
+ <Compile Include="FSpot.Widgets\ThumbnailTagsCaptionRenderer.cs" />
+ <Compile Include="FSpot.Widgets\ThumbnailTextCaptionRenderer.cs" />
+ <Compile Include="FSpot.Widgets\SelectionCollectionGridView.cs" />
+ <Compile Include="FSpot.Widgets\CollectionCellGridView.cs" />
+ <Compile Include="FSpot.Widgets\BrowseablePointerGridView.cs" />
+ <Compile Include="Pinta\ColorBgra.cs" />
+ <Compile Include="Pinta\CairoExtensions.cs" />
+ <Compile Include="Pinta\GaussianBlurEffect.cs" />
+ <Compile Include="FSpot\Literal.cs" />
+ <Compile Include="FSpot.Imaging\IImageFile.cs" />
+ <Compile Include="FSpot.Import\IImportSource.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="..\..\..\COPYING">
+ <LogicalName>COPYING</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\icons\f-spot-not.png">
+ <LogicalName>f-spot-not.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\icons\f-spot-128.png">
+ <LogicalName>f-spot-128.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="..\..\..\icons\flower.png">
+ <LogicalName>flower.png</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\import.ui">
+ <LogicalName>import.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\mail_dialog.ui">
+ <LogicalName>mail_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\main_window.ui">
+ <LogicalName>main_window.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\single_view.ui">
+ <LogicalName>single_view.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\version_name_dialog.ui">
+ <LogicalName>version_name_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\viewer_preferences.ui">
+ <LogicalName>viewer_preferences.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\tag_selection_dialog.ui">
+ <LogicalName>tag_selection_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\AdjustTimeDialog.ui">
+ <LogicalName>AdjustTimeDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\DateRangeDialog.ui">
+ <LogicalName>DateRangeDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagDialog.ui">
+ <LogicalName>EditTagDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\EditTagIconDialog.ui">
+ <LogicalName>EditTagIconDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\PreferenceDialog.ui">
+ <LogicalName>PreferenceDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\RatingFilterDialog.ui">
+ <LogicalName>RatingFilterDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\CreateTagDialog.ui">
+ <LogicalName>CreateTagDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\LastImportRollFilterDialog.ui">
+ <LogicalName>LastImportRollFilterDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\RepairDialog.ui">
+ <LogicalName>RepairDialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.addin.xml">
+ <LogicalName>FSpot.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="ui\color_editor_prefs_window.ui">
+ <LogicalName>color_editor_prefs_window.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="FSpot.UI.Dialog\ui\SelectionRatioDialog.ui">
+ <LogicalName>SelectionRatioDialog.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </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="pango-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="System.Data" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="Mono.Addins, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+ <Private>False</Private>
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
+ <Reference Include="System.Xml" />
+ <Reference Include="System" />
+ <Reference Include="Mono.Addins.Setup, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+ <Private>False</Private>
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
+ <Reference Include="gnome-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Mono.Addins.Gui, Version=0.4.0.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756">
+ <Private>False</Private>
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
+ <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+ <Reference Include="Mono.Simd" />
+ <Reference Include="unique-sharp">
+ <HintPath>..\..\..\lib\unique-sharp\unique\unique-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="Mono.Cairo" />
+ <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
+ <Name>Hyena.Data.Sqlite</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\FSpot.JobScheduler\FSpot.JobScheduler.csproj">
+ <Project>{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}</Project>
+ <Name>FSpot.JobScheduler</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\FSpot.Platform\FSpot.Platform.csproj">
+ <Project>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</Project>
+ <Name>FSpot.Platform</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\FSpot.Query\FSpot.Query.csproj">
+ <Project>{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}</Project>
+ <Name>FSpot.Query</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\FSpot.Bling\FSpot.Bling.csproj">
+ <Project>{7281334F-0B1D-4383-9EA2-6740D56ADCDE}</Project>
+ <Name>FSpot.Bling</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Clients/MainApp/PhotoTagMenu.cs b/src/Clients/MainApp/PhotoTagMenu.cs
index 4c482f0..820a1ff 100644
--- a/src/Clients/MainApp/PhotoTagMenu.cs
+++ b/src/Clients/MainApp/PhotoTagMenu.cs
@@ -26,22 +26,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 FSpot.Core;
-
-using Gtk;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+
+using Gtk;
+
using Hyena;
public class PhotoTagMenu : Menu {
public delegate void TagSelectedHandler (Tag t);
public event TagSelectedHandler TagSelected;
- public PhotoTagMenu ()
+ public PhotoTagMenu ()
{
}
diff --git a/src/Clients/MainApp/PhotoVersionCommands.cs b/src/Clients/MainApp/PhotoVersionCommands.cs
index 4c34b93..247fbc6 100644
--- a/src/Clients/MainApp/PhotoVersionCommands.cs
+++ b/src/Clients/MainApp/PhotoVersionCommands.cs
@@ -29,18 +29,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 FSpot;
-using FSpot.UI.Dialog;
-
-using Gtk;
-
-using Hyena;
-using Hyena.Widgets;
-
+//
+
+using System;
+
+using FSpot;
+using FSpot.UI.Dialog;
+
+using Gtk;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
public class PhotoVersionCommands
diff --git a/src/Clients/MainApp/PhotoVersionMenu.cs b/src/Clients/MainApp/PhotoVersionMenu.cs
index de794d9..aa1499e 100644
--- a/src/Clients/MainApp/PhotoVersionMenu.cs
+++ b/src/Clients/MainApp/PhotoVersionMenu.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 System.Collections.Generic;
-
-using FSpot.Core;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot.Core;
+
using Gtk;
public class PhotoVersionMenu : Menu {
diff --git a/src/Clients/MainApp/PixbufUtils.cs b/src/Clients/MainApp/PixbufUtils.cs
index dd4a9c6..6ac007a 100644
--- a/src/Clients/MainApp/PixbufUtils.cs
+++ b/src/Clients/MainApp/PixbufUtils.cs
@@ -29,27 +29,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 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 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;
public static class PixbufUtils
@@ -368,8 +368,8 @@ public static class PixbufUtils
}
return newsurf;
- }
-
+ }
+
//threshold, factors and comparisons borrowed from the gimp plugin 'redeye.c' by Robert Merkel
public unsafe static Gdk.Pixbuf RemoveRedeye (Gdk.Pixbuf src, Gdk.Rectangle area, int threshold = -15)
{
@@ -523,8 +523,8 @@ public static class PixbufUtils
else
ret = (Gdk.Pixbuf)GLib.Object.GetObject (raw_ret, true);
return ret;
- }
-
+ }
+
public static void CreateDerivedVersion (SafeUri source, SafeUri destination, uint jpeg_quality = 95)
{
if (source.GetExtension () == destination.GetExtension ()) {
diff --git a/src/Clients/MainApp/TagCommands.cs b/src/Clients/MainApp/TagCommands.cs
index adc726b..63dec0e 100644
--- a/src/Clients/MainApp/TagCommands.cs
+++ b/src/Clients/MainApp/TagCommands.cs
@@ -29,20 +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 System;
-using System.Collections.Generic;
-
-using FSpot;
-using FSpot.Core;
-using FSpot.UI.Dialog;
-
-using Gdk;
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+using System.Collections.Generic;
+
+using FSpot;
+using FSpot.Core;
+using FSpot.UI.Dialog;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
public class TagCommands {
@@ -148,12 +148,12 @@ public class TagCommands {
}
private Category Category {
- get
- {
+ get
+ {
if (categories.Count == 0)
- return tag_store.RootCategory;
- return categories [category_option_menu.Active] as Category;
- }
+ return tag_store.RootCategory;
+ return categories [category_option_menu.Active] as Category;
+ }
set {
if ((value != null) && (categories.Count > 0)) {
//System.Console.WriteLine("TagCreateCommand.set_Category(" + value.Name + ")");
diff --git a/src/Clients/MainApp/TagPopup.cs b/src/Clients/MainApp/TagPopup.cs
index 37bd780..c1d9572 100644
--- a/src/Clients/MainApp/TagPopup.cs
+++ b/src/Clients/MainApp/TagPopup.cs
@@ -31,14 +31,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 FSpot;
-using FSpot.Core;
-using FSpot.Utils;
-
+//
+
+using System;
+
+using FSpot;
+using FSpot.Core;
+using FSpot.Utils;
+
using Mono.Unix;
public class TagPopup
diff --git a/src/Clients/MainApp/ThumbnailCommand.cs b/src/Clients/MainApp/ThumbnailCommand.cs
index 3a40058..db6d543 100644
--- a/src/Clients/MainApp/ThumbnailCommand.cs
+++ b/src/Clients/MainApp/ThumbnailCommand.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.Core;
-using FSpot.UI.Dialog;
+//
+
+using System;
+
+using FSpot;
+using FSpot.Core;
+using FSpot.UI.Dialog;
using FSpot.Utils;
public class ThumbnailCommand {
diff --git a/src/Core/FSpot.Bling/FSpot.Bling.csproj b/src/Core/FSpot.Bling/FSpot.Bling.csproj
index 5518cdf..a082933 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling.csproj
+++ b/src/Core/FSpot.Bling/FSpot.Bling.csproj
@@ -1,103 +1,103 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{7281334F-0B1D-4383-9EA2-6740D56ADCDE}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Bling</RootNamespace>
- <AssemblyName>FSpot.Bling</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Bling\Animation.cs" />
- <Compile Include="FSpot.Bling\BackEase.cs" />
- <Compile Include="FSpot.Bling\CubicEase.cs" />
- <Compile Include="FSpot.Bling\DoubleAnimation.cs" />
- <Compile Include="FSpot.Bling\EasedAnimation.cs" />
- <Compile Include="FSpot.Bling\EasingFunction.cs" />
- <Compile Include="FSpot.Bling\EasingMode.cs" />
- <Compile Include="FSpot.Bling\QuinticEase.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="System" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7281334F-0B1D-4383-9EA2-6740D56ADCDE}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Bling</RootNamespace>
+ <AssemblyName>FSpot.Bling</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Bling\Animation.cs" />
+ <Compile Include="FSpot.Bling\BackEase.cs" />
+ <Compile Include="FSpot.Bling\CubicEase.cs" />
+ <Compile Include="FSpot.Bling\DoubleAnimation.cs" />
+ <Compile Include="FSpot.Bling\EasedAnimation.cs" />
+ <Compile Include="FSpot.Bling\EasingFunction.cs" />
+ <Compile Include="FSpot.Bling\EasingMode.cs" />
+ <Compile Include="FSpot.Bling\QuinticEase.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="System" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs
index aab49bc..59a47dc 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/BackEase.cs
@@ -39,7 +39,7 @@ namespace FSpot.Bling
{
}
- public BackEase (double amplitude)
+ public BackEase (double amplitude)
{
if (amplitude < 0)
throw new ArgumentOutOfRangeException ("amplitude");
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
index d945cf7..d009f33 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/CubicEase.cs
@@ -29,7 +29,7 @@
namespace FSpot.Bling
{ public class CubicEase : EasingFunction
- {
+ {
public CubicEase (EasingMode easingMode) : base (easingMode)
{
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/EasedAnimation.cs b/src/Core/FSpot.Bling/FSpot.Bling/EasedAnimation.cs
index 3a76f9e..3df41c7 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/EasedAnimation.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/EasedAnimation.cs
@@ -37,7 +37,7 @@ namespace FSpot.Bling
{
}
- public EasedAnimation (EasingFunction easingFunction)
+ public EasedAnimation (EasingFunction easingFunction)
{
EasingFunction = easingFunction;
}
diff --git a/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs b/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
index 53afcea..7d558f4 100644
--- a/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
+++ b/src/Core/FSpot.Bling/FSpot.Bling/QuinticEase.cs
@@ -32,7 +32,7 @@ namespace FSpot.Bling
// FIXME: This is never used
public abstract class QuinticEase : EasingFunction
{
- public QuinticEase ()
+ public QuinticEase ()
{
}
diff --git a/src/Core/FSpot.Cms/Cms/CmsException.cs b/src/Core/FSpot.Cms/Cms/CmsException.cs
index 2ae00f1..09ddb51 100644
--- a/src/Core/FSpot.Cms/Cms/CmsException.cs
+++ b/src/Core/FSpot.Cms/Cms/CmsException.cs
@@ -45,7 +45,7 @@ namespace Cms {
{
}
- public CmsException ()
+ public CmsException ()
{
}
}
diff --git a/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs b/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
index 8cdca5d..f8b82db 100644
--- a/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
+++ b/src/Core/FSpot.Cms/Cms/ColorCIExyY.cs
@@ -25,11 +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 System.IO;
-using System.Reflection;
+//
+
+using System;
+using System.IO;
+using System.Reflection;
using System.Runtime.InteropServices;
namespace Cms {
diff --git a/src/Core/FSpot.Cms/Cms/Profile.cs b/src/Core/FSpot.Cms/Cms/Profile.cs
index 138e4fb..7cff841 100644
--- a/src/Core/FSpot.Cms/Cms/Profile.cs
+++ b/src/Core/FSpot.Cms/Cms/Profile.cs
@@ -83,13 +83,13 @@ namespace Cms {
return new Profile (NativeMethods.CmsCreateLabProfile (IntPtr.Zero));
}
- public static Profile CreateGray (ColorCIExyY whitePoint, GammaTable transfer)
- {
+ public static Profile CreateGray (ColorCIExyY whitePoint, GammaTable transfer)
+ {
if (transfer == null)
- return new Profile (NativeMethods.CmsCreateGrayProfile (ref whitePoint, new GammaTable (4096, 2.2).Handle));
- return new Profile (NativeMethods.CmsCreateGrayProfile (ref whitePoint, transfer.Handle));
- }
-
+ return new Profile (NativeMethods.CmsCreateGrayProfile (ref whitePoint, new GammaTable (4096, 2.2).Handle));
+ return new Profile (NativeMethods.CmsCreateGrayProfile (ref whitePoint, transfer.Handle));
+ }
+
public static Profile GetScreenProfile (Gdk.Screen screen)
{
if (screen == null)
@@ -97,7 +97,7 @@ namespace Cms {
IntPtr profile = NativeMethods.FScreenGetProfile (screen.Handle);
- return profile == IntPtr.Zero ? null : new Profile (profile);
+ return profile == IntPtr.Zero ? null : new Profile (profile);
}
@@ -233,9 +233,9 @@ namespace Cms {
}
if (profileh == IntPtr.Zero)
- throw new CmsException ("Invalid Profile Data");
-
- Handle = new HandleRef (this, profileh);
+ throw new CmsException ("Invalid Profile Data");
+
+ Handle = new HandleRef (this, profileh);
}
public ColorCIEXYZ MediaWhitePoint {
diff --git a/src/Core/FSpot.Cms/Cms/SaveException.cs b/src/Core/FSpot.Cms/Cms/SaveException.cs
index 5675ff1..37ee878 100644
--- a/src/Core/FSpot.Cms/Cms/SaveException.cs
+++ b/src/Core/FSpot.Cms/Cms/SaveException.cs
@@ -43,6 +43,6 @@ namespace Cms {
public SaveException (string message, Exception innerException) : base (message, innerException)
{
- }
+ }
}
}
diff --git a/src/Core/FSpot.Cms/FSpot.Cms.csproj b/src/Core/FSpot.Cms/FSpot.Cms.csproj
index 0ef7004..0a417cf 100644
--- a/src/Core/FSpot.Cms/FSpot.Cms.csproj
+++ b/src/Core/FSpot.Cms/FSpot.Cms.csproj
@@ -1,109 +1,109 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Cms</RootNamespace>
- <AssemblyName>FSpot.Cms</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="Cms\CctTable.cs" />
- <Compile Include="Cms\CmsException.cs" />
- <Compile Include="Cms\ColorCIELab.cs" />
- <Compile Include="Cms\ColorCIELCh.cs" />
- <Compile Include="Cms\ColorCIExyY.cs" />
- <Compile Include="Cms\ColorCIEXYZ.cs" />
- <Compile Include="Cms\Format.cs" />
- <Compile Include="Cms\GammaTable.cs" />
- <Compile Include="Cms\IccColorSpace.cs" />
- <Compile Include="Cms\IccProfileClass.cs" />
- <Compile Include="Cms\Intent.cs" />
- <Compile Include="Cms\NativeMethods.cs" />
- <Compile Include="Cms\Profile.cs" />
- <Compile Include="Cms\SaveException.cs" />
- <Compile Include="Cms\Transform.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Cms</RootNamespace>
+ <AssemblyName>FSpot.Cms</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="Cms\CctTable.cs" />
+ <Compile Include="Cms\CmsException.cs" />
+ <Compile Include="Cms\ColorCIELab.cs" />
+ <Compile Include="Cms\ColorCIELCh.cs" />
+ <Compile Include="Cms\ColorCIExyY.cs" />
+ <Compile Include="Cms\ColorCIEXYZ.cs" />
+ <Compile Include="Cms\Format.cs" />
+ <Compile Include="Cms\GammaTable.cs" />
+ <Compile Include="Cms\IccColorSpace.cs" />
+ <Compile Include="Cms\IccProfileClass.cs" />
+ <Compile Include="Cms\Intent.cs" />
+ <Compile Include="Cms\NativeMethods.cs" />
+ <Compile Include="Cms\Profile.cs" />
+ <Compile Include="Cms\SaveException.cs" />
+ <Compile Include="Cms\Transform.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Core/FSpot.Core.csproj b/src/Core/FSpot.Core/FSpot.Core.csproj
index 4bc2f6a..45f6e2d 100644
--- a/src/Core/FSpot.Core/FSpot.Core.csproj
+++ b/src/Core/FSpot.Core/FSpot.Core.csproj
@@ -1,130 +1,130 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Core</RootNamespace>
- <AssemblyName>FSpot.Core</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <WarningLevel>4</WarningLevel>
- <DebugSymbols>true</DebugSymbols>
- <DefineConstants>ENABLE_TESTS</DefineConstants>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Core\BrowsableCollectionProxy.cs" />
- <Compile Include="FSpot.Core\BrowsableEventArgs.cs" />
- <Compile Include="FSpot.Core\BrowsablePointer.cs" />
- <Compile Include="FSpot.Core\BrowsablePointerChangedEventArgs.cs" />
- <Compile Include="FSpot.Core\Category.cs" />
- <Compile Include="FSpot.Core\DbItem.cs" />
- <Compile Include="FSpot.Core\Tag.cs" />
- <Compile Include="FSpot.Core\Global.cs" />
- <Compile Include="FSpot.Core\IBrowsableItemChanges.cs" />
- <Compile Include="FSpot.Core\IBrowsableCollection.cs" />
- <Compile Include="FSpot.Core\ILoadable.cs" />
- <Compile Include="FSpot.Core\PhotoChanges.cs" />
- <Compile Include="FSpot.Core\PhotosChanges.cs" />
- <Compile Include="FSpot.Core\Roll.cs" />
- <Compile Include="FSpot.Core\Defines.cs" />
- <Compile Include="FSpot.Core\IPhoto.cs" />
- <Compile Include="FSpot.Core\IPhotoExtensions.cs" />
- <Compile Include="FSpot.Core\IPhotoComparer.cs" />
- <Compile Include="FSpot.Core\IPhotoVersion.cs" />
- <Compile Include="FSpot.Core\IPhotoVersionable.cs" />
- <Compile Include="FSpot.Core\FilePhoto.cs" />
- <Compile Include="FSpot.Core\PhotoList.cs" />
- <Compile Include="FSpot.Core\IInvalidPhotoCheck.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="gdk-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="System.Xml" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- <Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="FSpot.Core.addins">
- <LogicalName>FSpot.Core.addins</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Core</RootNamespace>
+ <AssemblyName>FSpot.Core</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <WarningLevel>4</WarningLevel>
+ <DebugSymbols>true</DebugSymbols>
+ <DefineConstants>ENABLE_TESTS</DefineConstants>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Core\BrowsableCollectionProxy.cs" />
+ <Compile Include="FSpot.Core\BrowsableEventArgs.cs" />
+ <Compile Include="FSpot.Core\BrowsablePointer.cs" />
+ <Compile Include="FSpot.Core\BrowsablePointerChangedEventArgs.cs" />
+ <Compile Include="FSpot.Core\Category.cs" />
+ <Compile Include="FSpot.Core\DbItem.cs" />
+ <Compile Include="FSpot.Core\Tag.cs" />
+ <Compile Include="FSpot.Core\Global.cs" />
+ <Compile Include="FSpot.Core\IBrowsableItemChanges.cs" />
+ <Compile Include="FSpot.Core\IBrowsableCollection.cs" />
+ <Compile Include="FSpot.Core\ILoadable.cs" />
+ <Compile Include="FSpot.Core\PhotoChanges.cs" />
+ <Compile Include="FSpot.Core\PhotosChanges.cs" />
+ <Compile Include="FSpot.Core\Roll.cs" />
+ <Compile Include="FSpot.Core\Defines.cs" />
+ <Compile Include="FSpot.Core\IPhoto.cs" />
+ <Compile Include="FSpot.Core\IPhotoExtensions.cs" />
+ <Compile Include="FSpot.Core\IPhotoComparer.cs" />
+ <Compile Include="FSpot.Core\IPhotoVersion.cs" />
+ <Compile Include="FSpot.Core\IPhotoVersionable.cs" />
+ <Compile Include="FSpot.Core\FilePhoto.cs" />
+ <Compile Include="FSpot.Core\PhotoList.cs" />
+ <Compile Include="FSpot.Core\IInvalidPhotoCheck.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="gdk-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="System.Xml" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="System" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="FSpot.Core.addins">
+ <LogicalName>FSpot.Core.addins</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
index 4dc47c9..341cfb1 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsableCollectionProxy.cs
@@ -65,11 +65,11 @@ namespace FSpot.Core {
return collection.IndexOf (item);
}
- public bool Contains (IPhoto item)
- {
- return collection != null && collection.Contains (item);
- }
-
+ public bool Contains (IPhoto item)
+ {
+ return collection != null && collection.Contains (item);
+ }
+
public IPhoto this [int index] {
get {
if (collection == null)
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs
index c35034a..9be6987 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsablePointer.cs
@@ -58,10 +58,10 @@ namespace FSpot.Core
}
public IPhoto Current {
- get
- {
- return !IsValid ? null : collection [index];
- }
+ get
+ {
+ return !IsValid ? null : collection [index];
+ }
}
private bool Valid (int val)
@@ -81,8 +81,8 @@ namespace FSpot.Core
public void MoveLast ()
{
Index = collection.Count - 1;
- }
-
+ }
+
public void MoveNext (bool wrap = false)
{
int val = Index;
@@ -92,8 +92,8 @@ namespace FSpot.Core
val = wrap ? 0 : Index;
Index = val;
- }
-
+ }
+
public void MovePrevious (bool wrap = false)
{
int val = Index;
@@ -112,8 +112,8 @@ namespace FSpot.Core
SetIndex (value);
}
}
- }
-
+ }
+
private void SetIndex (int value, IBrowsableItemChanges changes = null)
{
BrowsablePointerChangedEventArgs args = new BrowsablePointerChangedEventArgs (Current, index, changes);
diff --git a/src/Core/FSpot.Core/FSpot.Core/BrowsablePointerChangedEventArgs.cs b/src/Core/FSpot.Core/FSpot.Core/BrowsablePointerChangedEventArgs.cs
index b3f77bf..1a8dd11 100644
--- a/src/Core/FSpot.Core/FSpot.Core/BrowsablePointerChangedEventArgs.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/BrowsablePointerChangedEventArgs.cs
@@ -37,7 +37,7 @@ namespace FSpot.Core
public int PreviousIndex { get; private set; }
public IBrowsableItemChanges Changes { get; private set; }
- public BrowsablePointerChangedEventArgs (IPhoto previous_item, int previous_index, IBrowsableItemChanges changes)
+ public BrowsablePointerChangedEventArgs (IPhoto previous_item, int previous_index, IBrowsableItemChanges changes)
{
PreviousItem = previous_item;
PreviousIndex = previous_index;
diff --git a/src/Core/FSpot.Core/FSpot.Core/DbItem.cs b/src/Core/FSpot.Core/FSpot.Core/DbItem.cs
index 90ff619..33a32f2 100644
--- a/src/Core/FSpot.Core/FSpot.Core/DbItem.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/DbItem.cs
@@ -47,12 +47,12 @@ namespace FSpot.Core
{
public T [] Items { get; private set; }
- public DbItemEventArgs (T [] items)
+ public DbItemEventArgs (T [] items)
{
Items = items;
}
- public DbItemEventArgs (T item)
+ public DbItemEventArgs (T item)
{
Items = new T [] { item };
}
diff --git a/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs b/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
index a2f336f..6d6245f 100644
--- a/src/Core/FSpot.Core/FSpot.Core/FilePhoto.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/FilePhoto.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.Collections.Generic;
-
-using FSpot.Utils;
-
-using Hyena;
-
+//
+
+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/PhotoChanges.cs b/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
index 8d3b283..705ab43 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotoChanges.cs
@@ -48,8 +48,8 @@ namespace FSpot.Core
get {
if (tags_added == null)
return null;
-
- return tags_added.Count == 0 ? null : tags_added.ToArray ();
+
+ return tags_added.Count == 0 ? null : tags_added.ToArray ();
}
set {
foreach (Tag t in value)
@@ -73,7 +73,7 @@ namespace FSpot.Core
if (tags_removed == null)
return null;
- return tags_removed.Count == 0 ? null : tags_removed.ToArray ();
+ return tags_removed.Count == 0 ? null : tags_removed.ToArray ();
}
set {
foreach (Tag t in value)
@@ -97,7 +97,7 @@ namespace FSpot.Core
if (versions_added == null)
return null;
- return versions_added.Count == 0 ? null : versions_added.ToArray ();
+ return versions_added.Count == 0 ? null : versions_added.ToArray ();
}
set {
foreach (uint u in value)
@@ -118,7 +118,7 @@ namespace FSpot.Core
if (versions_removed == null)
return null;
- return versions_removed.Count == 0 ? null : versions_removed.ToArray ();
+ return versions_removed.Count == 0 ? null : versions_removed.ToArray ();
}
set {
foreach (uint u in value)
@@ -143,7 +143,7 @@ namespace FSpot.Core
if (versions_modified == null)
return null;
- return versions_modified.Count == 0 ? null : versions_modified.ToArray ();
+ return versions_modified.Count == 0 ? null : versions_modified.ToArray ();
}
set {
foreach (uint u in value)
@@ -163,6 +163,6 @@ namespace FSpot.Core
return;
versions_modified.Add (v);
- }
+ }
}
}
diff --git a/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs b/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
index dec1f47..ab0ea2a 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotoList.cs
@@ -115,7 +115,7 @@ namespace FSpot.Core
}
public IPhoto[] Items {
- get { return cache ?? (cache = list.ToArray()); }
+ get { return cache ?? (cache = list.ToArray()); }
set {
list.Clear ();
Add (value);
diff --git a/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs b/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
index 34ad629..365b3cc 100644
--- a/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/PhotosChanges.cs
@@ -106,12 +106,12 @@ namespace FSpot.Core
else
changes &= ~ Changes.Description;
}
- }
-
- public virtual bool TagsChanged { get; private set; }
-
- public virtual bool VersionsChanged { get; private set; }
-
+ }
+
+ public virtual bool TagsChanged { get; private set; }
+
+ public virtual bool VersionsChanged { get; private set; }
+
public bool RollIdChanged {
get { return (changes & Changes.RollId) == Changes.RollId; }
set {
@@ -147,10 +147,10 @@ namespace FSpot.Core
return changes;
}
- public PhotosChanges ()
- {
- TagsChanged = false;
- VersionsChanged = false;
- }
+ public PhotosChanges ()
+ {
+ TagsChanged = false;
+ VersionsChanged = false;
+ }
}
}
diff --git a/src/Core/FSpot.Core/FSpot.Core/Tag.cs b/src/Core/FSpot.Core/FSpot.Core/Tag.cs
index 87564e2..3b70d03 100644
--- a/src/Core/FSpot.Core/FSpot.Core/Tag.cs
+++ b/src/Core/FSpot.Core/FSpot.Core/Tag.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 FSpot.Utils;
-
-using Gdk;
-
+//
+
+using System;
+
+using FSpot.Utils;
+
+using Gdk;
+
using Hyena;
namespace FSpot.Core
@@ -144,14 +144,14 @@ namespace FSpot.Core
if (tag == null)
throw new ArgumentNullException ("tag");
- if (Category == tag.Category)
- {
+ if (Category == tag.Category)
+ {
if (SortPriority == tag.SortPriority)
- return Name.CompareTo (tag.Name);
- return SortPriority - tag.SortPriority;
- }
-
- return Category.CompareTo (tag.Category);
+ return Name.CompareTo (tag.Name);
+ return SortPriority - tag.SortPriority;
+ }
+
+ return Category.CompareTo (tag.Category);
}
public bool IsAncestorOf (Tag tag)
diff --git a/src/Core/FSpot.Gui/FSpot.Gui.csproj b/src/Core/FSpot.Gui/FSpot.Gui.csproj
index 53543f7..ee8572c 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui.csproj
+++ b/src/Core/FSpot.Gui/FSpot.Gui.csproj
@@ -1,157 +1,157 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Widgets</RootNamespace>
- <AssemblyName>FSpot.Gui</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Widgets\ApplicationActivatedEventArgs.cs" />
- <Compile Include="FSpot.Widgets\BuilderWindow.cs" />
- <Compile Include="FSpot.Widgets\CheckPattern.cs" />
- <Compile Include="FSpot.Widgets\Curve.cs" />
- <Compile Include="FSpot.Widgets\CurveType.cs" />
- <Compile Include="FSpot.Widgets\CustomPrintWidget.cs" />
- <Compile Include="FSpot.Widgets\DateEdit.cs" />
- <Compile Include="FSpot.Widgets\DateEditFlags.cs" />
- <Compile Include="FSpot.Widgets\HighlightedBox.cs" />
- <Compile Include="FSpot.Widgets\ImageView.cs" />
- <Compile Include="FSpot.Widgets\Layout.cs" />
- <Compile Include="FSpot.Widgets\MenuButton.cs" />
- <Compile Include="FSpot.Widgets\OpenWithMenu.cs" />
- <Compile Include="FSpot.Widgets\PointerMode.cs" />
- <Compile Include="FSpot.Widgets\SaneTreeView.cs" />
- <Compile Include="FSpot.Widgets\ScrolledView.cs" />
- <Compile Include="FSpot.Transitions\CairoTransition.cs" />
- <Compile Include="FSpot.Transitions\SlideShowTransition.cs" />
- <Compile Include="FSpot.Widgets\ImageView_Panning.cs" />
- <Compile Include="FSpot.Widgets\ImageView_Container.cs" />
- <Compile Include="FSpot.Gui\WindowOpacityFader.cs" />
- <Compile Include="FSpot.Gui\CompositeUtils.cs" />
- <Compile Include="FSpot.Widgets\ToolTipWindow.cs" />
- <Compile Include="FSpot.Widgets\RatingEntry.cs" />
- <Compile Include="FSpot.Widgets\RatingRenderer.cs" />
- <Compile Include="FSpot.Widgets\CellGridView.cs" />
- <Compile Include="FSpot.Widgets\SelectionCollection.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </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="Mono.Posix" />
- <Reference Include="System" />
- <Reference Include="Mono.Cairo" />
- <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\FSpot.Bling\FSpot.Bling.csproj">
- <Project>{7281334F-0B1D-4383-9EA2-6740D56ADCDE}</Project>
- <Name>FSpot.Bling</Name>
- </ProjectReference>
- <ProjectReference Include="..\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Widgets</RootNamespace>
+ <AssemblyName>FSpot.Gui</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Widgets\ApplicationActivatedEventArgs.cs" />
+ <Compile Include="FSpot.Widgets\BuilderWindow.cs" />
+ <Compile Include="FSpot.Widgets\CheckPattern.cs" />
+ <Compile Include="FSpot.Widgets\Curve.cs" />
+ <Compile Include="FSpot.Widgets\CurveType.cs" />
+ <Compile Include="FSpot.Widgets\CustomPrintWidget.cs" />
+ <Compile Include="FSpot.Widgets\DateEdit.cs" />
+ <Compile Include="FSpot.Widgets\DateEditFlags.cs" />
+ <Compile Include="FSpot.Widgets\HighlightedBox.cs" />
+ <Compile Include="FSpot.Widgets\ImageView.cs" />
+ <Compile Include="FSpot.Widgets\Layout.cs" />
+ <Compile Include="FSpot.Widgets\MenuButton.cs" />
+ <Compile Include="FSpot.Widgets\OpenWithMenu.cs" />
+ <Compile Include="FSpot.Widgets\PointerMode.cs" />
+ <Compile Include="FSpot.Widgets\SaneTreeView.cs" />
+ <Compile Include="FSpot.Widgets\ScrolledView.cs" />
+ <Compile Include="FSpot.Transitions\CairoTransition.cs" />
+ <Compile Include="FSpot.Transitions\SlideShowTransition.cs" />
+ <Compile Include="FSpot.Widgets\ImageView_Panning.cs" />
+ <Compile Include="FSpot.Widgets\ImageView_Container.cs" />
+ <Compile Include="FSpot.Gui\WindowOpacityFader.cs" />
+ <Compile Include="FSpot.Gui\CompositeUtils.cs" />
+ <Compile Include="FSpot.Widgets\ToolTipWindow.cs" />
+ <Compile Include="FSpot.Widgets\RatingEntry.cs" />
+ <Compile Include="FSpot.Widgets\RatingRenderer.cs" />
+ <Compile Include="FSpot.Widgets\CellGridView.cs" />
+ <Compile Include="FSpot.Widgets\SelectionCollection.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </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="Mono.Posix" />
+ <Reference Include="System" />
+ <Reference Include="Mono.Cairo" />
+ <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\FSpot.Bling\FSpot.Bling.csproj">
+ <Project>{7281334F-0B1D-4383-9EA2-6740D56ADCDE}</Project>
+ <Name>FSpot.Bling</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs b/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
index db8de5b..00cb34f 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.cs
+++ b/src/Core/FSpot.Gui/FSpot.Gui/CompositeUtils.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.Runtime.InteropServices;
-
-using FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
+//
+
+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.Transitions/CairoTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
index 6dac90e..774329e 100644
--- a/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
@@ -33,7 +33,7 @@ using Gdk;
namespace FSpot.Transitions
{
public abstract class CairoTransition : SlideShowTransition
- {
+ {
protected CairoTransition (string name) : base (name)
{
}
diff --git a/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
index b25a3d7..4c3d3fa 100644
--- a/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
@@ -32,14 +32,14 @@ using Gdk;
namespace FSpot.Transitions
{
public abstract class SlideShowTransition
- {
+ {
protected SlideShowTransition (string name)
{
Name = name;
- }
-
- public string Name { get; private set; }
-
+ }
+
+ public string Name { get; private set; }
+
public abstract void Draw (Drawable d, Pixbuf prev, Pixbuf next, int width, int height, double progress);
}
}
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs
index 65d5ac9..a02e505 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ApplicationActivatedEventArgs.cs
@@ -36,7 +36,7 @@ namespace FSpot.Widgets
{
public AppInfo AppInfo { get; private set; }
- public ApplicationActivatedEventArgs (AppInfo app)
+ public ApplicationActivatedEventArgs (AppInfo app)
{
AppInfo = app;
}
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
index fed0c9d..79fd777 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CellGridView.cs
@@ -43,12 +43,12 @@ namespace FSpot.Widgets
public abstract class CellGridView : Gtk.Layout
{
-#region Constructors
-
+#region Constructors
+
protected CellGridView (IntPtr raw) : base (raw)
{
- }
-
+ }
+
protected CellGridView () : base (null, null)
{
}
@@ -88,18 +88,18 @@ namespace FSpot.Widgets
#endregion
-#region Private Layout Values
-
+#region Private Layout Values
+
/// <summary>
/// The width of each cell. It is set, when the layout is updated. The
/// property <see cref="MinCellWidth"/> is only used when the layout is updated.
- /// </summary>
+ /// </summary>
private int cell_width;
/// <summary>
/// The height of each cell. It is set, when the layout is updated. The
/// property <see cref="MinCellHeight"/> is only used when the layout is updated.
- /// </summary>
+ /// </summary>
private int cell_height;
/// <summary>
@@ -107,8 +107,8 @@ namespace FSpot.Widgets
/// layout is updated. The property <see cref="CellCount"/> is only used when
/// the layout is updated.
/// </summary>
- private int cell_count;
-
+ private int cell_count;
+
/// <summary>
/// The number of rows which are needed to display all cells.
/// </summary>
@@ -152,12 +152,12 @@ namespace FSpot.Widgets
border_size = value;
QueueResize ();
}
- }
-
- public int VisibleRows { get; private set; }
-
- public int VisibleColums { get; private set; }
-
+ }
+
+ public int VisibleRows { get; private set; }
+
+ public int VisibleColums { get; private set; }
+
#endregion
#region Public Methods
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs b/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
index 811b4af..1cd6aa8 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/Curve.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/Curve.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 System;
-using System.Collections.Generic;
-
-using Gdk;
+//
+
+using System;
+using System.Collections.Generic;
+
+using Gdk;
using Gtk;
namespace FSpot.Widgets
@@ -39,7 +39,7 @@ namespace FSpot.Widgets
public class Curve : DrawingArea
{
#region public API
- public Curve ()
+ public Curve ()
{
Events |= EventMask.ExposureMask
| EventMask.PointerMotionMask
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs b/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
index 388562a..9b47258 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/CustomPrintWidget.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 System;
-
-using Gtk;
-
+//
+
+using System;
+
+using Gtk;
+
using Mono.Unix;
namespace FSpot.Widgets
@@ -45,8 +45,8 @@ namespace FSpot.Widgets
Zoom,
Scaled,
Fill,
- }
-
+ }
+
CheckButton fullpage;
RadioButton ppp1, ppp2, ppp4, ppp9, ppp20, ppp30;
@@ -93,14 +93,14 @@ namespace FSpot.Widgets
}
public FitMode Fitmode {
- get
- {
- if (zoom.Active) return FitMode.Zoom;
- if (fill.Active) return FitMode.Fill;
- if (scaled.Active) return FitMode.Scaled;
-
- throw new Exception ("Something is wrong on this GUI");
- }
+ get
+ {
+ if (zoom.Active) return FitMode.Zoom;
+ if (fill.Active) return FitMode.Fill;
+ if (scaled.Active) return FitMode.Scaled;
+
+ throw new Exception ("Something is wrong on this GUI");
+ }
}
public int PhotosPerPage {
@@ -114,10 +114,10 @@ namespace FSpot.Widgets
throw new Exception ("Something is wrong on this GUI");
}
- }
-
- public Image PreviewImage { get; private set; }
-
+ }
+
+ public Image PreviewImage { get; private set; }
+
public bool Repeat {
get { return repeat.Active; }
}
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs b/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
index 56f0b5d..b377646 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/DateEdit.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 System;
-
-using Gtk;
-
+//
+
+using System;
+
+using Gtk;
+
using Mono.Unix;
namespace FSpot.Widgets
@@ -43,9 +43,9 @@ namespace FSpot.Widgets
#region public API
public DateEdit () : this (DateTimeOffset.Now)
{
- }
-
- public DateEdit (DateTimeOffset dateTimeOffset, DateEditFlags dateEditFlags = DateEditFlags.None)
+ }
+
+ public DateEdit (DateTimeOffset dateTimeOffset, DateEditFlags dateEditFlags = DateEditFlags.None)
{
this.dateEditFlags = dateEditFlags;
this.dateTimeOffset = dateTimeOffset;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs b/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
index 1e50201..3df08d6 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/HighlightedBox.cs
@@ -39,7 +39,7 @@ namespace FSpot.Widgets
protected HighlightedBox (IntPtr raw) : base (raw) {}
- public HighlightedBox (Widget child)
+ public HighlightedBox (Widget child)
{
Child = child;
AppPaintable = true;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
index 12a060b..f618857 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView.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 FSpot.Utils;
-
-using Gdk;
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+
+using FSpot.Utils;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
using TagLib.Image;
namespace FSpot.Widgets
@@ -45,16 +45,16 @@ namespace FSpot.Widgets
public partial class ImageView : Container
{
#region public API
- protected ImageView (IntPtr raw) : base (raw)
- {
- MIN_ZOOM = 0.1;
- MAX_ZOOM = 10.0;
- }
-
- public ImageView (Adjustment hadjustment, Adjustment vadjustment, bool can_select)
- {
- MIN_ZOOM = 0.1;
- MAX_ZOOM = 10.0;
+ protected ImageView (IntPtr raw) : base (raw)
+ {
+ MIN_ZOOM = 0.1;
+ MAX_ZOOM = 10.0;
+ }
+
+ public ImageView (Adjustment hadjustment, Adjustment vadjustment, bool can_select)
+ {
+ MIN_ZOOM = 0.1;
+ MAX_ZOOM = 10.0;
OnSetScrollAdjustments (hadjustment, vadjustment);
AdjustmentsChanged += ScrollToAdjustments;
WidgetFlags &= ~WidgetFlags.NoWindow;
@@ -255,12 +255,12 @@ namespace FSpot.Widgets
#region protected API
- protected static double ZOOM_FACTOR = 1.1;
-
- protected double MAX_ZOOM { get; set; }
-
- protected double MIN_ZOOM { get; set; }
-
+ protected static double ZOOM_FACTOR = 1.1;
+
+ protected double MAX_ZOOM { get; set; }
+
+ protected double MIN_ZOOM { get; set; }
+
bool upscale;
protected void ZoomFit ()
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
index a623642..6b9be5d 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ImageView_Container.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.Collections.Generic;
-using System.Linq;
+//
+
+using System.Collections.Generic;
+using System.Linq;
using Gtk;
namespace FSpot.Widgets
{
public partial class ImageView : Container
- {
+ {
readonly List<LayoutChild> children = new List<LayoutChild> ();
#region container
@@ -47,17 +47,17 @@ namespace FSpot.Widgets
protected override void OnRemoved (Gtk.Widget widget)
{
LayoutChild child = null;
- foreach (var c in children.Where(c => child.Widget == widget))
- {
+ foreach (var c in children.Where(c => child.Widget == widget))
+ {
child = c;
- break;
- }
-
- if (child == null)
- return;
-
+ break;
+ }
+
+ if (child == null)
+ return;
+
widget.Unparent ();
- children.Remove (child);
+ children.Remove (child);
}
protected override void ForAll (bool include_internals, Gtk.Callback callback)
@@ -73,9 +73,9 @@ namespace FSpot.Widgets
#region children
class LayoutChild
- {
- public Widget Widget { get; private set; }
-
+ {
+ public Widget Widget { get; private set; }
+
public int X { get; set; }
public int Y { get; set; }
@@ -87,11 +87,11 @@ namespace FSpot.Widgets
}
}
- LayoutChild GetChild (Gtk.Widget widget)
- {
- return children.FirstOrDefault(child => child.Widget == widget);
- }
-
+ LayoutChild GetChild (Gtk.Widget widget)
+ {
+ return children.FirstOrDefault(child => child.Widget == widget);
+ }
+
#endregion
#region Public API
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs b/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
index 3af7e9f..b769106 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/Layout.cs
@@ -28,8 +28,8 @@
//
using System;
-using System.Collections.Generic;
-using Gdk;
+using System.Collections.Generic;
+using Gdk;
using Hyena;
namespace FSpot.Widgets
@@ -41,17 +41,17 @@ namespace FSpot.Widgets
{
}
- public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment)
- {
- Height = 100;
- Width = 100;
- BinWindow = null;
+ public Layout (Gtk.Adjustment hadjustment, Gtk.Adjustment vadjustment)
+ {
+ Height = 100;
+ Width = 100;
+ BinWindow = null;
OnSetScrollAdjustments (hadjustment, vadjustment);
children = new List<LayoutChild> ();
- }
-
- public Window BinWindow { get; private set; }
-
+ }
+
+ public Window BinWindow { get; private set; }
+
Gtk.Adjustment hadjustment;
public Gtk.Adjustment Hadjustment {
get { return hadjustment; }
@@ -62,12 +62,12 @@ namespace FSpot.Widgets
public Gtk.Adjustment Vadjustment {
get { return vadjustment; }
set { OnSetScrollAdjustments (Hadjustment, vadjustment); }
- }
-
- public uint Width { get; private set; }
-
- public uint Height { get; private set; }
-
+ }
+
+ public uint Width { get; private set; }
+
+ public uint Height { get; private set; }
+
class LayoutChild {
public Gtk.Widget Widget { get; private set; }
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/MenuButton.cs b/src/Core/FSpot.Gui/FSpot.Widgets/MenuButton.cs
index c4ed846..9d14a00 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/MenuButton.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/MenuButton.cs
@@ -34,8 +34,8 @@ namespace FSpot.Widgets
public class MenuButton : Button
{
Label label;
- Arrow arrow;
-
+ Arrow arrow;
+
public new string Label {
get { return label.Text; }
set { label.Text = value; }
@@ -46,19 +46,19 @@ namespace FSpot.Widgets
public ArrowType ArrowType {
get { return arrow.ArrowType; }
set { arrow.ArrowType = value; }
- }
-
- public Menu Menu { get; set; }
-
+ }
+
+ public Menu Menu { get; set; }
+
public MenuButton () : this (null)
{
- }
-
+ }
+
public MenuButton (string label, Menu menu = null) : this (label, menu, ArrowType.Down)
{
}
- public MenuButton (string label, Menu menu, ArrowType arrow_type)
+ public MenuButton (string label, Menu menu, ArrowType arrow_type)
{
HBox hbox = new HBox ();
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
index 71cd3e1..b6f65dd 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/OpenWithMenu.cs
@@ -51,17 +51,17 @@ namespace FSpot.Widgets {
return null;
return ignore_apps.ToArray ();
}
- }
-
- public bool ShowIcons { get; set; }
-
+ }
+
+ public bool ShowIcons { get; set; }
+
public OpenWithMenu (TypeFetcher type_fetcher) : this (type_fetcher, null)
{
}
public OpenWithMenu (TypeFetcher type_fetcher, params string [] ignore_apps)
- {
- ShowIcons = true;
+ {
+ ShowIcons = true;
this.type_fetcher = type_fetcher;
this.ignore_apps = new List<string> (ignore_apps);
}
@@ -70,9 +70,9 @@ namespace FSpot.Widgets {
public void Populate (object sender, EventArgs args)
{
Widget [] dead_pool = Children;
- foreach (Widget t in dead_pool)
- t.Destroy ();
-
+ foreach (Widget t in dead_pool)
+ t.Destroy ();
+
foreach (AppInfo app in ApplicationsFor (type_fetcher ())) {
AppMenuItem i = new AppMenuItem (app, ShowIcons);
i.Activated += HandleItemActivated;
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs b/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
index c693cb1..d356f44 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/RatingRenderer.cs
@@ -25,20 +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 FSpot.Utils;
-
-using Gdk;
-
+//
+
+using FSpot.Utils;
+
+using Gdk;
+
using Hyena.Gui;
namespace FSpot.Widgets
{
public class RatingRenderer : Hyena.Gui.RatingRenderer
- {
- private const int REQUESTED_ICON_SIZE = 16;
-
+ {
+ private const int REQUESTED_ICON_SIZE = 16;
+
#region Shared Pixbufs
// cache the unscaled pixbufs for all instances
@@ -177,8 +177,8 @@ namespace FSpot.Widgets
#endregion
-#region Constructors / Destructor
-
+#region Constructors / Destructor
+
~RatingRenderer ()
{
ResetCachedPixbufs ();
@@ -186,8 +186,8 @@ namespace FSpot.Widgets
#endregion
-#region Drawing Code
-
+#region Drawing Code
+
public Pixbuf RenderPixbuf (bool showEmptyStars = false)
{
return RenderPixbuf (showEmptyStars, false, MinRating - 1, 0.0, 0.0, 1.0);
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs b/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
index 9ff285f..de5598c 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/ScrolledView.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 System;
-
-using FSpot.Utils;
-
+//
+
+using System;
+
+using FSpot.Utils;
+
using Gtk;
namespace FSpot.Widgets {
@@ -41,7 +41,7 @@ namespace FSpot.Widgets {
public ScrolledView (IntPtr raw) : base (raw) {}
- public ScrolledView ()
+ public ScrolledView ()
{
ScrolledWindow = new ScrolledWindow (null, null);
this.Put (ScrolledWindow, 0, 0);
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs b/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
index 227195c..b6edcb6 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
+++ b/src/Core/FSpot.Gui/FSpot.Widgets/SelectionCollection.cs
@@ -1,38 +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.Collections;
-using System.Collections.Generic;
-
-using System.Linq;
-
+//
+// 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
@@ -139,8 +139,8 @@ namespace FSpot.Widgets
}
return items;
}
- }
-
+ }
+
public void Clear (bool update = true)
{
int [] ids = Ids;
@@ -176,8 +176,8 @@ namespace FSpot.Widgets
return false;
return Contains (parent [num]);
- }
-
+ }
+
public void Add (int num, bool notify = true)
{
if (num == -1)
@@ -220,7 +220,7 @@ namespace FSpot.Widgets
Remove (item, notify);
}
-
+
private void Remove (IPhoto item, bool notify = true)
{
if (item == null)
@@ -274,8 +274,8 @@ namespace FSpot.Widgets
Remove (cell_num, notify);
else
Add (cell_num, notify);
- }
-
+ }
+
public void SelectionInvert ()
{
int [] changed_cell = new int[parent.Count];
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Base/FSpotCompat.cs b/src/Core/FSpot.JobScheduler/Banshee.Base/FSpotCompat.cs
index e94ce7e..02fb93e 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Base/FSpotCompat.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Base/FSpotCompat.cs
@@ -30,12 +30,12 @@
namespace Banshee.Base
{
public static class Globals
- {
- static Globals()
- {
- Debugging = false;
- }
-
- public static bool Debugging { get; private set; }
+ {
+ static Globals()
+ {
+ Debugging = false;
+ }
+
+ public static bool Debugging { get; private set; }
}
}
diff --git a/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs b/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
index e533a96..e054fe9 100644
--- a/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
+++ b/src/Core/FSpot.JobScheduler/Banshee.Kernel/Scheduler.cs
@@ -53,12 +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.Collections.Generic;
-using System.Threading;
-
+ */
+
+using System;
+using System.Collections.Generic;
+using System.Threading;
+
using Hyena;
namespace Banshee.Kernel
diff --git a/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj b/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj
index 7907262..ecb8b07 100644
--- a/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj
+++ b/src/Core/FSpot.JobScheduler/FSpot.JobScheduler.csproj
@@ -1,104 +1,104 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.JobScheduler</RootNamespace>
- <AssemblyName>FSpot.JobScheduler</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="Banshee.Base\FSpotCompat.cs" />
- <Compile Include="Banshee.Kernel\IInstanceCriticalJob.cs" />
- <Compile Include="Banshee.Kernel\IJob.cs" />
- <Compile Include="Banshee.Kernel\IntervalHeap.cs" />
- <Compile Include="Banshee.Kernel\JobPriority.cs" />
- <Compile Include="Banshee.Kernel\Scheduler.cs" />
- <Compile Include="FSpot.Jobs\JobStatus.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{46049AF4-97E0-4EE5-A5CB-A9D0C9026B25}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.JobScheduler</RootNamespace>
+ <AssemblyName>FSpot.JobScheduler</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="Banshee.Base\FSpotCompat.cs" />
+ <Compile Include="Banshee.Kernel\IInstanceCriticalJob.cs" />
+ <Compile Include="Banshee.Kernel\IJob.cs" />
+ <Compile Include="Banshee.Kernel\IntervalHeap.cs" />
+ <Compile Include="Banshee.Kernel\JobPriority.cs" />
+ <Compile Include="Banshee.Kernel\Scheduler.cs" />
+ <Compile Include="FSpot.Jobs\JobStatus.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Platform/FSpot.Platform.csproj b/src/Core/FSpot.Platform/FSpot.Platform.csproj
index b5406c2..d3af7a7 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform.csproj
+++ b/src/Core/FSpot.Platform/FSpot.Platform.csproj
@@ -1,104 +1,104 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Platform</RootNamespace>
- <AssemblyName>FSpot.Platform</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Platform\Desktop.cs" />
- <Compile Include="FSpot.Platform\PreferenceBackend.cs" />
- <Compile Include="FSpot.Platform\ScreenSaver.cs" />
- <Compile Include="FSpot.Platform\WebProxy.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Reference Include="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="System" />
- <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" />
- <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Platform</RootNamespace>
+ <AssemblyName>FSpot.Platform</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Platform\Desktop.cs" />
+ <Compile Include="FSpot.Platform\PreferenceBackend.cs" />
+ <Compile Include="FSpot.Platform\ScreenSaver.cs" />
+ <Compile Include="FSpot.Platform\WebProxy.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="gconf-sharp, Version=2.24.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="System" />
+ <Reference Include="dbus-sharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" />
+ <Reference Include="dbus-sharp-glib, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5675b0c3093115b5" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
index db08246..d78e3c8 100644
--- a/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
+++ b/src/Core/FSpot.Platform/FSpot.Platform/PreferenceBackend.cs
@@ -50,7 +50,7 @@ namespace FSpot.Platform
[Serializable]
public class NoSuchKeyException : Exception
{
- public NoSuchKeyException ()
+ public NoSuchKeyException ()
{
}
@@ -80,8 +80,8 @@ namespace FSpot.Platform
return client;
}
}
- }
-
+ }
+
public object Get (string key)
{
try {
diff --git a/src/Core/FSpot.Query/FSpot.Query.csproj b/src/Core/FSpot.Query/FSpot.Query.csproj
index ea4bfbc..e647766 100644
--- a/src/Core/FSpot.Query/FSpot.Query.csproj
+++ b/src/Core/FSpot.Query/FSpot.Query.csproj
@@ -1,113 +1,113 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Query</RootNamespace>
- <AssemblyName>FSpot.Query</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG ENABLE_TESTS</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Query\ConditionWrapper.cs" />
- <Compile Include="FSpot.Query\DateRange.cs" />
- <Compile Include="FSpot.Query\FolderSet.cs" />
- <Compile Include="FSpot.Query\IOrderCondition.cs" />
- <Compile Include="FSpot.Query\IQueryCondition.cs" />
- <Compile Include="FSpot.Query\LogicalTerm.cs" />
- <Compile Include="FSpot.Query\OrderByTime.cs" />
- <Compile Include="FSpot.Query\RatingRange.cs" />
- <Compile Include="FSpot.Query\RollSet.cs" />
- <Compile Include="FSpot.Query\UntaggedCondition.cs" />
- <Compile Include="FSpot.Query\Tests\LogicalTermTests.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Query</RootNamespace>
+ <AssemblyName>FSpot.Query</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG ENABLE_TESTS</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Query\ConditionWrapper.cs" />
+ <Compile Include="FSpot.Query\DateRange.cs" />
+ <Compile Include="FSpot.Query\FolderSet.cs" />
+ <Compile Include="FSpot.Query\IOrderCondition.cs" />
+ <Compile Include="FSpot.Query\IQueryCondition.cs" />
+ <Compile Include="FSpot.Query\LogicalTerm.cs" />
+ <Compile Include="FSpot.Query\OrderByTime.cs" />
+ <Compile Include="FSpot.Query\RatingRange.cs" />
+ <Compile Include="FSpot.Query\RollSet.cs" />
+ <Compile Include="FSpot.Query\UntaggedCondition.cs" />
+ <Compile Include="FSpot.Query\Tests\LogicalTermTests.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs b/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
index 222a986..5c0f4d5 100644
--- a/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
+++ b/src/Core/FSpot.Query/FSpot.Query/LogicalTerm.cs
@@ -25,13 +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.Linq;
-using FSpot.Core;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using FSpot.Core;
+
using Hyena;
namespace FSpot.Query
@@ -57,8 +57,8 @@ namespace FSpot.Query
internal static string SqlClause (params TagTerm [] tags)
{
- List<string> list = new List<string> (tags.Length);
- list.AddRange(tags.Select(tag => tag.Tag.Id.ToString()));
+ List<string> list = new List<string> (tags.Length);
+ list.AddRange(tags.Select(tag => tag.Tag.Id.ToString()));
return SqlClause (list.ToArray ());
}
@@ -67,9 +67,9 @@ namespace FSpot.Query
if (tagids.Length == 0)
return null;
if (tagids.Length == 1)
- return String.Format (" (photos.id IN (SELECT photo_id FROM photo_tags WHERE tag_id = {0})) ", tagids[0]);
-
- return String.Format (" (photos.id IN (SELECT photo_id FROM photo_tags WHERE tag_id IN ({0}))) ", String.Join (", ", tagids));
+ return String.Format (" (photos.id IN (SELECT photo_id FROM photo_tags WHERE tag_id = {0})) ", tagids[0]);
+
+ return String.Format (" (photos.id IN (SELECT photo_id FROM photo_tags WHERE tag_id IN ({0}))) ", String.Join (", ", tagids));
}
public void Dispose ()
@@ -102,8 +102,8 @@ namespace FSpot.Query
public static OrTerm SearchMultiple (string text, params string[] fields)
{
- List<TextTerm> terms = new List<TextTerm> (fields.Length);
- terms.AddRange(fields.Select(field => new TextTerm(text, field)));
+ List<TextTerm> terms = new List<TextTerm> (fields.Length);
+ terms.AddRange(fields.Select(field => new TextTerm(text, field)));
return new OrTerm (terms.ToArray ());
}
@@ -111,9 +111,9 @@ namespace FSpot.Query
{
return String.Format (" {0} LIKE %{1}% ", Field, Text);
}
- }
-
- // FIXME: This is never used
+ }
+
+ // FIXME: This is never used
public class NotTerm : LogicalTerm
{
public LogicalTerm Term { get; private set; }
@@ -138,18 +138,18 @@ namespace FSpot.Query
protected string [] ToStringArray ()
{
- List<string> ls = new List<string> (terms.Count);
- ls.AddRange(terms.Select(term => term.SqlClause()));
+ List<string> ls = new List<string> (terms.Count);
+ ls.AddRange(terms.Select(term => term.SqlClause()));
return ls.ToArray ();
}
- public static string SqlClause (string op, string[] items)
- {
+ public static string SqlClause (string op, string[] items)
+ {
if (items.Length == 1)
- return items [0];
-
- return " (" + String.Join (String.Format (" {0} ", op), items) + ") ";
- }
+ return items [0];
+
+ return " (" + String.Join (String.Format (" {0} ", op), items) + ") ";
+ }
}
public class OrTerm : NAryOperator
@@ -182,9 +182,9 @@ namespace FSpot.Query
otherterms.Insert (0, TagTerm.SqlClause (tagterms.ToArray ()));
return SqlClause ("OR", otherterms.ToArray ());
}
- }
-
- // FIXME: This is never used
+ }
+
+ // FIXME: This is never used
public class AndTerm : NAryOperator
{
public AndTerm (params LogicalTerm[] terms)
diff --git a/src/Core/FSpot.Utils/FSpot.Utils.csproj b/src/Core/FSpot.Utils/FSpot.Utils.csproj
index ab60ba0..27eeb84 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils.csproj
+++ b/src/Core/FSpot.Utils/FSpot.Utils.csproj
@@ -1,133 +1,133 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{CE160879-1BF0-4711-A18F-FDA2772900FA}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Utils</RootNamespace>
- <AssemblyName>FSpot.Utils</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG ENABLE_TESTS</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Utils\Cache.cs" />
- <Compile Include="FSpot.Utils\CairoUtils.cs" />
- <Compile Include="FSpot.Utils\FileExtensions.cs" />
- <Compile Include="FSpot.Utils\GdkUtils.cs" />
- <Compile Include="FSpot.Utils\GIOTagLibFileAbstraction.cs" />
- <Compile Include="FSpot.Utils\GtkUtil.cs" />
- <Compile Include="FSpot.Utils\HashUtils.cs" />
- <Compile Include="FSpot.Utils\Metadata.cs" />
- <Compile Include="FSpot.Utils\PixbufUtils.cs" />
- <Compile Include="FSpot.Utils\RecursiveFileEnumerator.cs" />
- <Compile Include="FSpot.Utils\SafeUriExtensions.cs" />
- <Compile Include="FSpot.Utils\SidecarXmpExtensions.cs" />
- <Compile Include="FSpot.Utils\UriExtensions.cs" />
- <Compile Include="FSpot.Utils\UriUtils.cs" />
- <Compile Include="FSpot.Utils\XdgThumbnailSpec.cs" />
- <Compile Include="FSpot.Utils\Tests\GIOTagLibFileAbstractionTests.cs" />
- <Compile Include="FSpot.Utils\Tests\ImageTestHelper.cs" />
- <Compile Include="FSpot.Utils\Tests\MetadataTest.cs" />
- <Compile Include="FSpot.Utils\Tests\SafeUriTests.cs" />
- <Compile Include="FSpot.Utils\Tests\SidecarXmpExtensionsTests.cs" />
- <Compile Include="FSpot.Utils\Tests\XdgThumbnailSpecTests.cs" />
- <Compile Include="FSpot.Utils\UriList.cs" />
- <Compile Include="FSpot.Utils\Vector.cs" />
- <Compile Include="FSpot.Utils\DelayedOperation.cs" />
- <Compile Include="FSpot.Utils\TargetListExtensionMethods.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- </ItemGroup>
- <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="Mono.Cairo" />
- <Reference Include="gdk-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="System" />
- <Reference Include="Mono.Posix" />
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
- <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{CE160879-1BF0-4711-A18F-FDA2772900FA}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Utils</RootNamespace>
+ <AssemblyName>FSpot.Utils</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG ENABLE_TESTS</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Utils\Cache.cs" />
+ <Compile Include="FSpot.Utils\CairoUtils.cs" />
+ <Compile Include="FSpot.Utils\FileExtensions.cs" />
+ <Compile Include="FSpot.Utils\GdkUtils.cs" />
+ <Compile Include="FSpot.Utils\GIOTagLibFileAbstraction.cs" />
+ <Compile Include="FSpot.Utils\GtkUtil.cs" />
+ <Compile Include="FSpot.Utils\HashUtils.cs" />
+ <Compile Include="FSpot.Utils\Metadata.cs" />
+ <Compile Include="FSpot.Utils\PixbufUtils.cs" />
+ <Compile Include="FSpot.Utils\RecursiveFileEnumerator.cs" />
+ <Compile Include="FSpot.Utils\SafeUriExtensions.cs" />
+ <Compile Include="FSpot.Utils\SidecarXmpExtensions.cs" />
+ <Compile Include="FSpot.Utils\UriExtensions.cs" />
+ <Compile Include="FSpot.Utils\UriUtils.cs" />
+ <Compile Include="FSpot.Utils\XdgThumbnailSpec.cs" />
+ <Compile Include="FSpot.Utils\Tests\GIOTagLibFileAbstractionTests.cs" />
+ <Compile Include="FSpot.Utils\Tests\ImageTestHelper.cs" />
+ <Compile Include="FSpot.Utils\Tests\MetadataTest.cs" />
+ <Compile Include="FSpot.Utils\Tests\SafeUriTests.cs" />
+ <Compile Include="FSpot.Utils\Tests\SidecarXmpExtensionsTests.cs" />
+ <Compile Include="FSpot.Utils\Tests\XdgThumbnailSpecTests.cs" />
+ <Compile Include="FSpot.Utils\UriList.cs" />
+ <Compile Include="FSpot.Utils\Vector.cs" />
+ <Compile Include="FSpot.Utils\DelayedOperation.cs" />
+ <Compile Include="FSpot.Utils\TargetListExtensionMethods.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" IsAutotoolsProject="true" RelativeConfigureInPath="../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <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="Mono.Cairo" />
+ <Reference Include="gdk-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="System" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+ <Reference Include="taglib-sharp, Version=2.0.4.0, Culture=neutral, PublicKeyToken=db62eba44689b5b0" />
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs b/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
index ced84b9..d6c4aac 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/Cache.cs
@@ -115,7 +115,7 @@ namespace FSpot.Utils
}
public class DisposableCache<TKey, TValue> : Cache<TKey, TValue>, IDisposable
- {
+ {
public DisposableCache (int max_count) : base (max_count)
{
}
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs b/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
index 54d1403..27bc11c 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/GdkUtils.cs
@@ -29,13 +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 System.Runtime.InteropServices;
-
-using Gdk;
-
+//
+
+using System;
+using System.Runtime.InteropServices;
+
+using Gdk;
+
using Hyena;
namespace FSpot.Utils {
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs b/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
index c8453f5..8d5516a 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/Metadata.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/Metadata.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 GLib;
-
-using Hyena;
-
+//
+
+using System;
+
+using GLib;
+
+using Hyena;
+
using TagLib;
namespace FSpot.Utils
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs b/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
index 4144eaf..60a6dec 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/SafeUriExtensions.cs
@@ -25,10 +25,10 @@
// 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;
namespace FSpot
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs b/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
index 7826e33..48662d3 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/UriList.cs
@@ -25,13 +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.Linq;
-using System.Text;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
using Hyena;
namespace FSpot.Utils
@@ -84,9 +84,9 @@ namespace FSpot.Utils
{
StringBuilder list = new StringBuilder ();
- foreach (SafeUri uri in this.TakeWhile(uri => uri != null))
- {
- list.Append (uri + Environment.NewLine);
+ foreach (SafeUri uri in this.TakeWhile(uri => uri != null))
+ {
+ list.Append (uri + Environment.NewLine);
}
return list.ToString ();
diff --git a/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs b/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
index 5ccb071..e5f24fc 100644
--- a/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.cs
+++ b/src/Core/FSpot.Utils/FSpot.Utils/XdgThumbnailSpec.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 System;
-
-using Gdk;
-
+//
+
+using System;
+
+using Gdk;
+
using Hyena;
namespace FSpot.Utils
@@ -163,7 +163,7 @@ namespace FSpot.Utils
var info = file.QueryInfo ("time::modified", GLib.FileQueryInfoFlags.None, null);
- return pixbuf.GetOption (ThumbMTimeOpt) == info.GetAttributeULong ("time::modified").ToString ();
+ return pixbuf.GetOption (ThumbMTimeOpt) == info.GetAttributeULong ("time::modified").ToString ();
}
#endregion
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 8eced06..ddfe765 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,18 +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 FSpot.Editors;
-
-using Gdk;
-using Gtk;
-
-using Hyena;
-
-using Mono.Simd;
+//
+
+using System;
+
+using FSpot.Editors;
+
+using Gdk;
+using Gtk;
+
+using Hyena;
+
+using Mono.Simd;
using Mono.Unix;
namespace FSpot.Addins.Editors {
diff --git a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj
index b3048fd..c59042b 100644
--- a/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.BW/FSpot.Editors.BW.csproj
@@ -1,122 +1,122 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{61DAD6B1-E866-485B-819E-A9E86B793F5E}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Editors</RootNamespace>
- <AssemblyName>FSpot.Editors.BWEditor</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Addins.Editors\BWEditor.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\BWEditor.addin.xml">
- <LogicalName>BWEditor.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- </ItemGroup>
- <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="Mono.Posix" />
- <Reference Include="Mono.Simd" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{61DAD6B1-E866-485B-819E-A9E86B793F5E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Editors</RootNamespace>
+ <AssemblyName>FSpot.Editors.BWEditor</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Editors\BWEditor.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\BWEditor.addin.xml">
+ <LogicalName>BWEditor.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <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="Mono.Posix" />
+ <Reference Include="Mono.Simd" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj
index 0d1c46f..9e753ea 100644
--- a/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Blackout/FSpot.Editors.Blackout.csproj
@@ -1,111 +1,111 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{7011154B-87B0-4C54-98DD-B5FF1E60B75F}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Editors</RootNamespace>
- <AssemblyName>FSpot.Editors.BlackoutEditor</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Addins.Editors\BlackoutEditor.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\BlackoutEditor.addin.xml">
- <LogicalName>BlackoutEditor.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="atk-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="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7011154B-87B0-4C54-98DD-B5FF1E60B75F}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Editors</RootNamespace>
+ <AssemblyName>FSpot.Editors.BlackoutEditor</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Editors\BlackoutEditor.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\BlackoutEditor.addin.xml">
+ <LogicalName>BlackoutEditor.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="atk-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="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj
index 0ef775b..9e0b9d1 100644
--- a/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Flip/FSpot.Editors.Flip.csproj
@@ -1,109 +1,109 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{53DAC12F-0421-4F5E-A746-17A701D2BDDA}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Editors</RootNamespace>
- <AssemblyName>FSpot.Editors.FlipEditor</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Addins.Editors\FlipEditor.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\FlipEditor.addin.xml">
- <LogicalName>FlipEditor.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{53DAC12F-0421-4F5E-A746-17A701D2BDDA}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Editors</RootNamespace>
+ <AssemblyName>FSpot.Editors.FlipEditor</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Editors\FlipEditor.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\FlipEditor.addin.xml">
+ <LogicalName>FlipEditor.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj
index 173d24d..880813c 100644
--- a/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Pixelate/FSpot.Editors.Pixelate.csproj
@@ -1,111 +1,111 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{8EB3933F-A089-43A3-B662-617DC71A2173}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Editors</RootNamespace>
- <AssemblyName>FSpot.Editors.PixelateEditor</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Addins.Editors\PixelateEditor.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\PixelateEditor.addin.xml">
- <LogicalName>PixelateEditor.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="atk-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="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="Mono.Posix" />
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{8EB3933F-A089-43A3-B662-617DC71A2173}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Editors</RootNamespace>
+ <AssemblyName>FSpot.Editors.PixelateEditor</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Editors\PixelateEditor.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\PixelateEditor.addin.xml">
+ <LogicalName>PixelateEditor.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="atk-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="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="Mono.Posix" />
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 bb83ee0..4272213 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,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 FSpot.Editors;
-using FSpot.Imaging;
-
-using Gdk;
-using Gtk;
-
+//
+
+using System;
+
+using FSpot.Editors;
+using FSpot.Imaging;
+
+using Gdk;
+using Gtk;
+
using Mono.Unix;
namespace FSpot.Addins.Editors {
diff --git a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj
index 1a699c2..b4e43cd 100644
--- a/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj
+++ b/src/Extensions/Editors/FSpot.Editors.Resize/FSpot.Editors.Resize.csproj
@@ -1,111 +1,111 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{1F610540-D2ED-4F58-87CE-9092A43DBD4A}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Editors</RootNamespace>
- <AssemblyName>FSpot.Editors.ResizeEditor</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Addins.Editors\ResizeEditor.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\ResizeEditor.addin.xml">
- <LogicalName>ResizeEditor.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </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="Mono.Posix" />
- <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" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
- <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
- <Name>FSpot.Cms</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{1F610540-D2ED-4F58-87CE-9092A43DBD4A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Editors</RootNamespace>
+ <AssemblyName>FSpot.Editors.ResizeEditor</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Editors\ResizeEditor.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\ResizeEditor.addin.xml">
+ <LogicalName>ResizeEditor.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </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="Mono.Posix" />
+ <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" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Cms\FSpot.Cms.csproj">
+ <Project>{9D66BC1B-4390-4B8D-8468-19D5A862EC23}</Project>
+ <Name>FSpot.Cms</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
index 36ef8b6..ab6acc8 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.CD/FSpot.Exporters.CD.csproj
@@ -1,127 +1,127 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.CDExport</RootNamespace>
- <AssemblyName>FSpot.Exporters.CDExport</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.CD\CDExport.cs" />
- <Compile Include="FSpot.Exporters.CD\CDExportDialog.cs" />
- <Compile Include="FSpot.Exporters.CD\IDiscBurner.cs" />
- <Compile Include="FSpot.Exporters.CD\Brasero.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\CDExport.addin.xml">
- <LogicalName>CDExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\CDExport.ui">
- <LogicalName>CDExport.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gtk-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="System" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.CDExport</RootNamespace>
+ <AssemblyName>FSpot.Exporters.CDExport</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.CD\CDExport.cs" />
+ <Compile Include="FSpot.Exporters.CD\CDExportDialog.cs" />
+ <Compile Include="FSpot.Exporters.CD\IDiscBurner.cs" />
+ <Compile Include="FSpot.Exporters.CD\Brasero.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\CDExport.addin.xml">
+ <LogicalName>CDExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\CDExport.ui">
+ <LogicalName>CDExport.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="atk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gtk-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="System" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 bdefd85..1ae59af 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.Diagnostics;
-using System.IO;
-
+// 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 7b873c4..3f1b3e2 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,18 +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 FSpot.Core;
-using FSpot.Filters;
-using FSpot.UI.Dialog;
-
-using GLib;
-using Gtk;
-using GtkBeans;
-
-using Hyena;
-
+//
+
+using FSpot.Core;
+using FSpot.Filters;
+using FSpot.UI.Dialog;
+
+using GLib;
+using Gtk;
+using GtkBeans;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Exporters.CD {
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 c7179c4..dbc3de0 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,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.Reflection;
-
-using FSpot.Core;
-using FSpot.UI.Dialog;
-using FSpot.Widgets;
-
-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.csproj b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
index 155664e..7e3db2d 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/FSpot.Exporters.Facebook.csproj
@@ -1,166 +1,166 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{7004A4E6-12A5-46F1-BB1F-578FA9B63493}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.Facebook</RootNamespace>
- <AssemblyName>FSpot.Exporters.Facebook</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FindNullableClashes.cs" />
- <Compile Include="Mono.Facebook\facebook.cs" />
- <Compile Include="Mono.Facebook\Album.cs" />
- <Compile Include="Mono.Facebook\Error.cs" />
- <Compile Include="Mono.Facebook\Event.cs" />
- <Compile Include="Mono.Facebook\FacebookException.cs" />
- <Compile Include="Mono.Facebook\FacebookParam.cs" />
- <Compile Include="Mono.Facebook\FacebookSession.cs" />
- <Compile Include="Mono.Facebook\Friend.cs" />
- <Compile Include="Mono.Facebook\FriendInfo.cs" />
- <Compile Include="Mono.Facebook\Group.cs" />
- <Compile Include="Mono.Facebook\Location.cs" />
- <Compile Include="Mono.Facebook\Notification.cs" />
- <Compile Include="Mono.Facebook\PeopleList.cs" />
- <Compile Include="Mono.Facebook\Photo.cs" />
- <Compile Include="Mono.Facebook\Responses.cs" />
- <Compile Include="Mono.Facebook\SessionInfo.cs" />
- <Compile Include="Mono.Facebook\SessionWrapper.cs" />
- <Compile Include="Mono.Facebook\Tag.cs" />
- <Compile Include="Mono.Facebook\User.cs" />
- <Compile Include="Mono.Facebook\Util.cs" />
- <Compile Include="FSpot.Exporters.Facebook\FacebookExport.cs" />
- <Compile Include="FSpot.Exporters.Facebook\FacebookExportDialog.cs" />
- <Compile Include="FSpot.Exporters.Facebook\FacebookTagPopup.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\FacebookExport.addin.xml">
- <LogicalName>FacebookExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\FacebookExport.ui">
- <LogicalName>FacebookExport.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <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="System" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
- <Reference Include="System.Xml" />
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Platform\FSpot.Platform.csproj">
- <Project>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</Project>
- <Name>FSpot.Platform</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7004A4E6-12A5-46F1-BB1F-578FA9B63493}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.Facebook</RootNamespace>
+ <AssemblyName>FSpot.Exporters.Facebook</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FindNullableClashes.cs" />
+ <Compile Include="Mono.Facebook\facebook.cs" />
+ <Compile Include="Mono.Facebook\Album.cs" />
+ <Compile Include="Mono.Facebook\Error.cs" />
+ <Compile Include="Mono.Facebook\Event.cs" />
+ <Compile Include="Mono.Facebook\FacebookException.cs" />
+ <Compile Include="Mono.Facebook\FacebookParam.cs" />
+ <Compile Include="Mono.Facebook\FacebookSession.cs" />
+ <Compile Include="Mono.Facebook\Friend.cs" />
+ <Compile Include="Mono.Facebook\FriendInfo.cs" />
+ <Compile Include="Mono.Facebook\Group.cs" />
+ <Compile Include="Mono.Facebook\Location.cs" />
+ <Compile Include="Mono.Facebook\Notification.cs" />
+ <Compile Include="Mono.Facebook\PeopleList.cs" />
+ <Compile Include="Mono.Facebook\Photo.cs" />
+ <Compile Include="Mono.Facebook\Responses.cs" />
+ <Compile Include="Mono.Facebook\SessionInfo.cs" />
+ <Compile Include="Mono.Facebook\SessionWrapper.cs" />
+ <Compile Include="Mono.Facebook\Tag.cs" />
+ <Compile Include="Mono.Facebook\User.cs" />
+ <Compile Include="Mono.Facebook\Util.cs" />
+ <Compile Include="FSpot.Exporters.Facebook\FacebookExport.cs" />
+ <Compile Include="FSpot.Exporters.Facebook\FacebookExportDialog.cs" />
+ <Compile Include="FSpot.Exporters.Facebook\FacebookTagPopup.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\FacebookExport.addin.xml">
+ <LogicalName>FacebookExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\FacebookExport.ui">
+ <LogicalName>FacebookExport.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <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="System" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
+ <Reference Include="System.Xml" />
+ <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Platform\FSpot.Platform.csproj">
+ <Project>{2D3B12F7-ABF3-4784-92FE-78A1C775E157}</Project>
+ <Name>FSpot.Platform</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 323f443..e48d2a2 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,35 +28,35 @@
// 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.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 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;
namespace FSpot.Exporters.Facebook
{
internal class FacebookAccount
- {
- private const string keyring_item_name = "Facebook Account";
-
- private const string api_key = "c23d1683e87313fa046954ea253a240e";
-
+ {
+ private const string keyring_item_name = "Facebook Account";
+
+ private const string api_key = "c23d1683e87313fa046954ea253a240e";
+
// FIXME:
/* INSECURE! According to:
*
@@ -64,12 +64,12 @@ namespace FSpot.Exporters.Facebook
*
* We should *NOT* put our secret code here, but do an external
* authorization using our own PHP page somewhere.
- */
- private const string secret = "743e9a2e6a1c35ce961321bceea7b514";
-
+ */
+ private const string secret = "743e9a2e6a1c35ce961321bceea7b514";
+
public FacebookAccount ()
- {
- Authenticated = false;
+ {
+ Authenticated = false;
SessionInfo info = ReadSessionInfo ();
if (info != null) {
Facebook = new FacebookSession (api_key, info);
@@ -120,12 +120,12 @@ namespace FSpot.Exporters.Facebook
public bool HasPermission(string permission)
{
return Facebook.HasAppPermission(permission);
- }
-
- public FacebookSession Facebook { get; private set; }
-
- public bool Authenticated { get; private set; }
-
+ }
+
+ public FacebookSession Facebook { get; private set; }
+
+ public bool Authenticated { get; private set; }
+
bool SaveSessionInfo (SessionInfo info)
{
string keyring;
@@ -274,8 +274,8 @@ namespace FSpot.Exporters.Facebook
FacebookExportDialog dialog;
ThreadProgressDialog progress_dialog;
System.Threading.Thread command_thread;
- Album album = null;
-
+ Album album = null;
+
public void Run (IBrowsableCollection selection)
{
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 fae250b..dff1315 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.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 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
@@ -135,16 +135,16 @@ namespace FSpot.Exporters.Facebook
Account = new FacebookAccount();
if (Account.Authenticated)
DoLogin ();
- }
-
- public FacebookAccount Account { get; private set; }
-
- public string[] Captions { get; private set; }
-
+ }
+
+ public FacebookAccount Account { get; private set; }
+
+ public string[] Captions { get; private set; }
+
List<Mono.Facebook.Tag>[] tags;
- int current_item;
- public IPhoto[] Items { get; private set; }
-
+ int current_item;
+ public IPhoto[] Items { get; private set; }
+
public bool CreateAlbum {
get { return create_album_radiobutton.Active; }
}
@@ -434,7 +434,7 @@ namespace FSpot.Exporters.Facebook
}
internal class AlbumStore : ListStore
- {
+ {
public AlbumStore (Album[] albums) : base (typeof (string))
{
Albums = albums;
@@ -442,9 +442,9 @@ namespace FSpot.Exporters.Facebook
foreach (Album album in Albums) {
AppendValues (album.name);
}
- }
-
- public Album[] Albums { get; private set; }
+ }
+
+ public Album[] Albums { get; private set; }
}
}
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 cf19c7d..34ae081 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,24 +25,24 @@
// 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.Reflection;
-
-using FSpot.Widgets;
-
+//
+
+using System.Collections.Generic;
+using System.Reflection;
+
+using FSpot.Widgets;
+
using Mono.Facebook;
namespace FSpot.Exporters.Facebook
{
internal class FacebookTagPopup : BuilderWindow
- {
+ {
public FacebookTagPopup (Dictionary<long, User> friends) : base (Assembly.GetExecutingAssembly (), "FacebookExport.ui", "facebook_tag_popup")
{
Friends = friends;
- }
-
- public Dictionary<long, User> Friends { get; set; }
+ }
+
+ public Dictionary<long, User> Friends { get; set; }
}
}
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 e8a84a8..7cad8f2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Album.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 System;
-using System.Text;
-using System.Xml.Serialization;
-
+//
+
+using System;
+using System.Text;
+using System.Xml.Serialization;
+
using Mono.Facebook.Schemas;
namespace Mono.Facebook
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 ef4ee6b..18b4f06 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookException.cs
@@ -30,11 +30,11 @@
using System;
public class FacebookException : Exception
-{
- public int ErrorCode { get; private set; }
-
- public string ErrorMessage { get; private set; }
-
+{
+ public int ErrorCode { get; private set; }
+
+ public string ErrorMessage { get; private set; }
+
public FacebookException (int error_code, string error_message)
: base (CreateMessage (error_code, error_message))
{
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 4169ba3..b6113a6 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookParam.cs
@@ -34,18 +34,18 @@ using System.Text;
namespace Mono.Facebook
{
public class FacebookParam : IComparable
- {
- private object value;
-
- public string Name { get; private set; }
-
+ {
+ private object value;
+
+ public string Name { get; private set; }
+
public string Value {
- get
- {
+ get
+ {
if (value is Array)
- return ConvertArrayToString (value as Array);
- return value.ToString ();
- }
+ return ConvertArrayToString (value as Array);
+ return value.ToString ();
+ }
}
protected FacebookParam (string name, object value)
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 a0ca65d..d266cbf 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/FacebookSession.cs
@@ -26,11 +26,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 System.Collections.Generic;
-using System.Linq;
+//
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
using System.Xml;
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 9d4f3a5..d525d52 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
+++ b/src/Extensions/Exporters/FSpot.Exporters.Facebook/Mono.Facebook/Util.cs
@@ -46,8 +46,8 @@ namespace Mono.Facebook
private static readonly Dictionary<int, XmlSerializer> serializer_dict = new Dictionary<int, XmlSerializer>();
- private readonly FacebookParam VersionParam = FacebookParam.Create ("v", "1.0");
-
+ private readonly FacebookParam VersionParam = FacebookParam.Create ("v", "1.0");
+
private static XmlSerializer ErrorSerializer {
get {
return GetSerializer (typeof (Error));
@@ -58,14 +58,14 @@ namespace Mono.Facebook
{
ApiKey = api_key;
SharedSecret = secret;
- }
-
- public bool UseJson { get; set; }
-
- internal string SharedSecret { get; set; }
-
- internal string ApiKey { get; private set; }
-
+ }
+
+ public bool UseJson { get; set; }
+
+ internal string SharedSecret { get; set; }
+
+ internal string ApiKey { get; private set; }
+
public T GetResponse<T>(string method_name, params FacebookParam[] parameters)
{
string url = FormatGetUrl (method_name, parameters);
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
index f7534e8..2ff4d80 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Flickr/FSpot.Exporters.Flickr.csproj
@@ -1,134 +1,134 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.Flickr</RootNamespace>
- <AssemblyName>FSpot.Exporters.Flickr</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.Flickr\FlickrRemote.cs" />
- <Compile Include="FSpot.Exporters.Flickr\FlickrExport.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\FlickrExport.addin.xml">
- <LogicalName>FlickrExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\flickr_export.ui">
- <LogicalName>flickr_export.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Reference Include="atk-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="Mono.Posix" />
- <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="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="FlickrNet, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2491df59efa5d132">
- <Private>False</Private>
- <SpecificVersion>False</SpecificVersion>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.Flickr</RootNamespace>
+ <AssemblyName>FSpot.Exporters.Flickr</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.Flickr\FlickrRemote.cs" />
+ <Compile Include="FSpot.Exporters.Flickr\FlickrExport.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\FlickrExport.addin.xml">
+ <LogicalName>FlickrExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\flickr_export.ui">
+ <LogicalName>flickr_export.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="atk-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="Mono.Posix" />
+ <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="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="FlickrNet, Version=2.2.0.0, Culture=neutral, PublicKeyToken=2491df59efa5d132">
+ <Private>False</Private>
+ <SpecificVersion>False</SpecificVersion>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 9ddd6ae..7e3bcc5 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,24 +28,24 @@
// 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.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 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;
namespace FSpot.Exporters.Flickr {
@@ -286,9 +286,9 @@ namespace FSpot.Exporters.Flickr {
});
}
- private class AuthorizationEventArgs : System.EventArgs {
- public Exception Exception { get; set; }
- public Auth Auth { get; set; }
+ private class AuthorizationEventArgs : System.EventArgs {
+ public Exception Exception { get; set; }
+ public Auth Auth { get; set; }
}
public void HandleSizeActive (object sender, System.EventArgs args)
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 3ca01c3..6759cba 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,15 +40,15 @@
*
* We use now the search API also
*
- */
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-using FSpot.Core;
-using FSpot.Filters;
-
+ */
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+
+using FSpot.Core;
+using FSpot.Filters;
+
using Hyena;
namespace FSpot.Exporters.Flickr {
@@ -259,15 +259,15 @@ public class FlickrRemote {
PreferencePath = pref;
}
- public static Service FromSupported (SupportedService id)
- {
- foreach (Service s in Supported.Where(s => s.Id == id))
- {
- return s;
- }
-
- throw new System.ArgumentException ("Unknown service type");
- }
+ public static Service FromSupported (SupportedService id)
+ {
+ foreach (Service s in Supported.Where(s => s.Id == id))
+ {
+ return s;
+ }
+
+ throw new System.ArgumentException ("Unknown service type");
+ }
}
}
}
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
index a7eabe1..d160caa 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Folder/FSpot.Exporters.Folder.csproj
@@ -1,147 +1,147 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{7FBEAF56-65E5-4C07-B346-C6A0BC87B368}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.Folder</RootNamespace>
- <AssemblyName>FSpot.Exporters.Folder</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.Folder\FolderExport.cs" />
- <Compile Include="FSpot.Exporters.Folder\FolderGallery.cs" />
- <Compile Include="FSpot.Exporters.Folder\OriginalGallery.cs" />
- <Compile Include="FSpot.Exporters.Folder\HtmlGallery.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\f-spot.js">
- <LogicalName>f-spot.js</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\f-spot-simple.css">
- <LogicalName>f-spot-simple.css</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\f-spot-simple-white.css">
- <LogicalName>f-spot-simple-white.css</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\FolderExport.addin.xml">
- <LogicalName>FolderExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\folder_export.ui">
- <LogicalName>folder_export.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
- <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="ICSharpCode.SharpZipLib" />
- <Reference Include="Mono.Posix" />
- <Reference Include="System" />
- <Reference Include="System.Web" />
- <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="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7FBEAF56-65E5-4C07-B346-C6A0BC87B368}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.Folder</RootNamespace>
+ <AssemblyName>FSpot.Exporters.Folder</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.Folder\FolderExport.cs" />
+ <Compile Include="FSpot.Exporters.Folder\FolderGallery.cs" />
+ <Compile Include="FSpot.Exporters.Folder\OriginalGallery.cs" />
+ <Compile Include="FSpot.Exporters.Folder\HtmlGallery.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\f-spot.js">
+ <LogicalName>f-spot.js</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\f-spot-simple.css">
+ <LogicalName>f-spot-simple.css</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\f-spot-simple-white.css">
+ <LogicalName>f-spot-simple-white.css</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\FolderExport.addin.xml">
+ <LogicalName>FolderExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\folder_export.ui">
+ <LogicalName>folder_export.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <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="ICSharpCode.SharpZipLib" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="System" />
+ <Reference Include="System.Web" />
+ <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="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 bb4b1a3..7ff8c15 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,14 +50,14 @@
*/
//This should be used to export the selected pics to an original gallery
-//located on a GIO location.
-
-using System;
-using System.IO;
-
-using FSpot.Core;
-using FSpot.Filters;
-
+//located on a GIO location.
+
+using System;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Filters;
+
using Hyena;
namespace FSpot.Exporters.Folder
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 2c1df41..8444d10 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,14 +50,14 @@
*/
//This should be used to export the selected pics to an original gallery
-//located on a GIO location.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-
-using FSpot.Core;
-
+//located on a GIO location.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using FSpot.Core;
+
using Mono.Unix;
namespace FSpot.Exporters.Folder
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
index c2e817c..c7cb9d2 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Gallery/FSpot.Exporters.Gallery.csproj
@@ -1,154 +1,154 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{E55F73E0-576A-4FE2-9108-E76960820AA3}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.Gallery</RootNamespace>
- <AssemblyName>FSpot.Exporters.Gallery</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.Gallery\FormClient.cs" />
- <Compile Include="FSpot.Exporters.Gallery\GalleryExport.cs" />
- <Compile Include="FSpot.Exporters.Gallery\GalleryRemote.cs" />
- <Compile Include="FSpot.Exporters.Gallery\GalleryAccount.cs" />
- <Compile Include="FSpot.Exporters.Gallery\GalleryAccountManager.cs" />
- <Compile Include="FSpot.Exporters.Gallery\AccountDialog.cs" />
- <Compile Include="FSpot.Exporters.Gallery\GalleryAddAlbum.cs" />
- <Compile Include="FSpot.Exporters.Gallery\GalleryExceptions.cs" />
- <Compile Include="FSpot.Exporters.Gallery\Gallery.cs" />
- <Compile Include="FSpot.Exporters.Gallery\Gallery1.cs" />
- <Compile Include="FSpot.Exporters.Gallery\Gallery2.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\GalleryExport.addin.xml">
- <LogicalName>GalleryExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\gallery_add_album_dialog.ui">
- <LogicalName>gallery_add_album_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\gallery_add_dialog.ui">
- <LogicalName>gallery_add_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\gallery_export_dialog.ui">
- <LogicalName>gallery_export_dialog.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Reference Include="atk-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="Mono.Posix" />
- <Reference Include="System" />
- <Reference Include="System.Xml" />
- <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="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{E55F73E0-576A-4FE2-9108-E76960820AA3}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.Gallery</RootNamespace>
+ <AssemblyName>FSpot.Exporters.Gallery</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.Gallery\FormClient.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\GalleryExport.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\GalleryRemote.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\GalleryAccount.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\GalleryAccountManager.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\AccountDialog.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\GalleryAddAlbum.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\GalleryExceptions.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\Gallery.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\Gallery1.cs" />
+ <Compile Include="FSpot.Exporters.Gallery\Gallery2.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\GalleryExport.addin.xml">
+ <LogicalName>GalleryExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\gallery_add_album_dialog.ui">
+ <LogicalName>gallery_add_album_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\gallery_add_dialog.ui">
+ <LogicalName>gallery_add_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\gallery_export_dialog.ui">
+ <LogicalName>gallery_export_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Reference Include="atk-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="Mono.Posix" />
+ <Reference Include="System" />
+ <Reference Include="System.Xml" />
+ <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="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 c3b72d6..e8590bd 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,13 +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 Hyena;
-using Hyena.Widgets;
-
+//
+
+using System;
+
+using Hyena;
+using Hyena.Widgets;
+
using Mono.Unix;
namespace FSpot.Exporters.Gallery
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 9e9f68f..09543d9 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
@@ -60,10 +60,10 @@ namespace FSpot.Exporters.Gallery
private string boundary;
private string start_boundary;
- private string end_boundary;
-
- public bool Multipart { private get; set; }
-
+ private string end_boundary;
+
+ public bool Multipart { private get; set; }
+
private bool first_item;
public bool Buffer = false;
@@ -77,15 +77,15 @@ namespace FSpot.Exporters.Gallery
public FSpot.ProgressItem Progress;
public FormClient (CookieContainer cookies)
- {
- Multipart = false;
+ {
+ Multipart = false;
Cookies = cookies;
Items = new List<FormItem> ();
}
public FormClient ()
- {
- Multipart = false;
+ {
+ Multipart = false;
Items = new List<FormItem> ();
Cookies = new CookieContainer ();
}
@@ -124,24 +124,24 @@ namespace FSpot.Exporters.Gallery
}
}
- private long MultipartLength (FormItem item)
- {
+ private long MultipartLength (FormItem item)
+ {
// The types we check here need to match the
// types we allow in .Add
if (item.Value == null) {
return MultipartLength (item.Name, (string)String.Empty);
- }
+ }
if (item.Value is FileInfo) {
return MultipartLength (item.Name, (FileInfo)item.Value);
- }
+ }
if (item.Value is string) {
return MultipartLength (item.Name, (string)item.Value);
- }
-
- throw new Exception ("Unknown value type");
- }
-
+ }
+
+ throw new Exception ("Unknown value type");
+ }
+
private string MultipartHeader (string name, string value)
{
return string.Format ("{0}\r\n" +
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 5a8d19d..071c4d8 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,10 +25,10 @@
// 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 Hyena;
+
using Mono.Unix;
namespace FSpot.Exporters.Gallery
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 a4a06fe..c9e8c6e 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,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 System;
-
-using Hyena.Widgets;
-
+//
+
+using System;
+
+using Hyena.Widgets;
+
using Mono.Unix;
namespace FSpot.Exporters.Gallery
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 7e737c3..4dd858e 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,19 +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 System.Collections.Generic;
-
-using FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Filters;
-using FSpot.UI.Dialog;
-using FSpot.Widgets;
-
-using Hyena;
-
+//
+
+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;
namespace FSpot.Exporters.Gallery
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 94d6b4d..48e7586 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,14 +28,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.IO;
-
-using FSpot.Core;
-
+//
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+
+using FSpot.Core;
+
using Hyena;
/* These classes are based off the documentation at
diff --git a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
index f862c4f..db152ca 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.PicasaWeb/FSpot.Exporters.PicasaWeb.csproj
@@ -1,141 +1,141 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.PicasaWeb</RootNamespace>
- <AssemblyName>FSpot.Exporters.PicasaWeb</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.PicasaWeb\PicasaWebExport.cs" />
- <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAddAlbum.cs" />
- <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAccountDialog.cs" />
- <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAccountManager.cs" />
- <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAccount.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\PicasaWebExport.addin.xml">
- <LogicalName>PicasaWebExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\google_add_album_dialog.ui">
- <LogicalName>google_add_album_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\google_add_dialog.ui">
- <LogicalName>google_add_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\google_export_dialog.ui">
- <LogicalName>google_export_dialog.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <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="System" />
- <Reference Include="Mono.Posix" />
- <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
- </Reference>
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Mono.Google\Mono.Google.csproj">
- <Project>{40C7D4EA-FB93-49FE-B18F-700A28C3E670}</Project>
- <Name>Mono.Google</Name>
- </ProjectReference>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.PicasaWeb</RootNamespace>
+ <AssemblyName>FSpot.Exporters.PicasaWeb</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.PicasaWeb\PicasaWebExport.cs" />
+ <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAddAlbum.cs" />
+ <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAccountDialog.cs" />
+ <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAccountManager.cs" />
+ <Compile Include="FSpot.Exporters.PicasaWeb\GoogleAccount.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\PicasaWebExport.addin.xml">
+ <LogicalName>PicasaWebExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\google_add_album_dialog.ui">
+ <LogicalName>google_add_album_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\google_add_dialog.ui">
+ <LogicalName>google_add_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\google_export_dialog.ui">
+ <LogicalName>google_export_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <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="System" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
+ </Reference>
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Mono.Google\Mono.Google.csproj">
+ <Project>{40C7D4EA-FB93-49FE-B18F-700A28C3E670}</Project>
+ <Name>Mono.Google</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 8ec593c..2cd3717 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,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.Net;
-
-using Gnome.Keyring;
-
-using Hyena;
-
+//
+
+using System.Net;
+
+using Gnome.Keyring;
+
+using Hyena;
+
using Mono.Google;
namespace FSpot.Exporters.PicasaWeb
@@ -40,9 +40,9 @@ namespace FSpot.Exporters.PicasaWeb
public class GoogleAccount {
private string username;
- private string password;
- private GoogleConnection connection;
-
+ private string password;
+ private GoogleConnection connection;
+
public GoogleAccount (string username, string password)
{
this.username = username;
@@ -108,12 +108,12 @@ namespace FSpot.Exporters.PicasaWeb
MarkChanged ();
}
}
- }
-
- public string Token { get; set; }
-
- public string UnlockCaptcha { get; set; }
-
- public Mono.Google.Picasa.PicasaWeb Picasa { get; private set; }
+ }
+
+ public string Token { get; set; }
+
+ public string UnlockCaptcha { get; set; }
+
+ public Mono.Google.Picasa.PicasaWeb Picasa { get; private set; }
}
}
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 9c7df01..6584830 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,17 +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 FSpot.Imaging;
-
-using Gnome.Keyring;
-
-using Hyena;
-
-using Mono.Google;
+//
+
+using System;
+
+using FSpot.Imaging;
+
+using Gnome.Keyring;
+
+using Hyena;
+
+using Mono.Google;
namespace FSpot.Exporters.PicasaWeb
{
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 4f7e867..3227b4c 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
@@ -42,7 +42,7 @@ namespace FSpot.Exporters.PicasaWeb
public class GoogleAccountManager
{
private static GoogleAccountManager instance;
- private const string keyring_item_name = "Google Account";
+ private const string keyring_item_name = "Google Account";
readonly List<GoogleAccount> accounts;
public delegate void AccountListChangedHandler (GoogleAccountManager manager, GoogleAccount changed_account);
@@ -61,8 +61,8 @@ namespace FSpot.Exporters.PicasaWeb
{
accounts = new List<GoogleAccount> ();
ReadAccounts ();
- }
-
+ }
+
public void MarkChanged (bool write = true, GoogleAccount changed_account = null)
{
if (write)
@@ -75,8 +75,8 @@ namespace FSpot.Exporters.PicasaWeb
public List<GoogleAccount> GetAccounts ()
{
return accounts;
- }
-
+ }
+
public void AddAccount (GoogleAccount account, bool write = true)
{
accounts.Add (account);
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 1ef12ed..3554d9d 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,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 Gnome.Keyring;
-
-using Hyena.Widgets;
-
-using Mono.Google.Picasa;
+//
+
+using System;
+
+using Gnome.Keyring;
+
+using Hyena.Widgets;
+
+using Mono.Google.Picasa;
using Mono.Unix;
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 70a1b88..730cd42 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,28 +35,28 @@
* Stephane Delcroix <stephane delcroix org>
*
* Copyright (C) 2006 Stephane Delcroix
- */
-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 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;
namespace FSpot.Exporters.PicasaWeb
{
public class GoogleExport : FSpot.Extensions.IExporter
- {
+ {
public void Run (IBrowsableCollection selection)
{
builder = new GtkBeans.Builder (null, "google_export_dialog.ui", null);
@@ -326,8 +326,8 @@ namespace FSpot.Exporters.PicasaWeb
Log.DebugFormat ("Setting gallery_optionmenu.Active = {0}", pos);
gallery_optionmenu.Active = pos;
- }
-
+ }
+
private void Connect (GoogleAccount selected = null)
{
Connect (selected, null, null);
@@ -509,7 +509,7 @@ namespace FSpot.Exporters.PicasaWeb
}
private Gtk.Dialog Dialog {
- get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
+ get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
}
}
}
diff --git a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
index 2e0df9c..645e3ea 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.SmugMug/FSpot.Exporters.SmugMug.csproj
@@ -1,138 +1,138 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{BE981FC8-9B41-4336-815C-ECC365AE05D4}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.SmugMug</RootNamespace>
- <AssemblyName>FSpot.Exporters.SmugMugExport</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.SmugMug\SmugMugExport.cs" />
- <Compile Include="FSpot.Exporters.SmugMug\SmugMugAccount.cs" />
- <Compile Include="FSpot.Exporters.SmugMug\SmugMugAccountManager.cs" />
- <Compile Include="FSpot.Exporters.SmugMug\SmugMugAccountDialog.cs" />
- <Compile Include="FSpot.Exporters.SmugMug\SmugMugAddAlbum.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\SmugMugExport.addin.xml">
- <LogicalName>SmugMugExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\smugmug_add_album_dialog.ui">
- <LogicalName>smugmug_add_album_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\smugmug_add_dialog.ui">
- <LogicalName>smugmug_add_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\smugmug_export_dialog.ui">
- <LogicalName>smugmug_export_dialog.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\SmugMugNet\SmugMugNet.csproj">
- <Project>{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}</Project>
- <Name>SmugMugNet</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="atk-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="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
- </Reference>
- <Reference Include="System" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{BE981FC8-9B41-4336-815C-ECC365AE05D4}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.SmugMug</RootNamespace>
+ <AssemblyName>FSpot.Exporters.SmugMugExport</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.SmugMug\SmugMugExport.cs" />
+ <Compile Include="FSpot.Exporters.SmugMug\SmugMugAccount.cs" />
+ <Compile Include="FSpot.Exporters.SmugMug\SmugMugAccountManager.cs" />
+ <Compile Include="FSpot.Exporters.SmugMug\SmugMugAccountDialog.cs" />
+ <Compile Include="FSpot.Exporters.SmugMug\SmugMugAddAlbum.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\SmugMugExport.addin.xml">
+ <LogicalName>SmugMugExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\smugmug_add_album_dialog.ui">
+ <LogicalName>smugmug_add_album_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\smugmug_add_dialog.ui">
+ <LogicalName>smugmug_add_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\smugmug_export_dialog.ui">
+ <LogicalName>smugmug_export_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\SmugMugNet\SmugMugNet.csproj">
+ <Project>{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}</Project>
+ <Name>SmugMugNet</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="atk-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="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66">
+ </Reference>
+ <Reference Include="System" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 1522285..7feb2d6 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,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.Net;
-
-using Gnome.Keyring;
-
-using Hyena;
-
+//
+
+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 b000f9b..de4512e 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
@@ -102,7 +102,7 @@ namespace FSpot.Exporters.SmugMug
}
private Gtk.Dialog Dialog {
- get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
+ get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
}
private SmugMugAccount account;
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 cb07b50..8141438 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,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;
-// FIXME: Why do we still have System.Collections?
-using System.Collections;
-using System.Collections.Generic;
-
-using Gnome.Keyring;
-
+//
+
+using System;
+// FIXME: Why do we still have System.Collections?
+using System.Collections;
+using System.Collections.Generic;
+
+using Gnome.Keyring;
+
using Hyena;
namespace FSpot.Exporters.SmugMug
@@ -80,8 +80,8 @@ namespace FSpot.Exporters.SmugMug
public List<SmugMugAccount> GetAccounts ()
{
return accounts;
- }
-
+ }
+
public void AddAccount (SmugMugAccount account, bool write = true)
{
accounts.Add (account);
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 2f1c5dd..a2a0e31 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,13 +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 Gnome.Keyring;
-using Gtk;
-
+//
+
+using System;
+
+using Gnome.Keyring;
+using Gtk;
+
using SmugMugNet;
namespace FSpot.Exporters.SmugMug
@@ -72,13 +72,13 @@ namespace FSpot.Exporters.SmugMug
HandleChanged (null, null);
}
- private void HandleChanged (object sender, EventArgs args)
- {
- title = title_entry.Text;
-
- add_button.Sensitive = title != String.Empty;
- }
-
+ private void HandleChanged (object sender, EventArgs args)
+ {
+ title = title_entry.Text;
+
+ add_button.Sensitive = title != String.Empty;
+ }
+
[GLib.ConnectBefore]
protected void HandleAddResponse (object sender, Gtk.ResponseArgs args)
{
@@ -118,7 +118,7 @@ namespace FSpot.Exporters.SmugMug
}
private Gtk.Dialog Dialog {
- get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
+ get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
}
}
}
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 0ed5620..ba1c4a1 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,21 +37,21 @@
* Based on PicasaWebExport code from Stephane Delcroix.
*
* Copyright (C) 2006 Thomas Van Machelen
- */
-
-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 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 {
@@ -286,8 +286,8 @@ namespace FSpot.Exporters.SmugMug {
}
gallery_optionmenu.Active = pos;
- }
-
+ }
+
private void Connect (SmugMugAccount selected = null)
{
Connect (selected, null);
@@ -422,7 +422,7 @@ namespace FSpot.Exporters.SmugMug {
}
private Gtk.Dialog Dialog {
- get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
+ get { return dialog ?? (dialog = new Gtk.Dialog(builder.GetRawObject(dialog_name))); }
}
}
}
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
index 2a52ca6..b833371 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo.csproj
@@ -1,143 +1,143 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{414E9813-E0A8-4BD4-8694-485F528518F5}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.Tabblo</RootNamespace>
- <AssemblyName>FSpot.Exporters.Tabblo</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.Tabblo\ApplicationCentricCertificatePolicy.cs" />
- <Compile Include="FSpot.Exporters.Tabblo\BlindTrustCertificatePolicy.cs" />
- <Compile Include="FSpot.Exporters.Tabblo\FSpotTraceListener.cs" />
- <Compile Include="FSpot.Exporters.Tabblo\FSpotUploadProgress.cs" />
- <Compile Include="FSpot.Exporters.Tabblo\TabbloExport.cs" />
- <Compile Include="FSpot.Exporters.Tabblo\TabbloExportModel.cs" />
- <Compile Include="FSpot.Exporters.Tabblo\TabbloExportView.cs" />
- <Compile Include="FSpot.Exporters.Tabblo\UserDecisionCertificatePolicy.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\TabbloExport.addin.xml">
- <LogicalName>TabbloExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ui\TabbloExport.ui">
- <LogicalName>TabbloExport.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ui\TrustError.ui">
- <LogicalName>TrustError.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </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="System" />
- <Reference Include="Mono.Posix" />
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Mono.Tabblo\Mono.Tabblo.csproj">
- <Project>{B5CDF05C-278A-40AA-A587-B27A00BD9135}</Project>
- <Name>Mono.Tabblo</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{414E9813-E0A8-4BD4-8694-485F528518F5}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.Tabblo</RootNamespace>
+ <AssemblyName>FSpot.Exporters.Tabblo</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.Tabblo\ApplicationCentricCertificatePolicy.cs" />
+ <Compile Include="FSpot.Exporters.Tabblo\BlindTrustCertificatePolicy.cs" />
+ <Compile Include="FSpot.Exporters.Tabblo\FSpotTraceListener.cs" />
+ <Compile Include="FSpot.Exporters.Tabblo\FSpotUploadProgress.cs" />
+ <Compile Include="FSpot.Exporters.Tabblo\TabbloExport.cs" />
+ <Compile Include="FSpot.Exporters.Tabblo\TabbloExportModel.cs" />
+ <Compile Include="FSpot.Exporters.Tabblo\TabbloExportView.cs" />
+ <Compile Include="FSpot.Exporters.Tabblo\UserDecisionCertificatePolicy.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\TabbloExport.addin.xml">
+ <LogicalName>TabbloExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ui\TabbloExport.ui">
+ <LogicalName>TabbloExport.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ui\TrustError.ui">
+ <LogicalName>TrustError.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </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="System" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Gnome.Keyring, Version=1.0.0.0, Culture=neutral, PublicKeyToken=1a73e1bde00c9b66" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Mono.Tabblo\Mono.Tabblo.csproj">
+ <Project>{B5CDF05C-278A-40AA-A587-B27A00BD9135}</Project>
+ <Name>Mono.Tabblo</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 25b61a5..17c0f99 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,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.UI.Dialog;
-
-using Mono.Tabblo;
+//
+
+using System;
+
+using FSpot.UI.Dialog;
+
+using Mono.Tabblo;
using Mono.Unix;
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 db7536c..be0b615 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,19 +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.Diagnostics;
-using System.Net;
-using System.Threading;
-
-using FSpot.Core;
-using FSpot.UI.Dialog;
-
-using Hyena;
-
-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;
namespace FSpot.Exporters.Tabblo {
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 ac3bc5d..799e9a9 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,21 +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 System;
-// FIXME: Why do we still have System.Collections?
-using System.Collections;
-using System.Collections.Generic;
-using System.Diagnostics;
-
-using FSpot.Core;
-
+//
+
+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;
namespace FSpot.Exporters.Tabblo {
- class TabbloExportModel : Mono.Tabblo.IPreferences {
+ class TabbloExportModel : Mono.Tabblo.IPreferences {
private string username;
private string password;
@@ -71,10 +71,10 @@ namespace FSpot.Exporters.Tabblo {
private const string KeyringItemAppAttr = "application";
- // The photos.
-
- internal IBrowsableCollection PhotoCollection { get; set; }
-
+ // The photos.
+
+ internal IBrowsableCollection PhotoCollection { get; set; }
+
internal IPhoto [] Photos {
get {
return PhotoCollection.Items;
@@ -244,9 +244,9 @@ namespace FSpot.Exporters.Tabblo {
private void ReadAccountData ()
{
string new_username = string.Empty;
- string new_password = string.Empty;
-
- // FIXME: Change this out for a Dictionary
+ string new_password = string.Empty;
+
+ // FIXME: Change this out for a Dictionary
Hashtable attrs = new Hashtable();
attrs [KeyringItemNameAttr] = KeyringItemName;
attrs [KeyringItemAppAttr] = KeyringItemApp;
diff --git a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
index 3eef39e..053d7d9 100644
--- a/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
+++ b/src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip.csproj
@@ -1,129 +1,129 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{4C9355A7-1797-4708-A1F2-FBCDB782D04D}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Exporters.Zip</RootNamespace>
- <AssemblyName>FSpot.Exporters.Zip</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Exporters.Zip\ZipExport.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\ZipExport.addin.xml">
- <LogicalName>ZipExport.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\zip_export.ui">
- <LogicalName>zip_export.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- </ItemGroup>
- <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="Mono.Posix" />
- <Reference Include="ICSharpCode.SharpZipLib" />
- <Reference Include="System" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{4C9355A7-1797-4708-A1F2-FBCDB782D04D}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Exporters.Zip</RootNamespace>
+ <AssemblyName>FSpot.Exporters.Zip</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.Zip\ZipExport.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\ZipExport.addin.xml">
+ <LogicalName>ZipExport.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\zip_export.ui">
+ <LogicalName>zip_export.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <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="Mono.Posix" />
+ <Reference Include="ICSharpCode.SharpZipLib" />
+ <Reference Include="System" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 fa452e5..ec5cfd3 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,26 +27,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 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 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;
namespace FSpot.Exporters.Zip {
@@ -127,8 +127,8 @@ namespace FSpot.Exporters.Zip {
photos.Length, zipdiag);
//Pack up
- foreach (IPhoto photo in photos)
- {
+ foreach (IPhoto photo in photos)
+ {
if (progress_dialog.Update (String.Format (Catalog.GetString ("Preparing photo \"{0}\""), photo.Name))) {
progress_dialog.Destroy ();
return;
@@ -163,7 +163,7 @@ namespace FSpot.Exporters.Zip {
s.PutNextEntry (entry);
- s.Write (buffer, 0, buffer.Length);
+ s.Write (buffer, 0, buffer.Length);
}
s.Finish ();
s.Close ();
diff --git a/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj b/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj
index ed1ca9a..46cfb8a 100644
--- a/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj
+++ b/src/Extensions/Exporters/FSpotExporters.UnitTests/FSpotExporters.UnitTests.csproj
@@ -1,89 +1,89 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpotExportersCD.UnitTests</RootNamespace>
- <AssemblyName>FSpotExportersCD.UnitTests</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Debug</OutputPath>
- <DefineConstants>DEBUG;</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>bin\Release</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <ItemGroup>
- <Reference Include="System" />
- <Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
- <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
- </ItemGroup>
- <ItemGroup>
- <Compile Include="FSpot.Exporters.CD\TestOf_CDExport.cs" />
- <Compile Include="FSpot.Exporters.CD\TestOf_CDExportDialog.cs" />
- </ItemGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Folder Include="FSpot.Exporters.Gallery\" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\FSpot.Exporters.CD\FSpot.Exporters.CD.csproj">
- <Project>{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}</Project>
- <Name>FSpot.Exporters.CD</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{F38C0ADF-29A3-453B-B272-61CC5BF3BB1E}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpotExportersCD.UnitTests</RootNamespace>
+ <AssemblyName>FSpotExportersCD.UnitTests</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Debug</OutputPath>
+ <DefineConstants>DEBUG;</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>bin\Release</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <ItemGroup>
+ <Reference Include="System" />
+ <Reference Include="nunit.core, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+ <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77" />
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="FSpot.Exporters.CD\TestOf_CDExport.cs" />
+ <Compile Include="FSpot.Exporters.CD\TestOf_CDExportDialog.cs" />
+ </ItemGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Folder Include="FSpot.Exporters.Gallery\" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\FSpot.Exporters.CD\FSpot.Exporters.CD.csproj">
+ <Project>{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}</Project>
+ <Name>FSpot.Exporters.CD</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
index fd60444..9a78410 100644
--- a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/FSpot.Tools.ChangePhotoPath.csproj
@@ -1,133 +1,133 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{4E372D8D-A822-40F2-8C64-25F2296DAC6F}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Tools.ChangePhotoPath</RootNamespace>
- <AssemblyName>FSpot.Tools.ChangePhotoPath</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Tools.ChangePhotoPath\ChangePhotoPathController.cs" />
- <Compile Include="FSpot.Tools.ChangePhotoPath\ChangePhotoPathGui.cs" />
- <Compile Include="FSpot.Tools.ChangePhotoPath\IChangePhotoPathGui.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\ChangePhotoPath.addin.xml">
- <LogicalName>ChangePhotoPath.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ChangePhotoPath.ui">
- <LogicalName>ChangePhotoPath.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </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="System" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{4E372D8D-A822-40F2-8C64-25F2296DAC6F}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.ChangePhotoPath</RootNamespace>
+ <AssemblyName>FSpot.Tools.ChangePhotoPath</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.ChangePhotoPath\ChangePhotoPathController.cs" />
+ <Compile Include="FSpot.Tools.ChangePhotoPath\ChangePhotoPathGui.cs" />
+ <Compile Include="FSpot.Tools.ChangePhotoPath\IChangePhotoPathGui.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\ChangePhotoPath.addin.xml">
+ <LogicalName>ChangePhotoPath.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ChangePhotoPath.ui">
+ <LogicalName>ChangePhotoPath.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </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="System" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 97213f6..86b34b8 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,16 +34,16 @@
// Bengt Thuree (bengt thuree com)
//
// Copyright (C) 2007
-//
-
-
-using System;
-using System.Collections.Generic;
-using System.Collections.Specialized;
-using System.IO;
-
-using FSpot.Core;
-
+//
+
+
+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 7a1f05b..10f5b58 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 System;
-
-using FSpot.Extensions;
-using FSpot.UI.Dialog;
-
-using Hyena;
+//
+
+using System;
+
+using FSpot.Extensions;
+using FSpot.UI.Dialog;
+
+using Hyena;
using Hyena.Widgets;
namespace FSpot.Tools.ChangePhotoPath
@@ -196,12 +196,12 @@ namespace FSpot.Tools.ChangePhotoPath
}
public void remove_progress_dialog ()
- {
- if (progress_dialog == null)
- return;
-
+ {
+ if (progress_dialog == null)
+ return;
+
progress_dialog.Destroy();
- progress_dialog = null;
+ progress_dialog = null;
}
public void check_if_remove_progress_dialog (int total)
diff --git a/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Makefile.am b/src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Makefile.am
old mode 100755
new mode 100644
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
index c2369ec..f6ca62e 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
@@ -1,127 +1,127 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{FBA30EB0-05EB-446D-827D-D41EBF4B81E4}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Tools.DevelopInUFraw</RootNamespace>
- <AssemblyName>FSpot.Tools.DevelopInUFraw</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Tools.DevelopInUFraw\DevelopInUFRaw.cs" />
- <Compile Include="FSpot.Tools.DevelopInUFraw\DevelopInUFRawBatch.cs" />
- <Compile Include="FSpot.Tools.DevelopInUFraw\AbstractDevelopInUFRaw.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\DevelopInUFRaw.addin.xml">
- <LogicalName>DevelopInUFRaw.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- </ItemGroup>
- <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="Mono.Posix" />
- <Reference Include="System" />
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{FBA30EB0-05EB-446D-827D-D41EBF4B81E4}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.DevelopInUFraw</RootNamespace>
+ <AssemblyName>FSpot.Tools.DevelopInUFraw</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.DevelopInUFraw\DevelopInUFRaw.cs" />
+ <Compile Include="FSpot.Tools.DevelopInUFraw\DevelopInUFRawBatch.cs" />
+ <Compile Include="FSpot.Tools.DevelopInUFraw\AbstractDevelopInUFRaw.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\DevelopInUFRaw.addin.xml">
+ <LogicalName>DevelopInUFRaw.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <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="Mono.Posix" />
+ <Reference Include="System" />
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 cf4addc..4d9f2df 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,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 FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Imaging;
-
-using Hyena;
-
+//
+
+using System;
+using System.IO;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.Imaging;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Tools.DevelopInUFraw
@@ -144,7 +144,7 @@ namespace FSpot.Tools.DevelopInUFraw
string name = Catalog.GetPluralString ("Developed in UFRaw", "Developed in UFRaw ({0})", i);
name = String.Format (name, i);
- return p.VersionNameExists (name) ? GetVersionName (p, i + 1) : name;
+ return p.VersionNameExists (name) ? GetVersionName (p, i + 1) : name;
}
private System.Uri GetUriForVersionName (Photo p, string version_name)
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 9221239..283c9e5 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,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 FSpot.UI.Dialog;
-
-using Hyena;
-
+//
+
+using System;
+
+using FSpot.UI.Dialog;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Tools.DevelopInUFraw
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
index 69cd6f5..180b4d4 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
@@ -1,143 +1,143 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{B850C11B-69B7-45A4-AB1D-1BECA8C667C0}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Tools.LiveWebGallery</RootNamespace>
- <AssemblyName>FSpot.Tools.LiveWebGallery</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Tools.LiveWebGallery\GalleryRequestHandler.cs" />
- <Compile Include="FSpot.Tools.LiveWebGallery\LiveWebGallery.cs" />
- <Compile Include="FSpot.Tools.LiveWebGallery\LiveWebGalleryDialog.cs" />
- <Compile Include="FSpot.Tools.LiveWebGallery\PhotoRequestHandler.cs" />
- <Compile Include="FSpot.Tools.LiveWebGallery\ResourceRequestHandler.cs" />
- <Compile Include="FSpot.Tools.LiveWebGallery\SimpleWebServer.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\ui\LiveWebGallery.ui">
- <LogicalName>LiveWebGallery.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ui\gallery.html">
- <LogicalName>gallery.html</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ui\f-spot.css">
- <LogicalName>f-spot.css</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ui\f-spot.js">
- <LogicalName>f-spot.js</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\LiveWebGallery.addin.xml">
- <LogicalName>LiveWebGallery.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ui\empty.png">
- <LogicalName>empty.png</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <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="Mono.Posix" />
- <Reference Include="System" />
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{B850C11B-69B7-45A4-AB1D-1BECA8C667C0}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.LiveWebGallery</RootNamespace>
+ <AssemblyName>FSpot.Tools.LiveWebGallery</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.LiveWebGallery\GalleryRequestHandler.cs" />
+ <Compile Include="FSpot.Tools.LiveWebGallery\LiveWebGallery.cs" />
+ <Compile Include="FSpot.Tools.LiveWebGallery\LiveWebGalleryDialog.cs" />
+ <Compile Include="FSpot.Tools.LiveWebGallery\PhotoRequestHandler.cs" />
+ <Compile Include="FSpot.Tools.LiveWebGallery\ResourceRequestHandler.cs" />
+ <Compile Include="FSpot.Tools.LiveWebGallery\SimpleWebServer.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\ui\LiveWebGallery.ui">
+ <LogicalName>LiveWebGallery.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ui\gallery.html">
+ <LogicalName>gallery.html</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ui\f-spot.css">
+ <LogicalName>f-spot.css</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ui\f-spot.js">
+ <LogicalName>f-spot.js</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\LiveWebGallery.addin.xml">
+ <LogicalName>LiveWebGallery.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ui\empty.png">
+ <LogicalName>empty.png</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <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="Mono.Posix" />
+ <Reference Include="System" />
+ <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 fe9c9ce..fb32158 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,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.IO;
-using System.Linq;
-using System.Reflection;
-using System.Text;
-
-using FSpot.Core;
-
+//
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text;
+
+using FSpot.Core;
+
using Mono.Unix;
namespace FSpot.Tools.LiveWebGallery
@@ -43,7 +43,7 @@ namespace FSpot.Tools.LiveWebGallery
{
protected string TagsToString (Photo photo)
{
- string tags = photo.Tags.Aggregate("", (current, tag) => current + (", " + tag.Name));
+ string tags = photo.Tags.Aggregate("", (current, tag) => current + (", " + tag.Name));
return tags.Length > 1 ? tags.Substring (2) : tags;
}
@@ -80,28 +80,28 @@ namespace FSpot.Tools.LiveWebGallery
}
public class GalleryRequestHandler : TemplateRequestHandler, ILiveWebGalleryOptions
- {
- public QueryType QueryType { get; set; }
-
- public Tag QueryTag { get; set; }
-
- public bool LimitMaxPhotos { get; set; }
-
- public int MaxPhotos { get; set; }
-
- public bool TaggingAllowed { get; set; }
-
- public Tag EditableTag { get; set; }
-
+ {
+ public QueryType QueryType { get; set; }
+
+ public Tag QueryTag { get; set; }
+
+ public bool LimitMaxPhotos { get; set; }
+
+ public int MaxPhotos { get; set; }
+
+ public bool TaggingAllowed { get; set; }
+
+ public Tag EditableTag { get; set; }
+
private LiveWebGalleryStats stats;
public GalleryRequestHandler (LiveWebGalleryStats stats)
: base ("gallery.html")
- {
- TaggingAllowed = false;
- MaxPhotos = 1000;
- LimitMaxPhotos = true;
- QueryType = QueryType.ByTag;
+ {
+ TaggingAllowed = false;
+ MaxPhotos = 1000;
+ LimitMaxPhotos = true;
+ QueryType = QueryType.ByTag;
this.stats = stats;
template = template.Replace ("TITLE", Catalog.GetString("F-Spot Gallery"));
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 b90d1fd..eba47e1 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,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.Net;
-
-using FSpot.Core;
-using FSpot.Extensions;
-
-using Gtk;
-
+//
+
+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 b732348..696c038 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,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.Net;
-using System.Reflection;
-
-using FSpot.Core;
-
-using Gtk;
-
-using Hyena;
-
+//
+
+using System;
+using System.Net;
+using System.Reflection;
+
+using FSpot.Core;
+
+using Gtk;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Tools.LiveWebGallery
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 01c8e89..17022b9 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,18 +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 System.IO;
-using System.Net;
-using System.Net.Sockets;
-using System.Text;
-using System.Threading;
-
-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.csproj b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
index f16facd..23f4cf7 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
@@ -1,140 +1,140 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{08D1D5D9-22E6-40C8-802F-FD9BF5161481}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Tools.MergeDb</RootNamespace>
- <AssemblyName>FSpot.Tools.MergeDb</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Tools.MergeDb\MergeDbDialog.cs" />
- <Compile Include="FSpot.Tools.MergeDb\MergeDb.cs" />
- <Compile Include="FSpot.Tools.MergeDb\PickFolderDialog.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\MergeDb.addin.xml">
- <LogicalName>MergeDb.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\mergedb_dialog.ui">
- <LogicalName>mergedb_dialog.ui</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\pickfolder_dialog.ui">
- <LogicalName>pickfolder_dialog.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Query\FSpot.Query.csproj">
- <Project>{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}</Project>
- <Name>FSpot.Query</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- </ItemGroup>
- <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="Mono.Posix" />
- <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="gio-sharp">
- <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
- </Reference>
- <Reference Include="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{08D1D5D9-22E6-40C8-802F-FD9BF5161481}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.MergeDb</RootNamespace>
+ <AssemblyName>FSpot.Tools.MergeDb</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.MergeDb\MergeDbDialog.cs" />
+ <Compile Include="FSpot.Tools.MergeDb\MergeDb.cs" />
+ <Compile Include="FSpot.Tools.MergeDb\PickFolderDialog.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\MergeDb.addin.xml">
+ <LogicalName>MergeDb.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\mergedb_dialog.ui">
+ <LogicalName>mergedb_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\pickfolder_dialog.ui">
+ <LogicalName>pickfolder_dialog.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Query\FSpot.Query.csproj">
+ <Project>{D4E4D07E-D323-4CAE-BE04-8EE8EDF7F07E}</Project>
+ <Name>FSpot.Query</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <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="Mono.Posix" />
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gio-sharp">
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 35bdcad..7389907 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,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.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 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;
namespace FSpot.Tools.MergeDb
@@ -333,13 +333,13 @@ namespace FSpot.Tools.MergeDb
{
var parts = uri.AbsolutePath.Split('/');
SafeUri current = new SafeUri (uri.Scheme + ":///", true);
- foreach (string part in parts)
- {
+ foreach (string part in parts)
+ {
current = current.Append (part);
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 039a5d8..2a270db 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
@@ -96,7 +96,7 @@ namespace FSpot.Tools.MergeDb
if (allrolls_radio.Active)
return null;
- return newrolls_radio.Active ? rolls : new Roll [] {rolls [rolls_combo.Active]};
+ return newrolls_radio.Active ? rolls : new Roll [] {rolls [rolls_combo.Active]};
}
}
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 26a7b65..981cc24 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,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 System;
-
-using Hyena;
-
+//
+
+using System;
+
+using Hyena;
+
using Mono.Unix;
namespace FSpot.Tools.MergeDb
@@ -61,7 +61,7 @@ namespace FSpot.Tools.MergeDb
public string Run ()
{
pickfolder_dialog.ShowAll ();
- return pickfolder_dialog.Run () == -6 ? pickfolder_chooser.Filename : null;
+ return pickfolder_dialog.Run () == -6 ? pickfolder_chooser.Filename : null;
}
public Gtk.Dialog Dialog {
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
index 17f2c43..13cf580 100644
--- a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
@@ -1,121 +1,121 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{203D1EDB-3885-4CD7-BBA1-190393E4876A}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Tools.RawPlusJpeg</RootNamespace>
- <AssemblyName>FSpot.Tools.RawPlusJpeg</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Tools.RawPlusJpeg\RawPlusJpeg.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\RawPlusJpeg.addin.xml">
- <LogicalName>RawPlusJpeg.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </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" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
- <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
- <Name>Hyena.Gui</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
- <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
- <Name>FSpot.Utils</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{203D1EDB-3885-4CD7-BBA1-190393E4876A}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.RawPlusJpeg</RootNamespace>
+ <AssemblyName>FSpot.Tools.RawPlusJpeg</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.RawPlusJpeg\RawPlusJpeg.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\RawPlusJpeg.addin.xml">
+ <LogicalName>RawPlusJpeg.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </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" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Gui\Hyena.Gui.csproj">
+ <Project>{C856EFD8-E812-4E61-8B76-E3583D94C233}</Project>
+ <Name>Hyena.Gui</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Utils\FSpot.Utils.csproj">
+ <Project>{CE160879-1BF0-4711-A18F-FDA2772900FA}</Project>
+ <Name>FSpot.Utils</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 2dd8405..59c944d 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,18 +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 FSpot.Core;
-using FSpot.Extensions;
-using FSpot.Imaging;
-
-using Gtk;
-
-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.csproj b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
index 8836f84..283c788 100644
--- a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
@@ -1,112 +1,112 @@
-<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{55199016-6D69-4F52-AB82-06FC99408E78}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Tools.RetroactiveRoll</RootNamespace>
- <AssemblyName>FSpot.Tools.RetroactiveRoll</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Tools.RetroactiveRoll\RetroactiveRoll.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\RetroactiveRoll.addin.xml">
- <LogicalName>RetroactiveRoll.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
- <Name>Hyena</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
- <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
- <Name>Hyena.Data.Sqlite</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{55199016-6D69-4F52-AB82-06FC99408E78}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.RetroactiveRoll</RootNamespace>
+ <AssemblyName>FSpot.Tools.RetroactiveRoll</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.RetroactiveRoll\RetroactiveRoll.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\RetroactiveRoll.addin.xml">
+ <LogicalName>RetroactiveRoll.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena\Hyena.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E12}</Project>
+ <Name>Hyena</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\..\lib\Hyena\Hyena.Data.Sqlite\Hyena.Data.Sqlite.csproj">
+ <Project>{95374549-9553-4C1E-9D89-667755F90E13}</Project>
+ <Name>Hyena.Data.Sqlite</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 b7f47c6..5916e0d 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 System;
-
-using FSpot.Core;
-using FSpot.Extensions;
-
-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.csproj b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
index 366426a..078eee2 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
@@ -1,119 +1,119 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{A19E926A-19C5-428B-8518-8CCC7B255C42}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Tools.ScreensaverConfig</RootNamespace>
- <AssemblyName>FSpot.Tools.ScreensaverConfig</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Tools.ScreensaverConfig\ScreensaverConfig.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\ScreensaverConfig.addin.xml">
- <LogicalName>ScreensaverConfig.addin.xml</LogicalName>
- </EmbeddedResource>
- <EmbeddedResource Include="Resources\ScreensaverConfigDialog.ui">
- <LogicalName>ScreensaverConfigDialog.ui</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </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="gtk-sharp-beans">
- <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
- </Reference>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
- <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
- <Name>FSpot.Core</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
- <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
- <Name>MainApp</Name>
- </ProjectReference>
- <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{A19E926A-19C5-428B-8518-8CCC7B255C42}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.ScreensaverConfig</RootNamespace>
+ <AssemblyName>FSpot.Tools.ScreensaverConfig</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.ScreensaverConfig\ScreensaverConfig.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\ScreensaverConfig.addin.xml">
+ <LogicalName>ScreensaverConfig.addin.xml</LogicalName>
+ </EmbeddedResource>
+ <EmbeddedResource Include="Resources\ScreensaverConfigDialog.ui">
+ <LogicalName>ScreensaverConfigDialog.ui</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </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="gtk-sharp-beans">
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Core\FSpot.Core\FSpot.Core.csproj">
+ <Project>{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}</Project>
+ <Name>FSpot.Core</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Clients\MainApp\MainApp.csproj">
+ <Project>{27EC05FB-0223-4B26-8157-E49AF81D0007}</Project>
+ <Name>MainApp</Name>
+ </ProjectReference>
+ <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 8044408..e554cf0 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,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.Reflection;
-
-using FSpot.Core;
-using FSpot.Extensions;
-using FSpot.UI.Dialog;
-using FSpot.Widgets;
-
+//
+
+using System;
+using System.Reflection;
+
+using FSpot.Core;
+using FSpot.Extensions;
+using FSpot.UI.Dialog;
+using FSpot.Widgets;
+
using Gtk;
namespace FSpot.Tools.ScreensaverConfig
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 c9b6d19..d0389ab 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,18 +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 Cairo;
-
-using FSpot.Transitions;
-
-using Gdk;
-
-using Mono.Unix;
-
+//
+
+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.Cover/FSpot.Transitions.Cover.csproj b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Transitions.Cover.csproj
index 1b2e9b1..acbe665 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Transitions.Cover.csproj
+++ b/src/Extensions/Transitions/FSpot.Transitions.Cover/FSpot.Transitions.Cover.csproj
@@ -1,106 +1,106 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Transitions</RootNamespace>
- <AssemblyName>FSpot.Transitions.Cover</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <Compile Include="FSpot.Addins.Transitions\Cover.cs" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\CoverTransition.addin.xml">
- <LogicalName>CoverTransition.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Cairo" />
- <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
- <Reference Include="Mono.Posix" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Transitions</RootNamespace>
+ <AssemblyName>FSpot.Transitions.Cover</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Transitions\Cover.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\CoverTransition.addin.xml">
+ <LogicalName>CoverTransition.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="glib-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Mono.Cairo" />
+ <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Mono.Posix" />
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
</Project>
\ No newline at end of file
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 8d01d12..4229a80 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,18 +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 Cairo;
-
-using FSpot.Transitions;
-
-using Gdk;
-
-using Mono.Unix;
-
+//
+
+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.Transitions.Dissolve.csproj b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Transitions.Dissolve.csproj
index d202adf..a30eea5 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Transitions.Dissolve.csproj
+++ b/src/Extensions/Transitions/FSpot.Transitions.Dissolve/FSpot.Transitions.Dissolve.csproj
@@ -1,106 +1,106 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{ECF8996A-DE63-4225-927F-84641E0EB794}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Transitions</RootNamespace>
- <AssemblyName>FSpot.Transitions.Dissolve</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\DissolveTransition.addin.xml">
- <LogicalName>DissolveTransition.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="gdk-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="Mono.Cairo" />
- <Reference Include="Mono.Posix" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
- <ItemGroup>
- <Compile Include="FSpot.Addins.Transitions\Dissolve.cs" />
- </ItemGroup>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{ECF8996A-DE63-4225-927F-84641E0EB794}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Transitions</RootNamespace>
+ <AssemblyName>FSpot.Transitions.Dissolve</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\DissolveTransition.addin.xml">
+ <LogicalName>DissolveTransition.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="gdk-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="Mono.Cairo" />
+ <Reference Include="Mono.Posix" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Transitions\Dissolve.cs" />
+ </ItemGroup>
</Project>
\ No newline at end of file
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 f064839..e063051 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,18 +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 Cairo;
-
-using FSpot.Transitions;
-
-using Gdk;
-
-using Mono.Unix;
-
+//
+
+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.Transitions.Push.csproj b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Transitions.Push.csproj
index 7f19d23..979cb52 100644
--- a/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Transitions.Push.csproj
+++ b/src/Extensions/Transitions/FSpot.Transitions.Push/FSpot.Transitions.Push.csproj
@@ -1,106 +1,106 @@
-ï<?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>
- <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
- <ProductVersion>9.0.21022</ProductVersion>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectGuid>{D6004A34-A123-415D-A79C-21FD3F96A1E5}</ProjectGuid>
- <OutputType>Library</OutputType>
- <RootNamespace>FSpot.Addins.Transitions</RootNamespace>
- <AssemblyName>FSpot.Transitions.Push</AssemblyName>
- <ReleaseVersion>0.9.0</ReleaseVersion>
- <FileUpgradeFlags>
- </FileUpgradeFlags>
- <OldToolsVersion>3.5</OldToolsVersion>
- <UpgradeBackupLocation />
- <PublishUrl>publish\</PublishUrl>
- <Install>true</Install>
- <InstallFrom>Disk</InstallFrom>
- <UpdateEnabled>false</UpdateEnabled>
- <UpdateMode>Foreground</UpdateMode>
- <UpdateInterval>7</UpdateInterval>
- <UpdateIntervalUnits>Days</UpdateIntervalUnits>
- <UpdatePeriodically>false</UpdatePeriodically>
- <UpdateRequired>false</UpdateRequired>
- <MapFileExtensions>true</MapFileExtensions>
- <ApplicationRevision>0</ApplicationRevision>
- <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
- <IsWebBootstrapper>false</IsWebBootstrapper>
- <UseApplicationTrust>false</UseApplicationTrust>
- <BootstrapperEnabled>true</BootstrapperEnabled>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <DebugSymbols>true</DebugSymbols>
- <DebugType>full</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <DefineConstants>DEBUG</DefineConstants>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
- <DebugType>none</DebugType>
- <Optimize>false</Optimize>
- <OutputPath>..\..\..\..\bin</OutputPath>
- <ErrorReport>prompt</ErrorReport>
- <WarningLevel>4</WarningLevel>
- <ConsolePause>false</ConsolePause>
- <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
- </PropertyGroup>
- <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
- <ItemGroup>
- <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
- <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
- <Name>FSpot.Gui</Name>
- </ProjectReference>
- </ItemGroup>
- <ItemGroup>
- <Reference Include="gdk-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="Mono.Cairo" />
- <Reference Include="Mono.Posix" />
- </ItemGroup>
- <ItemGroup>
- <EmbeddedResource Include="Resources\PushTransition.addin.xml">
- <LogicalName>PushTransition.addin.xml</LogicalName>
- </EmbeddedResource>
- </ItemGroup>
- <ItemGroup>
- <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
- <Install>false</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
- <Visible>False</Visible>
- <ProductName>.NET Framework 3.5 SP1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
- <Visible>False</Visible>
- <ProductName>Windows Installer 3.1</ProductName>
- <Install>true</Install>
- </BootstrapperPackage>
- </ItemGroup>
- <ItemGroup>
- <Compile Include="FSpot.Addins.Transitions\Push.cs" />
- </ItemGroup>
- <ProjectExtensions>
- <MonoDevelop>
- <Properties>
- <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
- <BuildFilesVar Sync="true" Name="SOURCES" />
- <DeployFilesVar />
- <ResourcesVar Sync="true" Name="RESOURCES" />
- <OthersVar />
- <GacRefVar />
- <AsmRefVar />
- <ProjectRefVar />
- </MonoDevelop.Autotools.MakefileInfo>
- </Properties>
- </MonoDevelop>
- </ProjectExtensions>
+ï<?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>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+ <ProductVersion>9.0.21022</ProductVersion>
+ <SchemaVersion>2.0</SchemaVersion>
+ <ProjectGuid>{D6004A34-A123-415D-A79C-21FD3F96A1E5}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Addins.Transitions</RootNamespace>
+ <AssemblyName>FSpot.Transitions.Push</AssemblyName>
+ <ReleaseVersion>0.9.0</ReleaseVersion>
+ <FileUpgradeFlags>
+ </FileUpgradeFlags>
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <PublishUrl>publish\</PublishUrl>
+ <Install>true</Install>
+ <InstallFrom>Disk</InstallFrom>
+ <UpdateEnabled>false</UpdateEnabled>
+ <UpdateMode>Foreground</UpdateMode>
+ <UpdateInterval>7</UpdateInterval>
+ <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+ <UpdatePeriodically>false</UpdatePeriodically>
+ <UpdateRequired>false</UpdateRequired>
+ <MapFileExtensions>true</MapFileExtensions>
+ <ApplicationRevision>0</ApplicationRevision>
+ <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+ <IsWebBootstrapper>false</IsWebBootstrapper>
+ <UseApplicationTrust>false</UseApplicationTrust>
+ <BootstrapperEnabled>true</BootstrapperEnabled>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+ <DebugSymbols>true</DebugSymbols>
+ <DebugType>full</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <DefineConstants>DEBUG</DefineConstants>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+ <DebugType>none</DebugType>
+ <Optimize>false</Optimize>
+ <OutputPath>..\..\..\..\bin</OutputPath>
+ <ErrorReport>prompt</ErrorReport>
+ <WarningLevel>4</WarningLevel>
+ <ConsolePause>false</ConsolePause>
+ <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <ProjectReference Include="..\..\..\Core\FSpot.Gui\FSpot.Gui.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Gui</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="gdk-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="Mono.Cairo" />
+ <Reference Include="Mono.Posix" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\PushTransition.addin.xml">
+ <LogicalName>PushTransition.addin.xml</LogicalName>
+ </EmbeddedResource>
+ </ItemGroup>
+ <ItemGroup>
+ <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+ <Install>false</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+ <Visible>False</Visible>
+ <ProductName>.NET Framework 3.5 SP1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+ <Visible>False</Visible>
+ <ProductName>Windows Installer 3.1</ProductName>
+ <Install>true</Install>
+ </BootstrapperPackage>
+ </ItemGroup>
+ <ItemGroup>
+ <Compile Include="FSpot.Addins.Transitions\Push.cs" />
+ </ItemGroup>
+ <ProjectExtensions>
+ <MonoDevelop>
+ <Properties>
+ <MonoDevelop.Autotools.MakefileInfo IntegrationEnabled="true" RelativeMakefileName="Makefile.am" BuildTargetName="" CleanTargetName="" IsAutotoolsProject="true" RelativeConfigureInPath="../../../..">
+ <BuildFilesVar Sync="true" Name="SOURCES" />
+ <DeployFilesVar />
+ <ResourcesVar Sync="true" Name="RESOURCES" />
+ <OthersVar />
+ <GacRefVar />
+ <AsmRefVar />
+ <ProjectRefVar />
+ </MonoDevelop.Autotools.MakefileInfo>
+ </Properties>
+ </MonoDevelop>
+ </ProjectExtensions>
</Project>
\ No newline at end of file
diff --git a/tools/copyrightify.py b/tools/copyrightify.py
old mode 100755
new mode 100644
diff --git a/tools/f-spot-import b/tools/f-spot-import
old mode 100755
new mode 100644
diff --git a/tools/f-spot-screensaver b/tools/f-spot-screensaver
old mode 100755
new mode 100644
diff --git a/tools/f-spot-sqlite-upgrade b/tools/f-spot-sqlite-upgrade
old mode 100755
new mode 100644
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
