Gradient editor - WIP commit

src/Artemis.UI/Bootstrapper.cs

@@ -9,6 +9,7 @@ using Artemis.Core.Services.Interfaces;
 using Artemis.UI.Ninject;
 using Artemis.UI.Screens;
 using Artemis.UI.Screens.Splash;
+using Artemis.UI.Shared.Ninject;
 using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Stylet;
 using Ninject;
@@ -76,10 +77,12 @@ namespace Artemis.UI
         {
             kernel.Settings.InjectNonPublic = true;
 
-            // Load this assembly's module
+            // Load the UI modules
             kernel.Load<UIModule>();
+            kernel.Load<SharedUIModule>();
             // Load the core assembly's module
             kernel.Load<CoreModule>();
+
             base.ConfigureIoC(kernel);
         }
 

src/Artemis.UI/Ninject/UiModule.cs

@@ -5,7 +5,6 @@ using Artemis.UI.Screens.Module.ProfileEditor;
 using Artemis.UI.Screens.Module.ProfileEditor.LayerProperties.PropertyTree.PropertyInput;
 using Artemis.UI.Services.Interfaces;
 using Artemis.UI.Shared.Services.Dialog;
-using Artemis.UI.Shared.Services.Interfaces;
 using Artemis.UI.Stylet;
 using FluentValidation;
 using Ninject.Extensions.Conventions;
@@ -87,16 +86,6 @@ namespace Artemis.UI.Ninject
                     .InheritedFrom<IValidator>()
                     .BindAllInterfaces();
             });
-
-            // Bind all shared UI services as singletons
-            Kernel.Bind(x =>
-            {
-                x.FromAssemblyContaining<IArtemisSharedUIService>()
-                    .SelectAllClasses()
-                    .InheritedFrom<IArtemisSharedUIService>()
-                    .BindAllInterfaces()
-                    .Configure(c => c.InSingletonScope());
-            });
         }
     }
 }