[f-spot] Move transitions out of FSpot.Widgets namespace.
- From: Ruben Vermeersch <rubenv src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [f-spot] Move transitions out of FSpot.Widgets namespace.
- Date: Tue, 10 Aug 2010 11:43:04 +0000 (UTC)
commit 6f7f6825f0622a3154ef1f2f5129ab954390da4d
Author: Ruben Vermeersch <ruben savanne be>
Date: Tue Aug 10 13:42:43 2010 +0200
Move transitions out of FSpot.Widgets namespace.
.../MainApp/FSpot.Extensions/TransitionNode.cs | 2 +-
src/Clients/MainApp/FSpot.Widgets/SlideShow.cs | 1 +
src/Clients/MainApp/FSpot.addin.xml | 4 ++--
src/Clients/MainApp/FSpot/App.cs | 2 +-
src/Core/FSpot.Gui/FSpot.Gui.csproj | 12 ++++++++----
.../CairoTransition.cs | 2 +-
.../DissolveTransition.cs | 2 +-
.../PushTransition.cs | 2 +-
.../SlideShowTransition.cs | 2 +-
src/Core/FSpot.Gui/Makefile.am | 10 +++++-----
.../FSpot.Addins.Transitions/Cover.cs | 2 +-
11 files changed, 23 insertions(+), 18 deletions(-)
---
diff --git a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
index 2da9f5d..69a0c40 100644
--- a/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
+++ b/src/Clients/MainApp/FSpot.Extensions/TransitionNode.cs
@@ -13,7 +13,7 @@
using System;
using Mono.Addins;
using Gdk;
-using FSpot.Widgets;
+using FSpot.Transitions;
namespace FSpot.Extensions
{
diff --git a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
index d551679..cf751bf 100644
--- a/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
+++ b/src/Clients/MainApp/FSpot.Widgets/SlideShow.cs
@@ -17,6 +17,7 @@ using FSpot.Core;
using FSpot.Bling;
using FSpot.Extensions;
using FSpot.Imaging;
+using FSpot.Transitions;
namespace FSpot.Widgets
{
diff --git a/src/Clients/MainApp/FSpot.addin.xml b/src/Clients/MainApp/FSpot.addin.xml
index c2f12f5..9ba16bd 100644
--- a/src/Clients/MainApp/FSpot.addin.xml
+++ b/src/Clients/MainApp/FSpot.addin.xml
@@ -78,7 +78,7 @@
</Extension>
<Extension path = "/FSpot/SlideShow">
- <Transition transition_type = "FSpot.Widgets.DissolveTransition"/>
- <Transition transition_type = "FSpot.Widgets.PushTransition"/>
+ <Transition transition_type = "FSpot.Transitions.DissolveTransition"/>
+ <Transition transition_type = "FSpot.Transitions.PushTransition"/>
</Extension>
</Addin>
diff --git a/src/Clients/MainApp/FSpot/App.cs b/src/Clients/MainApp/FSpot/App.cs
index 6779caf..b966261 100644
--- a/src/Clients/MainApp/FSpot/App.cs
+++ b/src/Clients/MainApp/FSpot/App.cs
@@ -271,7 +271,7 @@ namespace FSpot
if (photos.Length > 0) {
Array.Sort (photos, new IBrowsableItemComparer.RandomSort ());
slideshow = new FSpot.Widgets.SlideShow (new BrowsablePointer (new PhotoList (photos), 0), (uint)(delay * 1000), true);
- slideshow.Transition = new FSpot.Widgets.DissolveTransition ();
+ slideshow.Transition = new FSpot.Transitions.DissolveTransition ();
window.Add (slideshow);
} else {
Gtk.HBox outer = new Gtk.HBox ();
diff --git a/src/Core/FSpot.Gui/FSpot.Gui.csproj b/src/Core/FSpot.Gui/FSpot.Gui.csproj
index bd768e8..98461f3 100644
--- a/src/Core/FSpot.Gui/FSpot.Gui.csproj
+++ b/src/Core/FSpot.Gui/FSpot.Gui.csproj
@@ -41,7 +41,6 @@
<Compile Include="FSpot.Widgets\CustomPrintWidget.cs" />
<Compile Include="FSpot.Widgets\DateEdit.cs" />
<Compile Include="FSpot.Widgets\DateEditFlags.cs" />
- <Compile Include="FSpot.Widgets\DissolveTransition.cs" />
<Compile Include="FSpot.Widgets\HighlightedBox.cs" />
<Compile Include="FSpot.Widgets\ImageView.cs" />
<Compile Include="FSpot.Widgets\Layout.cs" />
@@ -51,9 +50,10 @@
<Compile Include="FSpot.Widgets\Rating.cs" />
<Compile Include="FSpot.Widgets\SaneTreeView.cs" />
<Compile Include="FSpot.Widgets\ScrolledView.cs" />
- <Compile Include="FSpot.Widgets\PushTransition.cs" />
- <Compile Include="FSpot.Widgets\CairoTransition.cs" />
- <Compile Include="FSpot.Widgets\SlideShowTransition.cs" />
+ <Compile Include="FSpot.Transitions\CairoTransition.cs" />
+ <Compile Include="FSpot.Transitions\DissolveTransition.cs" />
+ <Compile Include="FSpot.Transitions\PushTransition.cs" />
+ <Compile Include="FSpot.Transitions\SlideShowTransition.cs" />
</ItemGroup>
<ProjectExtensions>
<MonoDevelop>
@@ -104,4 +104,8 @@
<Name>Hyena</Name>
</ProjectReference>
</ItemGroup>
+ <ItemGroup>
+ <Folder Include="FSpot.Transitions\" />
+ <Folder Include="FSpot.Widgets\" />
+ </ItemGroup>
</Project>
\ No newline at end of file
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/CairoTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
similarity index 96%
rename from src/Core/FSpot.Gui/FSpot.Widgets/CairoTransition.cs
rename to src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
index 08ffda8..6dfada3 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/CairoTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/CairoTransition.cs
@@ -18,7 +18,7 @@ using FSpot.Utils;
using Color = Cairo.Color;
-namespace FSpot.Widgets
+namespace FSpot.Transitions
{
public abstract class CairoTransition : SlideShowTransition
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/DissolveTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/DissolveTransition.cs
similarity index 98%
rename from src/Core/FSpot.Gui/FSpot.Widgets/DissolveTransition.cs
rename to src/Core/FSpot.Gui/FSpot.Transitions/DissolveTransition.cs
index 2618ec3..88561c2 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/DissolveTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/DissolveTransition.cs
@@ -19,7 +19,7 @@ using FSpot.Widgets;
using Color = Cairo.Color;
-namespace FSpot.Widgets
+namespace FSpot.Transitions
{
public class DissolveTransition : CairoTransition
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/PushTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/PushTransition.cs
similarity index 98%
rename from src/Core/FSpot.Gui/FSpot.Widgets/PushTransition.cs
rename to src/Core/FSpot.Gui/FSpot.Transitions/PushTransition.cs
index 2a54484..ce91181 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/PushTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/PushTransition.cs
@@ -18,7 +18,7 @@ using FSpot.Utils;
using Color = Cairo.Color;
-namespace FSpot.Widgets
+namespace FSpot.Transitions
{
public class PushTransition : CairoTransition
{
diff --git a/src/Core/FSpot.Gui/FSpot.Widgets/SlideShowTransition.cs b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
similarity index 95%
rename from src/Core/FSpot.Gui/FSpot.Widgets/SlideShowTransition.cs
rename to src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
index ac98957..bd7a9b7 100644
--- a/src/Core/FSpot.Gui/FSpot.Widgets/SlideShowTransition.cs
+++ b/src/Core/FSpot.Gui/FSpot.Transitions/SlideShowTransition.cs
@@ -18,7 +18,7 @@ using FSpot.Utils;
using Color = Cairo.Color;
-namespace FSpot.Widgets
+namespace FSpot.Transitions
{
public abstract class SlideShowTransition
{
diff --git a/src/Core/FSpot.Gui/Makefile.am b/src/Core/FSpot.Gui/Makefile.am
index eba322a..4e01421 100644
--- a/src/Core/FSpot.Gui/Makefile.am
+++ b/src/Core/FSpot.Gui/Makefile.am
@@ -3,9 +3,12 @@ TARGET = library
LINK = $(REF_FSPOT_GUI)
SOURCES = \
+ FSpot.Transitions/CairoTransition.cs \
+ FSpot.Transitions/DissolveTransition.cs \
+ FSpot.Transitions/PushTransition.cs \
+ FSpot.Transitions/SlideShowTransition.cs \
FSpot.Widgets/ApplicationActivatedEventArgs.cs \
FSpot.Widgets/BuilderWindow.cs \
- FSpot.Widgets/CairoTransition.cs \
FSpot.Widgets/CheckPattern.cs \
FSpot.Widgets/ComplexMenuItem.cs \
FSpot.Widgets/Curve.cs \
@@ -13,18 +16,15 @@ SOURCES = \
FSpot.Widgets/CustomPrintWidget.cs \
FSpot.Widgets/DateEdit.cs \
FSpot.Widgets/DateEditFlags.cs \
- FSpot.Widgets/DissolveTransition.cs \
FSpot.Widgets/HighlightedBox.cs \
FSpot.Widgets/ImageView.cs \
FSpot.Widgets/Layout.cs \
FSpot.Widgets/MenuButton.cs \
FSpot.Widgets/OpenWithMenu.cs \
FSpot.Widgets/PointerMode.cs \
- FSpot.Widgets/PushTransition.cs \
FSpot.Widgets/Rating.cs \
FSpot.Widgets/SaneTreeView.cs \
- FSpot.Widgets/ScrolledView.cs \
- FSpot.Widgets/SlideShowTransition.cs
+ FSpot.Widgets/ScrolledView.cs
RESOURCES =
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 ce6d9b5..cd0729e 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
@@ -15,7 +15,7 @@ using Cairo;
using Gdk;
using FSpot.Utils;
-using FSpot.Widgets;
+using FSpot.Transitions;
using Color = Cairo.Color;
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]