Move some files to new folder structure.

src/AddIns/BackendBindings/CSharpBinding/Project/Src/OptionPanels/BuildOptions.xaml

@@ -3,7 +3,7 @@
 	x:Class="CSharpBinding.OptionPanels.BuildOptions"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
+	xmlns:sd="http://icsharpcode.net/sharpdevelop/core"
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels;assembly=ICSharpCode.SharpDevelop"
 	xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project;assembly=ICSharpCode.SharpDevelop"
@@ -130,7 +130,7 @@
 					          VerticalAlignment="Center"
 					          HorizontalAlignment="Left"
 					          SelectedValue="{Binding Path=DebugType.Value}"
-					          gui:EnumBinding.EnumType="{x:Type project:DebugSymbolType}"></ComboBox>
+					          sd:EnumBinding.EnumType="{x:Type project:DebugSymbolType}"></ComboBox>
 					
 					<Label Grid.Row="4" Grid.Column="1" Margin="3,0,3,0"
 					       HorizontalAlignment="Right"

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/IssueOptions.xaml

@@ -23,7 +23,7 @@
 							          GotFocus="ComboBox_GotFocus"
 							          MinWidth="85"
 							          VerticalAlignment="Center"
-							          gui:EnumBinding.EnumType="{x:Type nr:Severity}"
+							          sd:EnumBinding.EnumType="{x:Type nr:Severity}"
 							          SelectedValue="{Binding Severity}"/>
 							<sd:RestrictDesiredSize RestrictHeight="False" MinWidth="150">
 								<TextBlock Text="{Binding Title}" TextWrapping="WrapWithOverflow" VerticalAlignment="Center" />

src/AddIns/BackendBindings/CSharpBinding/Project/Src/Refactoring/SearchForIssuesDialog.xaml

@@ -5,7 +5,7 @@
         xmlns:tv="http://icsharpcode.net/sharpdevelop/treeview"
         xmlns:core="http://icsharpcode.net/sharpdevelop/core"
         xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
-        xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
+        xmlns:sd="clr-namespace:ICSharpCode.SharpDevelop;assembly=ICSharpCode.SharpDevelop"
         xmlns:local="clr-namespace:CSharpBinding.Refactoring"
         Style="{x:Static core:GlobalStyles.DialogWindowStyle}"
         WindowStartupLocation="CenterOwner"
@@ -24,7 +24,7 @@
 		</Grid.ColumnDefinitions>
 		<StackPanel Orientation="Horizontal">
 			<Label Content="Search In:" />
-			<widgets:RadioButtonGroup Name="searchInRBG" Margin="0,6,0,0" gui:EnumBinding.EnumType="local:SearchForIssuesTarget" />
+			<widgets:RadioButtonGroup Name="searchInRBG" Margin="0,6,0,0" sd:EnumBinding.EnumType="local:SearchForIssuesTarget" />
 		</StackPanel>
 		<Label Content="Issues:" Grid.Row="1" HorizontalAlignment="Left" />
 		<tv:SharpTreeView Name="treeView" Grid.Row="2" Margin="4,0,4,4" />

src/AddIns/BackendBindings/CppBinding/CppBinding/Project/ApplicationOptions.xaml

@@ -5,7 +5,7 @@
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	
-	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui;assembly=ICSharpCode.SharpDevelop"
+	xmlns:sd="clr-namespace:ICSharpCode.SharpDevelop;assembly=ICSharpCode.SharpDevelop"
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels;assembly=ICSharpCode.SharpDevelop"
 	xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project;assembly=ICSharpCode.SharpDevelop"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
@@ -60,7 +60,7 @@
 			
 			<ComboBox x:Name="outputTypeComboBox"  Grid.Row="5" Grid.Column="1" Margin="5,0,5,0"
 			          VerticalAlignment="Center"
-			          gui:EnumBinding.EnumType="{x:Type project:OutputType}">
+			          sd:EnumBinding.EnumType="{x:Type project:OutputType}">
 			</ComboBox>
 			
 			<ComboBox x:Name="startupObjectComboBox"  VerticalAlignment="Center" Margin="5,0,5,0"

src/Main/Base/Project/Configuration/AssemblyInfo.cs

@@ -6,6 +6,7 @@ using System;
 using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Windows;
+using System.Windows.Markup;
 
 [assembly: CLSCompliant(false)]
 [assembly: StringFreezing()]
@@ -15,6 +16,8 @@ using System.Windows;
 	ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
 )]
 
+[assembly: XmlnsDefinition("http://icsharpcode.net/sharpdevelop/core", "ICSharpCode.SharpDevelop")]
+
 [assembly: AssemblyTitle("SharpDevelopBase")]
 [assembly: AssemblyDescription("The base add-in of SharpDevelop")]
 [assembly: AssemblyConfiguration("")]

src/Main/Base/Project/ICSharpCode.SharpDevelop.csproj

@@ -228,11 +228,24 @@
       <DependentUpon>AbstractAttachToProcessForm.cs</DependentUpon>
     </Compile>
     <Compile Include="Src\Gui\Dialogs\ExtractInterfaceDialog.cs" />
-    <Compile Include="Src\Gui\ICanBeDirty.cs" />
     <Compile Include="Src\Gui\IWorkbenchLayout.cs" />
     <Compile Include="Src\Services\FileChangeWatcher.cs" />
     <Compile Include="Src\Services\ViewContentServiceAttribute.cs" />
     <Compile Include="Src\Util\NotAvailableCommand.cs" />
+    <Compile Include="Util\AtomicBoolean.cs" />
+    <Compile Include="Util\CustomThreadPoolTaskScheduler.cs" />
+    <Compile Include="Util\DebugTimer.cs" />
+    <Compile Include="Util\EnumBinding.cs" />
+    <Compile Include="Util\ExtensionMethods.cs" />
+    <Compile Include="Util\ICanBeDirty.cs" />
+    <Compile Include="Util\IImage.cs" />
+    <Compile Include="Util\IProgressMonitor.cs" />
+    <Compile Include="Util\ProgressCollector.cs" />
+    <Compile Include="Util\ReactiveExtensions.cs" />
+    <Compile Include="Util\SimpleCommand.cs" />
+    <Compile Include="Util\SimpleTaskScheduler.cs" />
+    <Compile Include="Util\UnclosableStream.cs" />
+    <Compile Include="Util\WeakCollection.cs" />
     <Compile Include="WinForms\IClipboardHandler.cs" />
     <Compile Include="WinForms\IContextHelpProvider.cs" />
     <Compile Include="WinForms\IPrintable.cs" />
@@ -382,8 +395,6 @@
       <DependentUpon>TreeViewOptionsDialog.xaml</DependentUpon>
       <SubType>Code</SubType>
     </Compile>
-    <Compile Include="Src\Gui\EnumBinding.cs" />
-    <Compile Include="Src\Gui\IImage.cs" />
     <Compile Include="Src\Gui\Pads\AbstractConsolePad.cs" />
     <Compile Include="Src\Gui\Pads\BaseWatchBox.cs" />
     <Compile Include="Src\Gui\Pads\OutlinePad.cs" />
@@ -392,7 +403,6 @@
     <Compile Include="Src\Gui\Pads\ProjectBrowser\TreeNodes\ServiceReferencesFolderNode.cs" />
     <Compile Include="Src\Gui\Pads\TaskList\TaskListPadCommands.cs" />
     <Compile Include="Src\Gui\Pads\ToolsPad.cs" />
-    <Compile Include="Src\Gui\ProgressCollector.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\ViewInBrowserConditionEvaluator.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\WriteableProjectEvaluator.cs" />
     <Compile Include="Src\Internal\ConditionEvaluators\WriteableSolutionEvaluator.cs" />
@@ -504,7 +514,6 @@
     <Compile Include="Src\Internal\ConditionEvaluators\WindowOpenEvaluator.cs" />
     <Compile Include="Src\Internal\Templates\Project\ProjectDescriptor.cs" />
     <Compile Include="Src\Internal\Templates\Project\SolutionDescriptor.cs" />
-    <Compile Include="Src\Gui\IProgressMonitor.cs" />
     <Compile Include="Src\Gui\ContentInterfaces\IEditable.cs" />
     <Compile Include="Src\Gui\ContentInterfaces\IPositionable.cs" />
     <Compile Include="Src\Gui\WorkbenchSingleton.cs" />
@@ -761,15 +770,10 @@
     <Compile Include="Src\Gui\Dialogs\ReferenceDialog\AsyncDiscoveryState.cs" />
     <Compile Include="Src\Gui\Dialogs\ReferenceDialog\DiscoveryNetworkCredential.cs" />
     <Compile Include="Src\Services\ProjectService\ProjectLoader.cs" />
-    <Compile Include="Src\Util\AtomicBoolean.cs" />
-    <Compile Include="Src\Util\CustomThreadPoolTaskScheduler.cs" />
     <Compile Include="Src\Util\DotnetDetection.cs" />
     <Compile Include="Src\Util\FakeXmlViewContent.cs" />
     <Compile Include="Src\Util\IOTaskScheduler.cs" />
-    <Compile Include="Src\Util\ReactiveExtensions.cs" />
     <Compile Include="Src\Util\SharpDevelopServiceContainer.cs" />
-    <Compile Include="Src\Util\SimpleCommand.cs" />
-    <Compile Include="Src\Util\SimpleTaskScheduler.cs" />
     <Compile Include="Src\Util\TreeNode.cs" />
     <Compile Include="Src\Util\NativeMethods.cs" />
     <Compile Include="Src\Util\ProcessRunnerException.cs" />
@@ -793,8 +797,6 @@
     </Compile>
     <Compile Include="Src\Gui\Dialogs\SolutionConfiguration\SolutionConfigurationEditor.cs" />
     <Compile Include="Src\Gui\Dialogs\SharpDevelopColorDialog.cs" />
-    <Compile Include="Src\Util\ExtensionMethods.cs" />
-    <Compile Include="Src\Util\DebugTimer.cs" />
     <Compile Include="Src\Project\CustomTool.cs" />
     <Compile Include="Src\Gui\Dialogs\SolutionConfiguration\EditAvailableConfigurationsDialog.Designer.cs">
       <DependentUpon>EditAvailableConfigurationsDialog.cs</DependentUpon>
@@ -810,8 +812,6 @@
     <Compile Include="Src\Project\Items\ItemType.cs" />
     <Compile Include="Src\Util\GenericConverter.cs" />
     <Compile Include="Src\Internal\Templates\TemplateLoadException.cs" />
-    <Compile Include="Src\Util\UnclosableStream.cs" />
-    <Compile Include="Src\Util\WeakCollection.cs" />
     <EmbeddedResource Include="Resources\DefaultManifest.manifest" />
     <EmbeddedResource Include="Src\Gui\Dialogs\ExtractInterfaceDialog.resx">
       <DependentUpon>ExtractInterfaceDialog.cs</DependentUpon>
@@ -872,6 +872,7 @@
     <Folder Include="Dom" />
     <Folder Include="Editor" />
     <Folder Include="Editor\Bookmarks" />
+    <Folder Include="Util" />
     <Folder Include="Project" />
     <Folder Include="Parser" />
     <Folder Include="Project\Build" />

src/Main/Base/Project/Src/Gui/Components/FontSelectionPanel.cs

@@ -16,6 +16,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 	/// <summary>
 	/// Description of FontSelectionPanel.
 	/// </summary>
+	[Obsolete("XML Forms are obsolete")]
 	public class FontSelectionPanel : BaseSharpDevelopUserControl
 	{
 		public string CurrentFontString {

src/Main/Base/Project/Src/Gui/Dialogs/CommonAboutDialog.cs

@@ -117,6 +117,7 @@ namespace ICSharpCode.SharpDevelop.Gui
 		}
 	}
 	
+	#pragma warning disable 618
 	public class CommonAboutDialog : XmlForm
 	{
 		public ScrollBox ScrollBox {

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/ApplicationSettings.xaml

@@ -4,7 +4,7 @@
 	xmlns:sys="clr-namespace:System;assembly=mscorlib"
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
+	xmlns:sd="clr-namespace:ICSharpCode.SharpDevelop"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels"
@@ -63,7 +63,7 @@
 				Location="{Binding OutputType.Location}"/>
 		 
 			<ComboBox x:Name="outputTypeComboBox" Grid.Row="5" Grid.Column="1"  VerticalAlignment="Center" Margin="3,0,3,0"
-				gui:EnumBinding.EnumType="{x:Type project:OutputType}"></ComboBox>
+				sd:EnumBinding.EnumType="{x:Type project:OutputType}"></ComboBox>
 		
 			<ComboBox x:Name="startupObjectComboBox" Grid.Row="5" Grid.Column="2" VerticalAlignment="Center"
 				IsEnabled="False"></ComboBox>

src/Main/Base/Project/Src/Gui/Dialogs/OptionPanels/ProjectOptions/BuildEvents.xaml

@@ -4,7 +4,7 @@
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
 	xmlns:project="clr-namespace:ICSharpCode.SharpDevelop.Project"
-	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
+	xmlns:sd="clr-namespace:ICSharpCode.SharpDevelop"
 	xmlns:optionpanels="clr-namespace:ICSharpCode.SharpDevelop.Gui.OptionPanels">
 	<ScrollViewer
 		VerticalScrollBarVisibility="Auto">
@@ -27,7 +27,7 @@
 				<Label Content="{core:Localize Dialog.ProjectOptions.BuildEvents.RunPostBuild}" />
 				<DockPanel>
 					<optionpanels:StorageLocationPicker Location="{Binding RunPostBuildEvent.Location}" DockPanel.Dock="Left" />
-					<ComboBox gui:EnumBinding.EnumType="{x:Type project:RunPostBuildEvent}" SelectedValue="{Binding RunPostBuildEvent.Value}" />
+					<ComboBox sd:EnumBinding.EnumType="{x:Type project:RunPostBuildEvent}" SelectedValue="{Binding RunPostBuildEvent.Value}" />
 				</DockPanel>
 			</StackPanel>
 		</GroupBox>

src/Main/Base/Project/Src/Gui/Dialogs/ReferenceDialog/ServiceReference/AdvancedServiceDialog.xaml

@@ -5,7 +5,7 @@
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:local="clr-namespace:ICSharpCode.SharpDevelop.Gui.Dialogs.ReferenceDialog.ServiceReference"
 	xmlns:core="http://icsharpcode.net/sharpdevelop/core"
-	xmlns:gui="clr-namespace:ICSharpCode.SharpDevelop.Gui"
+	xmlns:sd="clr-namespace:ICSharpCode.SharpDevelop"
 	xmlns:widgets="http://icsharpcode.net/sharpdevelop/widgets"
 	Width="700" Height="500"
 	Title="{Binding Title}">
@@ -43,7 +43,7 @@
 					Text="{Binding AccessLevel}"></TextBlock>
 				<ComboBox
 					Grid.Column="1 " Margin="4"
-					gui:EnumBinding.EnumType="{x:Type local:Modifiers}"  SelectedValue="{Binding SelectedModifier}">
+					sd:EnumBinding.EnumType="{x:Type local:Modifiers}"  SelectedValue="{Binding SelectedModifier}">
 				</ComboBox>
 				
 				<CheckBox
@@ -91,7 +91,7 @@
 					Text="Collection type:"></TextBlock>
 				<ComboBox
 					Grid.Row="1" Grid.Column="2" Margin="4"
-					gui:EnumBinding.EnumType="{x:Type local:CollectionTypes}"
+					sd:EnumBinding.EnumType="{x:Type local:CollectionTypes}"
 					SelectedValue="{Binding CollectionType}">
 					</ComboBox>
 				<TextBlock
@@ -102,7 +102,7 @@
 				<ComboBox
 					Grid.Row="2"
 					Grid.Column="1" Margin="4"
-					gui:EnumBinding.EnumType="{x:Type local:DictionaryCollectionTypes}"
+					sd:EnumBinding.EnumType="{x:Type local:DictionaryCollectionTypes}"
 					SelectedValue="{Binding DictionaryCollectionType}">
 				</ComboBox>
 				

src/Main/Base/Project/Util/CustomThreadPoolTaskScheduler.cs

@@ -5,7 +5,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ICSharpCode.SharpDevelop.Util
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// A task scheduler that manages its own thread pool.

src/Main/Base/Project/Util/EnumBinding.cs

@@ -14,7 +14,7 @@ using ICSharpCode.Core;
 using ICSharpCode.Core.Presentation;
 using ICSharpCode.SharpDevelop.Widgets;
 
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// Used to bind ComboBoxes or RadioButtonGroups to enums.

src/Main/Base/Project/Util/ProgressCollector.cs

@@ -7,7 +7,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Threading;
 
-namespace ICSharpCode.SharpDevelop.Gui
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// Collects progress using nested IProgressMonitors and provides it to a different thread using events.

src/Main/Base/Project/Util/SimpleTaskScheduler.cs

@@ -7,7 +7,7 @@ using System.Collections.Generic;
 using System.Threading;
 using System.Threading.Tasks;
 
-namespace ICSharpCode.SharpDevelop.Util
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// A simple scheduler that adds tasks to a queue.

src/Main/Base/Project/Util/WeakCollection.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace ICSharpCode.SharpDevelop.Util
+namespace ICSharpCode.SharpDevelop
 {
 	/// <summary>
 	/// A collection that allows its elements to be garbage-collected (unless there are other

src/Main/ICSharpCode.Core.Presentation/Menu/CoreMenuItem.cs

@@ -33,7 +33,8 @@ namespace ICSharpCode.Core.Presentation
 			
 			if (codon.Properties.Contains("icon")) {
 				try {
-					var image = PresentationResourceService.GetImage(codon.Properties["icon"]);
+					var image = new Image();
+					image.Source = PresentationResourceService.GetBitmapSource(codon.Properties["icon"]);
 					image.Height = 16;
 					this.Icon = image;
 				} catch (ResourceNotFoundException) {}

src/Main/ICSharpCode.Core.Presentation/ToolBar/ToolBarService.cs

@@ -138,7 +138,8 @@ namespace ICSharpCode.Core.Presentation
 			bool isLabel = false;
 			if (codon.Properties.Contains("icon"))
 			{
-				image = PresentationResourceService.GetImage(StringParser.Parse(codon.Properties["icon"]));
+				image = new Image();
+				image.Source = PresentationResourceService.GetBitmapSource(StringParser.Parse(codon.Properties["icon"]));
 				image.Height = 16;
 				image.SetResourceReference(FrameworkElement.StyleProperty, ToolBarService.ImageStyleKey);
 				isImage = true;