[f-spot] Clean and add all remaining tools to the Monodevelop build.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Clean and add all remaining tools to the Monodevelop build.
- Date: Tue, 10 Aug 2010 10:00:56 +0000 (UTC)
commit 467a3bfefdb6582406abfde4275789d966640dd1
Author: Ruben Vermeersch <ruben savanne be>
Date: Tue Aug 10 11:57:08 2010 +0200
Clean and add all remaining tools to the Monodevelop build.
F-Spot.sln | 63 +++++++++++
po/POTFILES.in | 18 ++--
po/POTFILES.skip | 14 ++--
.../FSpot.Tools.DevelopInUFraw.csproj | 94 +++++++++++++++++
.../AbstractDevelopInUFRaw.cs} | 57 +----------
.../FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs | 40 +++++++
.../DevelopInUFRawBatch.cs | 39 +++++++
.../Tools/FSpot.Tools.DevelopInUFraw/Makefile.am | 9 +-
.../{ => Resources}/DevelopInUFRaw.addin.xml | 4 +-
.../FSpot.Tools.HashJob/FSpot.Tools.HashJob.csproj | 72 +++++++++++++
.../{ => }/FSpot.Tools.HashJob/HashJob.cs | 2 +-
.../Tools/FSpot.Tools.HashJob/Makefile.am | 4 +-
.../{ => Resources}/HashJob.addin.xml | 2 +-
.../FSpot.Tools.LiveWebGallery.csproj | 109 ++++++++++++++++++++
.../GalleryRequestHandler.cs | 2 +-
.../FSpot.Tools.LiveWebGallery/LiveWebGallery.cs | 2 +-
.../LiveWebGalleryDialog.cs | 2 +-
.../PhotoRequestHandler.cs | 2 +-
.../ResourceRequestHandler.cs | 2 +-
.../FSpot.Tools.LiveWebGallery/SimpleWebServer.cs | 2 +-
.../Tools/FSpot.Tools.LiveWebGallery/Makefile.am | 27 +++---
.../{ => Resources}/LiveWebGallery.addin.xml | 2 +-
.../{ => Resources}/ui/LiveWebGallery.ui | 0
.../{ => Resources}/ui/empty.png | Bin 167 -> 167 bytes
.../{ => Resources}/ui/f-spot.css | 0
.../{ => Resources}/ui/f-spot.js | 0
.../{ => Resources}/ui/gallery.html | 0
.../FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj | 102 ++++++++++++++++++
.../{ => }/FSpot.Tools.MergeDb/MergeDb.cs | 9 +--
.../{ => }/FSpot.Tools.MergeDb/MergeDbDialog.cs | 2 +-
.../{ => }/FSpot.Tools.MergeDb/PickFolderDialog.cs | 2 +-
.../Tools/FSpot.Tools.MergeDb/Makefile.am | 14 ++--
.../{ => Resources}/MergeDb.addin.xml | 2 +-
.../{ => Resources}/MergeDb.glade | 0
.../FSpot.Tools.RawPlusJpeg.csproj | 87 ++++++++++++++++
.../{ => }/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs | 2 +-
.../Tools/FSpot.Tools.RawPlusJpeg/Makefile.am | 4 +-
.../{ => Resources}/RawPlusJpeg.addin.xml | 2 +-
.../FSpot.Tools.RetroactiveRoll.csproj | 79 ++++++++++++++
.../FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs | 3 +-
.../Tools/FSpot.Tools.RetroactiveRoll/Makefile.am | 4 +-
.../{ => Resources}/RetroactiveRoll.addin.xml | 2 +-
.../FSpot.Tools.ScreensaverConfig.csproj | 85 +++++++++++++++
.../ScreensaverConfig.cs | 2 +-
.../FSpot.Tools.ScreensaverConfig/Makefile.am | 8 +-
.../{ => Resources}/ScreensaverConfig.addin.xml | 2 +-
.../{ => Resources}/ScreensaverConfigDialog.ui | 0
47 files changed, 845 insertions(+), 134 deletions(-)
---
diff --git a/F-Spot.sln b/F-Spot.sln
index 6c3f13b..ba465cb 100644
--- a/F-Spot.sln
+++ b/F-Spot.sln
@@ -63,6 +63,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tools", "Tools", "{78EC5D8B
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.ChangePhotoPath", "src\Extensions\Tools\FSpot.Tools.ChangePhotoPath\FSpot.Tools.ChangePhotoPath.csproj", "{4E372D8D-A822-40F2-8C64-25F2296DAC6F}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.DevelopInUFraw", "src\Extensions\Tools\FSpot.Tools.DevelopInUFraw\FSpot.Tools.DevelopInUFraw.csproj", "{FBA30EB0-05EB-446D-827D-D41EBF4B81E4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.HashJob", "src\Extensions\Tools\FSpot.Tools.HashJob\FSpot.Tools.HashJob.csproj", "{C139215A-8DB6-4339-A8D0-10F4B40F693D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.LiveWebGallery", "src\Extensions\Tools\FSpot.Tools.LiveWebGallery\FSpot.Tools.LiveWebGallery.csproj", "{B850C11B-69B7-45A4-AB1D-1BECA8C667C0}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.MergeDb", "src\Extensions\Tools\FSpot.Tools.MergeDb\FSpot.Tools.MergeDb.csproj", "{08D1D5D9-22E6-40C8-802F-FD9BF5161481}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.RawPlusJpeg", "src\Extensions\Tools\FSpot.Tools.RawPlusJpeg\FSpot.Tools.RawPlusJpeg.csproj", "{203D1EDB-3885-4CD7-BBA1-190393E4876A}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.RetroactiveRoll", "src\Extensions\Tools\FSpot.Tools.RetroactiveRoll\FSpot.Tools.RetroactiveRoll.csproj", "{55199016-6D69-4F52-AB82-06FC99408E78}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Tools.ScreensaverConfig", "src\Extensions\Tools\FSpot.Tools.ScreensaverConfig\FSpot.Tools.ScreensaverConfig.csproj", "{A19E926A-19C5-428B-8518-8CCC7B255C42}"
+EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Exporters", "Exporters", "{C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FSpot.Exporters.CD", "src\Extensions\Exporters\FSpot.Exporters.CD\FSpot.Exporters.CD.csproj", "{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983}"
@@ -102,6 +116,12 @@ Global
{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Release|Any CPU.Build.0 = Release|Any CPU
{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{0735C3A2-17C1-4C8B-9653-3854AFD64D6D}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Release|Any CPU.Build.0 = Release|Any CPU
+ {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {08D1D5D9-22E6-40C8-802F-FD9BF5161481}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Debug|Any CPU.Build.0 = Debug|Any CPU
{13D4FF63-5D83-42D7-AE4C-56BB512D5D89}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -114,6 +134,12 @@ Global
{1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Release|Any CPU.Build.0 = Release|Any CPU
{1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{1F610540-D2ED-4F58-87CE-9092A43DBD4A}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Release|Any CPU.Build.0 = Release|Any CPU
+ {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {203D1EDB-3885-4CD7-BBA1-190393E4876A}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{27EC05FB-0223-4B26-8157-E49AF81D0007}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{27EC05FB-0223-4B26-8157-E49AF81D0007}.Debug|Any CPU.Build.0 = Debug|Any CPU
{27EC05FB-0223-4B26-8157-E49AF81D0007}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -168,6 +194,12 @@ Global
{53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Release|Any CPU.Build.0 = Release|Any CPU
{53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{53DAC12F-0421-4F5E-A746-17A701D2BDDA}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {55199016-6D69-4F52-AB82-06FC99408E78}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {55199016-6D69-4F52-AB82-06FC99408E78}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {55199016-6D69-4F52-AB82-06FC99408E78}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {55199016-6D69-4F52-AB82-06FC99408E78}.Release|Any CPU.Build.0 = Release|Any CPU
+ {55199016-6D69-4F52-AB82-06FC99408E78}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {55199016-6D69-4F52-AB82-06FC99408E78}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{57EDC3BC-E777-4400-B4E7-32A5D8F15A76}.Debug|Any CPU.Build.0 = Debug|Any CPU
{61DAD6B1-E866-485B-819E-A9E86B793F5E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
@@ -236,12 +268,24 @@ Global
{9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Release|Any CPU.Build.0 = Release|Any CPU
{9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{9D66BC1B-4390-4B8D-8468-19D5A862EC23}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {A19E926A-19C5-428B-8518-8CCC7B255C42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A19E926A-19C5-428B-8518-8CCC7B255C42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A19E926A-19C5-428B-8518-8CCC7B255C42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A19E926A-19C5-428B-8518-8CCC7B255C42}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A19E926A-19C5-428B-8518-8CCC7B255C42}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {A19E926A-19C5-428B-8518-8CCC7B255C42}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Release|Any CPU.Build.0 = Release|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{B5CDF05C-278A-40AA-A587-B27A00BD9135}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {B850C11B-69B7-45A4-AB1D-1BECA8C667C0}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Debug|Any CPU.Build.0 = Submodule|Any CPU
{BB1D1D81-7A74-4183-B7B1-3E78B32D42F1}.Release|Any CPU.ActiveCfg = Debug|Any CPU
@@ -254,6 +298,12 @@ Global
{BE981FC8-9B41-4336-815C-ECC365AE05D4}.Release|Any CPU.Build.0 = Release|Any CPU
{BE981FC8-9B41-4336-815C-ECC365AE05D4}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{BE981FC8-9B41-4336-815C-ECC365AE05D4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {C139215A-8DB6-4339-A8D0-10F4B40F693D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {C139215A-8DB6-4339-A8D0-10F4B40F693D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C139215A-8DB6-4339-A8D0-10F4B40F693D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {C139215A-8DB6-4339-A8D0-10F4B40F693D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {C139215A-8DB6-4339-A8D0-10F4B40F693D}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {C139215A-8DB6-4339-A8D0-10F4B40F693D}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.ActiveCfg = Submodule|Any CPU
{C856EFD8-E812-4E61-8B76-E3583D94C233}.Debug|Any CPU.Build.0 = Submodule|Any CPU
{C856EFD8-E812-4E61-8B76-E3583D94C233}.Release|Any CPU.ActiveCfg = Debug|Any CPU
@@ -278,6 +328,12 @@ Global
{E55F73E0-576A-4FE2-9108-E76960820AA3}.Release|Any CPU.Build.0 = Release|Any CPU
{E55F73E0-576A-4FE2-9108-E76960820AA3}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
{E55F73E0-576A-4FE2-9108-E76960820AA3}.Submodule|Any CPU.Build.0 = Debug|Any CPU
+ {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Submodule|Any CPU.ActiveCfg = Debug|Any CPU
+ {FBA30EB0-05EB-446D-827D-D41EBF4B81E4}.Submodule|Any CPU.Build.0 = Debug|Any CPU
{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FFC3D9B1-B19A-44D8-8AA2-96DDE911320E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -314,6 +370,13 @@ Global
{1F610540-D2ED-4F58-87CE-9092A43DBD4A} = {416E19A2-9CD9-498F-BE75-20AB74535ACD}
{7203A6ED-DA2E-4D56-B1AF-4C296A1C39D5} = {E9BCB7B9-3D8C-4C5C-B6FA-0BBAC6611106}
{4E372D8D-A822-40F2-8C64-25F2296DAC6F} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
+ {FBA30EB0-05EB-446D-827D-D41EBF4B81E4} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
+ {C139215A-8DB6-4339-A8D0-10F4B40F693D} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
+ {B850C11B-69B7-45A4-AB1D-1BECA8C667C0} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
+ {08D1D5D9-22E6-40C8-802F-FD9BF5161481} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
+ {203D1EDB-3885-4CD7-BBA1-190393E4876A} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
+ {55199016-6D69-4F52-AB82-06FC99408E78} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
+ {A19E926A-19C5-428B-8518-8CCC7B255C42} = {78EC5D8B-299B-4724-844D-6F3A8E8D1536}
{3CBAA4AE-AC83-4043-BBB5-6EA7962EC983} = {C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}
{7004A4E6-12A5-46F1-BB1F-578FA9B63493} = {C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}
{13D4FF63-5D83-42D7-AE4C-56BB512D5D89} = {C9302C4A-B571-4F8E-8FFA-7B4C7DF8B3E3}
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3c6df6a..8090777 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -116,13 +116,13 @@ src/Extensions/Exporters/FSpot.Exporters.Tabblo/FSpot.Exporters.Tabblo/TabbloExp
src/Extensions/Exporters/FSpot.Exporters.Zip/FSpot.Exporters.Zip/ZipExport.cs
[type: gettext/glade]src/Extensions/Exporters/FSpot.Exporters.Zip/Resources/ZipExport.glade
[type: gettext/glade]src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.glade
-src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
-src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.cs
-src/Extensions/Tools/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
-src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
-[type: gettext/glade]src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/LiveWebGallery.ui
-src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.cs
-[type: gettext/glade]src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.glade
-src/Extensions/Tools/FSpot.Tools.MergeDb/PickFolderDialog.cs
-[type: gettext/glade]src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfigDialog.ui
+src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
+src/Extensions/Tools/FSpot.Tools.HashJob/FSpot.Tools.HashJob/HashJob.cs
+src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
+src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
+[type: gettext/glade]src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui
+src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
+[type: gettext/glade]src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.glade
+src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
+[type: gettext/glade]src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui
tools/f-spot-screensaver.desktop.in
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index e89bb2d..f5e7e73 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -22,19 +22,19 @@ lib/Hyena/Hyena/Hyena.Query/StringQueryValue.cs
lib/Hyena/Mono.Data.Sqlite/Mono.Data.Sqlite/SR.Designer.cs
src/Core/FSpot.Widgets/FSpot.Widgets/DateEdit.cs
src/Extensions/Tools/FSpot.Tools.ChangePhotoPath/Resources/ChangePhotoPath.addin.xml
-src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.addin.xml
-src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.addin.xml
-src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGallery.addin.xml
-src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.addin.xml
+src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml
+src/Extensions/Tools/FSpot.Tools.HashJob/Resources/HashJob.addin.xml
+src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml
+src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml
src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.addin.xml
src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.cs
src/Extensions/Tools/FSpot.Tools.MetaPixel/MetaPixel.glade
src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.addin.xml
src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.cs
src/Extensions/Tools/FSpot.Tools.PictureTile/PictureTile.glade
-src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.addin.xml
-src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.addin.xml
-src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.addin.xml
+src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml
+src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml
+src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml
src/Extensions/Tools/FSpot.Tools.SyncCatalog/SyncCatalog.addin.xml
src/Extensions/Tools/FSpot.Tools.SyncCatalog/SyncCatalog.cs
src/Extensions/Exporters/FSpot.Exporters.CD/Resources/CDExport.addin.xml
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
new file mode 100644
index 0000000..1056399
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw.csproj
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" 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>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>0.7.2</ReleaseVersion>
+ </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>
+ </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>
+ </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>
+ <Folder Include="Resources\" />
+ <Folder Include="FSpot.Tools.DevelopInUFraw\" />
+ </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="Mono.Posix" />
+ <Reference Include="System" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="gtk-sharp-beans, Version=2.14.0.0, Culture=neutral, PublicKeyToken=97a95fb57b03c03a">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <Reference Include="System.Core" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
similarity index 79%
rename from src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
rename to src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
index a3ab724..af2fe6c 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs
@@ -1,17 +1,6 @@
-/*
- * DevelopInUFraw.cs
- *
- * Author(s)
- * Stephane Delcroix <stephane delcroix org>
- *
- * This is free software. See COPYING for details
- */
-
using System;
using System.IO;
-
using Mono.Unix;
-
using Hyena;
using FSpot;
using FSpot.Core;
@@ -20,51 +9,9 @@ using FSpot.Extensions;
using FSpot.Imaging;
using FSpot.UI.Dialog;
-namespace DevelopInUFRawExtension
+namespace FSpot.Tools.DevelopInUFraw
{
- // GUI Version
- public class DevelopInUFRaw : AbstractDevelopInUFRaw {
- public DevelopInUFRaw() : base("ufraw")
- {
- }
-
- public override void Run (object o, EventArgs e)
- {
- Log.Information ("Executing DevelopInUFRaw extension");
-
- foreach (Photo p in App.Instance.Organizer.SelectedPhotos ()) {
- DevelopPhoto (p);
- }
- }
- }
-
- // Batch Version
- public class DevelopInUFRawBatch : AbstractDevelopInUFRaw {
- public DevelopInUFRawBatch() : base("ufraw-batch")
- {
- }
-
- public override void Run (object o, EventArgs e)
- {
- ProgressDialog pdialog = new ProgressDialog(Catalog.GetString ("Developing photos"),
- ProgressDialog.CancelButtonType.Cancel,
- App.Instance.Organizer.SelectedPhotos ().Length,
- App.Instance.Organizer.Window);
- Log.Information ("Executing DevelopInUFRaw extension in batch mode");
-
- foreach (Photo p in App.Instance.Organizer.SelectedPhotos ()) {
- bool cancelled = pdialog.Update(String.Format(Catalog.GetString ("Developing {0}"), p.Name));
- if (cancelled) {
- break;
- }
-
- DevelopPhoto (p);
- }
- pdialog.Destroy();
- }
- }
-
- // Abstract version, contains shared functionality
+ // Abstract version, contains shared functionality
public abstract class AbstractDevelopInUFRaw : ICommand
{
// The executable used for developing RAWs
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
new file mode 100644
index 0000000..17a5cd5
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs
@@ -0,0 +1,40 @@
+/*
+ * DevelopInUFraw.cs
+ *
+ * Author(s)
+ * Stephane Delcroix <stephane delcroix org>
+ *
+ * This is free software. See COPYING for details
+ */
+
+using System;
+using System.IO;
+
+using Mono.Unix;
+
+using Hyena;
+using FSpot;
+using FSpot.Core;
+using FSpot.Utils;
+using FSpot.Extensions;
+using FSpot.Imaging;
+using FSpot.UI.Dialog;
+
+namespace FSpot.Tools.DevelopInUFraw
+{
+ // GUI Version
+ public class DevelopInUFRaw : AbstractDevelopInUFRaw {
+ public DevelopInUFRaw() : base("ufraw")
+ {
+ }
+
+ public override void Run (object o, EventArgs e)
+ {
+ Log.Information ("Executing DevelopInUFRaw extension");
+
+ foreach (Photo p in App.Instance.Organizer.SelectedPhotos ()) {
+ DevelopPhoto (p);
+ }
+ }
+ }
+}
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
new file mode 100644
index 0000000..06f9914
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
@@ -0,0 +1,39 @@
+using System;
+using System.IO;
+using Mono.Unix;
+using Hyena;
+using FSpot;
+using FSpot.Core;
+using FSpot.Utils;
+using FSpot.Extensions;
+using FSpot.Imaging;
+using FSpot.UI.Dialog;
+
+namespace FSpot.Tools.DevelopInUFraw
+{
+ // Batch Version
+ public class DevelopInUFRawBatch : AbstractDevelopInUFRaw {
+ public DevelopInUFRawBatch() : base("ufraw-batch")
+ {
+ }
+
+ public override void Run (object o, EventArgs e)
+ {
+ ProgressDialog pdialog = new ProgressDialog(Catalog.GetString ("Developing photos"),
+ ProgressDialog.CancelButtonType.Cancel,
+ App.Instance.Organizer.SelectedPhotos ().Length,
+ App.Instance.Organizer.Window);
+ Log.Information ("Executing DevelopInUFRaw extension in batch mode");
+
+ foreach (Photo p in App.Instance.Organizer.SelectedPhotos ()) {
+ bool cancelled = pdialog.Update(String.Format(Catalog.GetString ("Developing {0}"), p.Name));
+ if (cancelled) {
+ break;
+ }
+
+ DevelopPhoto (p);
+ }
+ pdialog.Destroy();
+ }
+ }
+}
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Makefile.am b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Makefile.am
index cfdcded..6e2f998 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Makefile.am
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Makefile.am
@@ -3,10 +3,11 @@ TARGET = library
LINK = $(REF_FSPOT_EXTENSION_DEVELOPINUFRAW)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = \
- DevelopInUFRaw.cs
+SOURCES = \
+ FSpot.Tools.DevelopInUFraw/AbstractDevelopInUFRaw.cs \
+ FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.cs \
+ FSpot.Tools.DevelopInUFraw/DevelopInUFRawBatch.cs
-RESOURCES = \
- DevelopInUFRaw.addin.xml
+RESOURCES = Resources/DevelopInUFRaw.addin.xml
include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.addin.xml b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml
similarity index 80%
rename from src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.addin.xml
rename to src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml
index d4f48c2..679f0dc 100644
--- a/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/DevelopInUFRaw.addin.xml
+++ b/src/Extensions/Tools/FSpot.Tools.DevelopInUFraw/Resources/DevelopInUFRaw.addin.xml
@@ -12,9 +12,9 @@
<Addin id="Core" version="0.8"/>
</Dependencies>
<Extension path = "/FSpot/Menus/PhotoPopup">
- <Command id = "DevelopInUFRaw" _label = "Develop in UFRaw" command_type = "DevelopInUFRawExtension.DevelopInUFRaw" insertbefore="OpenWith"/>
+ <Command id = "DevelopInUFRaw" _label = "Develop in UFRaw" command_type = "FSpot.Tools.DevelopInUFraw.DevelopInUFRaw" insertbefore="OpenWith"/>
<Condition id="PhotoSelection" selection="multiple">
- <Command id = "DevelopInUFRawBatch" _label = "Batch Develop" command_type = "DevelopInUFRawExtension.DevelopInUFRawBatch" insertbefore="OpenWith"/>
+ <Command id = "DevelopInUFRawBatch" _label = "Batch Develop" command_type = "FSpot.Tools.DevelopInUFraw.DevelopInUFRawBatch" insertbefore="OpenWith"/>
</Condition>
</Extension>
</Addin>
diff --git a/src/Extensions/Tools/FSpot.Tools.HashJob/FSpot.Tools.HashJob.csproj b/src/Extensions/Tools/FSpot.Tools.HashJob/FSpot.Tools.HashJob.csproj
new file mode 100644
index 0000000..be98f60
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.HashJob/FSpot.Tools.HashJob.csproj
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" 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>{C139215A-8DB6-4339-A8D0-10F4B40F693D}</ProjectGuid>
+ <OutputType>Library</OutputType>
+ <RootNamespace>FSpot.Tools.HashJob</RootNamespace>
+ <AssemblyName>FSpot.Tools.HashJob</AssemblyName>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>0.7.2</ReleaseVersion>
+ </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>
+ </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>
+ </PropertyGroup>
+ <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
+ <ItemGroup>
+ <Compile Include="FSpot.Tools.HashJob\HashJob.cs" />
+ </ItemGroup>
+ <ItemGroup>
+ <EmbeddedResource Include="Resources\HashJob.addin.xml">
+ <LogicalName>HashJob.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="System.Data" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="gtk-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>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="Resources\" />
+ <Folder Include="FSpot.Tools.HashJob\" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.cs b/src/Extensions/Tools/FSpot.Tools.HashJob/FSpot.Tools.HashJob/HashJob.cs
similarity index 99%
rename from src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.cs
rename to src/Extensions/Tools/FSpot.Tools.HashJob/FSpot.Tools.HashJob/HashJob.cs
index 8f52631..5e5f9c2 100644
--- a/src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.cs
+++ b/src/Extensions/Tools/FSpot.Tools.HashJob/FSpot.Tools.HashJob/HashJob.cs
@@ -19,7 +19,7 @@ using FSpot;
using FSpot.Extensions;
using FSpot.Jobs;
-namespace HashJobExtension {
+namespace FSpot.Tools.HashJob {
public class HashJob : ICommand {
public void Run (object o, EventArgs e) {
diff --git a/src/Extensions/Tools/FSpot.Tools.HashJob/Makefile.am b/src/Extensions/Tools/FSpot.Tools.HashJob/Makefile.am
index 5530521..72e441d 100644
--- a/src/Extensions/Tools/FSpot.Tools.HashJob/Makefile.am
+++ b/src/Extensions/Tools/FSpot.Tools.HashJob/Makefile.am
@@ -3,7 +3,7 @@ TARGET = library
LINK = $(REF_FSPOT_EXTENSION_HASHJOB)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = HashJob.cs
-RESOURCES = HashJob.addin.xml
+SOURCES = FSpot.Tools.HashJob/HashJob.cs
+RESOURCES = Resources/HashJob.addin.xml
include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.addin.xml b/src/Extensions/Tools/FSpot.Tools.HashJob/Resources/HashJob.addin.xml
similarity index 90%
rename from src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.addin.xml
rename to src/Extensions/Tools/FSpot.Tools.HashJob/Resources/HashJob.addin.xml
index 22ce217..559cf9c 100644
--- a/src/Extensions/Tools/FSpot.Tools.HashJob/HashJob.addin.xml
+++ b/src/Extensions/Tools/FSpot.Tools.HashJob/Resources/HashJob.addin.xml
@@ -11,6 +11,6 @@
<Addin id="Core" version="0.8"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
- <Command id = "HashDupes" _label = "Check for Duplicates..." command_type = "HashJobExtension.HashJob" />
+ <Command id = "HashDupes" _label = "Check for Duplicates..." command_type = "FSpot.Tools.HashJob.HashJob" />
</Extension>
</Addin>
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
new file mode 100644
index 0000000..e165b89
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery.csproj
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" 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>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>0.7.2</ReleaseVersion>
+ </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>
+ </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>
+ </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>
+ <Folder Include="FSpot.Tools.LiveWebGallery\" />
+ <Folder Include="Resources\" />
+ </ItemGroup>
+ <ItemGroup>
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="Mono.Posix" />
+ <Reference Include="System" />
+ <Reference Include="gtk-sharp-beans, Version=2.14.0.0, Culture=neutral, PublicKeyToken=97a95fb57b03c03a">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\lib\gtk-sharp-beans\gtk-sharp-beans.dll</HintPath>
+ </Reference>
+ <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.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/GalleryRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
similarity index 99%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
index ff37b7e..77928a8 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs
@@ -16,7 +16,7 @@ using FSpot;
using FSpot.Core;
using Mono.Unix;
-namespace LiveWebGalleryExtension
+namespace FSpot.Tools.LiveWebGallery
{
public abstract class PhotoAwareRequestHandler : RequestHandler
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
similarity index 98%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
index 063c13a..45efb15 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGallery.cs
@@ -22,7 +22,7 @@ using FSpot.Query;
using FSpot.UI.Dialog;
using Mono.Unix;
-namespace LiveWebGalleryExtension
+namespace FSpot.Tools.LiveWebGallery
{
public class LiveWebGallery : ICommand
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
similarity index 99%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
index 114aa06..2508982 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs
@@ -18,7 +18,7 @@ using Gtk;
using Mono.Unix;
using Hyena;
-namespace LiveWebGalleryExtension
+namespace FSpot.Tools.LiveWebGallery
{
internal class LiveWebGalleryDialog : FSpot.UI.Dialog.BuilderDialog
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
similarity index 98%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
index f15d6a5..6d50f08 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs
@@ -16,7 +16,7 @@ using FSpot.Filters;
using FSpot.Utils;
using Hyena;
-namespace LiveWebGalleryExtension
+namespace FSpot.Tools.LiveWebGallery
{
public class PhotoRequestHandler : RequestHandler
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
similarity index 95%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
index 22ce27f..499115b 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs
@@ -14,7 +14,7 @@ using System.Reflection;
using FSpot;
-namespace LiveWebGalleryExtension
+namespace FSpot.Tools.LiveWebGallery
{
public class ResourceRequestHandler : RequestHandler
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
similarity index 99%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
index 2cec0bd..81c4b1b 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
@@ -20,7 +20,7 @@ using FSpot;
using FSpot.Extensions;
using Hyena;
-namespace LiveWebGalleryExtension
+namespace FSpot.Tools.LiveWebGallery
{
public class SimpleWebServer : IService
{
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Makefile.am b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Makefile.am
index 2b7c0ec..769cf80 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Makefile.am
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Makefile.am
@@ -3,19 +3,20 @@ TARGET = library
LINK = $(REF_FSPOT_EXTENSION_LIVEWEBGALLERY)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = \
- GalleryRequestHandler.cs \
- LiveWebGallery.cs \
- LiveWebGalleryDialog.cs \
- PhotoRequestHandler.cs \
- ResourceRequestHandler.cs \
- SimpleWebServer.cs
+SOURCES = \
+ FSpot.Tools.LiveWebGallery/GalleryRequestHandler.cs \
+ FSpot.Tools.LiveWebGallery/LiveWebGallery.cs \
+ FSpot.Tools.LiveWebGallery/LiveWebGalleryDialog.cs \
+ FSpot.Tools.LiveWebGallery/PhotoRequestHandler.cs \
+ FSpot.Tools.LiveWebGallery/ResourceRequestHandler.cs \
+ FSpot.Tools.LiveWebGallery/SimpleWebServer.cs
-RESOURCES = \
- LiveWebGallery.addin.xml \
- ui/LiveWebGallery.ui \
- ui/gallery.html \
- ui/f-spot.css \
- ui/f-spot.js
+RESOURCES = \
+ Resources/LiveWebGallery.addin.xml \
+ Resources/ui/empty.png \
+ Resources/ui/f-spot.css \
+ Resources/ui/f-spot.js \
+ Resources/ui/gallery.html \
+ Resources/ui/LiveWebGallery.ui
include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGallery.addin.xml b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml
similarity index 89%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGallery.addin.xml
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml
index 9487cb8..54c617a 100644
--- a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/LiveWebGallery.addin.xml
+++ b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/LiveWebGallery.addin.xml
@@ -12,6 +12,6 @@
<Addin id="Core" version="0.8"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
- <Command id = "LiveWebGallery" _label = "Live Web Gallery" command_type = "LiveWebGalleryExtension.LiveWebGallery" />
+ <Command id = "LiveWebGallery" _label = "Live Web Gallery" command_type = "FSpot.Tools.LiveWebGallery.LiveWebGallery" />
</Extension>
</Addin>
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/LiveWebGallery.ui b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui
similarity index 100%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/LiveWebGallery.ui
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/LiveWebGallery.ui
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/empty.png b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/empty.png
similarity index 100%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/empty.png
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/empty.png
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/f-spot.css b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/f-spot.css
similarity index 100%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/f-spot.css
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/f-spot.css
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/f-spot.js b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/f-spot.js
similarity index 100%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/f-spot.js
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/f-spot.js
diff --git a/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/gallery.html b/src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/gallery.html
similarity index 100%
rename from src/Extensions/Tools/FSpot.Tools.LiveWebGallery/ui/gallery.html
rename to src/Extensions/Tools/FSpot.Tools.LiveWebGallery/Resources/ui/gallery.html
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
new file mode 100644
index 0000000..ab18fd2
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb.csproj
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" 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>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>0.7.2</ReleaseVersion>
+ </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>
+ </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>
+ </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.glade">
+ <LogicalName>MergeDb.glade</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="Mono.Posix" />
+ <Reference Include="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="System.Core" />
+ <Reference Include="gio-sharp, Version=2.14.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\..\..\..\lib\gio-sharp\gio\gio-sharp.dll</HintPath>
+ </Reference>
+ <Reference Include="glade-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="FSpot.Tools.MergeDb\" />
+ <Folder Include="Resources\" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
similarity index 98%
rename from src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.cs
rename to src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
index bd21b6c..660f8b9 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDb.cs
@@ -23,7 +23,7 @@ using Mono.Unix;
using Hyena;
using Hyena.Widgets;
-namespace MergeDbExtension
+namespace FSpot.Tools.MergeDb
{
public class MergeDb : ICommand
{
@@ -39,7 +39,6 @@ namespace MergeDbExtension
public void Run (object o, EventArgs e)
{
from_db = new Db ();
-// from_db.ExceptionThrown += HandleDbException;
to_db = App.Instance.Database;
//ShowDialog ();
@@ -49,12 +48,6 @@ namespace MergeDbExtension
mdd.ShowAll ();
}
- void HandleDbException (Exception e)
- {
- Log.Exception (e);
- }
-
-
internal Db FromDb {
get { return from_db; }
}
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDbDialog.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
similarity index 98%
rename from src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDbDialog.cs
rename to src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
index 913185a..eb61907 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDbDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/MergeDbDialog.cs
@@ -12,7 +12,7 @@ using FSpot;
using FSpot.Core;
using FSpot.Query;
-namespace MergeDbExtension
+namespace FSpot.Tools.MergeDb
{
internal class MergeDbDialog
{
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/PickFolderDialog.cs b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
similarity index 97%
rename from src/Extensions/Tools/FSpot.Tools.MergeDb/PickFolderDialog.cs
rename to src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
index a416ca1..e1b1e94 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/PickFolderDialog.cs
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/FSpot.Tools.MergeDb/PickFolderDialog.cs
@@ -13,7 +13,7 @@ using FSpot.Query;
using Mono.Unix;
using Hyena;
-namespace MergeDbExtension
+namespace FSpot.Tools.MergeDb
{
internal class PickFolderDialog
{
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/Makefile.am b/src/Extensions/Tools/FSpot.Tools.MergeDb/Makefile.am
index a783a31..5c77e6b 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/Makefile.am
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/Makefile.am
@@ -3,13 +3,13 @@ TARGET = library
LINK = $(REF_FSPOT_EXTENSION_MERGEDB)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = \
- MergeDb.cs \
- MergeDbDialog.cs \
- PickFolderDialog.cs
+SOURCES = \
+ FSpot.Tools.MergeDb/MergeDb.cs \
+ FSpot.Tools.MergeDb/MergeDbDialog.cs \
+ FSpot.Tools.MergeDb/PickFolderDialog.cs
-RESOURCES = \
- MergeDb.addin.xml \
- MergeDb.glade
+RESOURCES = \
+ Resources/MergeDb.addin.xml \
+ Resources/MergeDb.glade
include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.addin.xml b/src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml
similarity index 80%
rename from src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.addin.xml
rename to src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml
index b0bf9ea..28660a4 100644
--- a/src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.addin.xml
+++ b/src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.addin.xml
@@ -12,6 +12,6 @@
<Addin id="Core" version="0.8"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
- <Command id = "MergeDb" _label = "Merge Db" command_type = "MergeDbExtension.MergeDb" />
+ <Command id = "MergeDb" _label = "Merge Db" command_type = "FSpot.Tools.MergeDb.MergeDb" />
</Extension>
</Addin>
diff --git a/src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.glade b/src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.glade
similarity index 100%
rename from src/Extensions/Tools/FSpot.Tools.MergeDb/MergeDb.glade
rename to src/Extensions/Tools/FSpot.Tools.MergeDb/Resources/MergeDb.glade
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
new file mode 100644
index 0000000..7737b56
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg.csproj
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" 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>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>0.7.2</ReleaseVersion>
+ </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>
+ </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>
+ </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="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="System.Core" />
+ </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>
+ <Folder Include="Resources\" />
+ <Folder Include="FSpot.Tools.RawPlusJpeg\" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
similarity index 99%
rename from src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
rename to src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
index ce776c8..fd4253c 100644
--- a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
@@ -21,7 +21,7 @@ using FSpot.Imaging;
using Hyena;
using Hyena.Widgets;
-namespace RawPlusJpegExtension
+namespace FSpot.Tools.RawPlusJpeg
{
public class RawPlusJpeg : ICommand
{
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Makefile.am b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Makefile.am
index 932b628..402115e 100644
--- a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Makefile.am
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Makefile.am
@@ -3,8 +3,8 @@ TARGET = library
LINK = $(REF_FSPOT_EXTENSION_RAWPLUSJPEG)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = RawPlusJpeg.cs
+SOURCES = FSpot.Tools.RawPlusJpeg/RawPlusJpeg.cs
-RESOURCES = RawPlusJpeg.addin.xml
+RESOURCES = Resources/RawPlusJpeg.addin.xml
include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.addin.xml b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml
similarity index 91%
rename from src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.addin.xml
rename to src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml
index fbfa3e7..406088a 100644
--- a/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/RawPlusJpeg.addin.xml
+++ b/src/Extensions/Tools/FSpot.Tools.RawPlusJpeg/Resources/RawPlusJpeg.addin.xml
@@ -12,6 +12,6 @@
<Addin id="Core" version="0.8"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
- <Command id = "MergeRawJpeg" _label = "Merge Raw" command_type = "RawPlusJpegExtension.RawPlusJpeg" />
+ <Command id = "MergeRawJpeg" _label = "Merge Raw" command_type = "FSpot.Tools.RawPlusJpeg.RawPlusJpeg" />
</Extension>
</Addin>
diff --git a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
new file mode 100644
index 0000000..e003768
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll.csproj
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" 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>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>0.7.2</ReleaseVersion>
+ </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>
+ </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>
+ </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>
+ <Folder Include="FSpot.Tools.RetroactiveRoll\" />
+ <Folder Include="Resources\" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
similarity index 96%
rename from src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
rename to src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
index 29cee82..d8d5e9d 100644
--- a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
@@ -11,13 +11,12 @@
using FSpot;
using FSpot.Core;
using FSpot.Extensions;
-using Mono.Unix;
using System;
using Hyena;
using Hyena.Data.Sqlite;
-namespace RetroactiveRoll
+namespace FSpot.Tools.RetroactiveRoll
{
public class RetroactiveRoll: ICommand
{
diff --git a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Makefile.am b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Makefile.am
index e6b80f6..2a707a9 100644
--- a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Makefile.am
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Makefile.am
@@ -3,8 +3,8 @@ TARGET = library
LINK = $(REF_FSPOT_EXTENSION_RETROACTIVEROLL)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = RetroactiveRoll.cs
+SOURCES = FSpot.Tools.RetroactiveRoll/RetroactiveRoll.cs
-RESOURCES = RetroactiveRoll.addin.xml
+RESOURCES = Resources/RetroactiveRoll.addin.xml
include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.addin.xml b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml
similarity index 86%
rename from src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.addin.xml
rename to src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml
index 0ecebe0..5235f64 100644
--- a/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/RetroactiveRoll.addin.xml
+++ b/src/Extensions/Tools/FSpot.Tools.RetroactiveRoll/Resources/RetroactiveRoll.addin.xml
@@ -11,6 +11,6 @@
<Addin id="Core" version="0.8"/>
</Dependencies>
<Extension path = "/FSpot/Menus/PhotoPopup">
- <Command id = "RetroactiveRoll" _label = "Reassign to new import roll" command_type = "RetroactiveRoll.RetroactiveRoll"/>
+ <Command id = "RetroactiveRoll" _label = "Reassign to new import roll" command_type = "FSpot.Tools.RetroactiveRoll.RetroactiveRoll"/>
</Extension>
</Addin>
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
new file mode 100644
index 0000000..9c0f094
--- /dev/null
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig.csproj
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="3.5" 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>
+ <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <ReleaseVersion>0.7.2</ReleaseVersion>
+ </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>
+ </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>
+ </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="gtk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" />
+ <Reference Include="gtk-sharp-beans, Version=2.14.0.0, Culture=neutral, PublicKeyToken=97a95fb57b03c03a">
+ <SpecificVersion>False</SpecificVersion>
+ <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.Widgets\FSpot.Widgets.csproj">
+ <Project>{05A7FEC4-974A-40EB-AFB8-14E523EEEFFB}</Project>
+ <Name>FSpot.Widgets</Name>
+ </ProjectReference>
+ </ItemGroup>
+ <ItemGroup>
+ <Folder Include="FSpot.Tools.ScreensaverConfig\" />
+ <Folder Include="Resources\" />
+ </ItemGroup>
+</Project>
\ No newline at end of file
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
similarity index 98%
rename from src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
rename to src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
index 2b3552e..1265abc 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
@@ -20,7 +20,7 @@ using FSpot.UI.Dialog;
using FSpot.Extensions;
using FSpot.Widgets;
-namespace ScreensaverConfig
+namespace FSpot.Tools.ScreensaverConfig
{
public class ScreensaverConfig : ICommand
{
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Makefile.am b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Makefile.am
index d1501c1..bed90cd 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Makefile.am
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Makefile.am
@@ -3,10 +3,10 @@ TARGET = library
LINK = $(REF_FSPOT_EXTENSION_SCREENSAVERCONFIG)
INSTALL_DIR = $(EXTENSIONS_INSTALL_DIR)
-SOURCES = ScreensaverConfig.cs
+SOURCES = FSpot.Tools.ScreensaverConfig/ScreensaverConfig.cs
-RESOURCES = \
- ScreensaverConfig.addin.xml \
- ScreensaverConfigDialog.ui
+RESOURCES = \
+ Resources/ScreensaverConfig.addin.xml \
+ Resources/ScreensaverConfigDialog.ui
include $(top_srcdir)/build/build.mk
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.addin.xml b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml
similarity index 86%
rename from src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.addin.xml
rename to src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml
index 313aa78..96acef9 100644
--- a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfig.addin.xml
+++ b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfig.addin.xml
@@ -12,6 +12,6 @@
<Addin id="Core" version="0.8"/>
</Dependencies>
<Extension path = "/FSpot/Menus/Tools">
- <Command id = "ScreensaverConfig" _label = "Configure Screensaver" command_type = "ScreensaverConfig.ScreensaverConfig" />
+ <Command id = "ScreensaverConfig" _label = "Configure Screensaver" command_type = "FSpot.Tools.ScreensaverConfig.ScreensaverConfig" />
</Extension>
</Addin>
diff --git a/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfigDialog.ui b/src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui
similarity index 100%
rename from src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/ScreensaverConfigDialog.ui
rename to src/Extensions/Tools/FSpot.Tools.ScreensaverConfig/Resources/ScreensaverConfigDialog.ui
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
