diff --git a/samples/DisplayBindings/AlternateEditor/AlternateEditor.csproj b/samples/DisplayBindings/AlternateEditor/AlternateEditor.csproj index c1b7c5b6a2..6f93378e39 100644 --- a/samples/DisplayBindings/AlternateEditor/AlternateEditor.csproj +++ b/samples/DisplayBindings/AlternateEditor/AlternateEditor.csproj @@ -16,7 +16,8 @@ 4096 4 false - v4.0 + v4.5 + ..\..\..\AddIns\Samples\AlternateEditor\ diff --git a/samples/DisplayBindings/AlternateEditor/AlternateEditor.sln b/samples/DisplayBindings/AlternateEditor/AlternateEditor.sln index 4cf125f949..44578eaec3 100644 --- a/samples/DisplayBindings/AlternateEditor/AlternateEditor.sln +++ b/samples/DisplayBindings/AlternateEditor/AlternateEditor.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.0.0.5571 +# SharpDevelop 5.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AlternateEditor", "AlternateEditor.csproj", "{2DCF1D56-2362-4C44-B0CE-C635B0B4BB7C}" EndProject Global @@ -10,9 +10,9 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {2DCF1D56-2362-4C44-B0CE-C635B0B4BB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DCF1D56-2362-4C44-B0CE-C635B0B4BB7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2DCF1D56-2362-4C44-B0CE-C635B0B4BB7C}.Release|Any CPU.Build.0 = Release|Any CPU + {2DCF1D56-2362-4C44-B0CE-C635B0B4BB7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {2DCF1D56-2362-4C44-B0CE-C635B0B4BB7C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2DCF1D56-2362-4C44-B0CE-C635B0B4BB7C}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/samples/DisplayBindings/AlternateEditor/AlternateEditorDisplayBinding.cs b/samples/DisplayBindings/AlternateEditor/AlternateEditorDisplayBinding.cs index 88c1e196dc..211f8fe076 100644 --- a/samples/DisplayBindings/AlternateEditor/AlternateEditorDisplayBinding.cs +++ b/samples/DisplayBindings/AlternateEditor/AlternateEditorDisplayBinding.cs @@ -25,18 +25,18 @@ // IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Gui; using System; using System.IO; +using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Workbench; namespace AlternateEditor { public class AlternateEditorDisplayBinding : IDisplayBinding { - public bool CanCreateContentForFile(string fileName) + public bool CanCreateContentForFile(FileName fileName) { return true; } @@ -46,12 +46,12 @@ namespace AlternateEditor return new Editor(file); } - public bool IsPreferredBindingForFile(string fileName) + public bool IsPreferredBindingForFile(FileName fileName) { return true; } - public double AutoDetectFileContent(string fileName, Stream fileContent, string detectedMimeType) + public double AutoDetectFileContent(FileName fileName, Stream fileContent, string detectedMimeType) { return 0; } diff --git a/samples/DisplayBindings/AlternateEditor/Editor.cs b/samples/DisplayBindings/AlternateEditor/Editor.cs index 84c71eb678..ae1968a728 100755 --- a/samples/DisplayBindings/AlternateEditor/Editor.cs +++ b/samples/DisplayBindings/AlternateEditor/Editor.cs @@ -29,14 +29,11 @@ using System; using System.IO; using System.Windows.Forms; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Editor; -using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Workbench; namespace AlternateEditor { - // TODO: implement ITextEditorProvider interface to enable advanced editor features - public class Editor : AbstractViewContent // , ITextEditorProvider + public class Editor : AbstractViewContent { RichTextBox rtb = new RichTextBox(); @@ -88,12 +85,6 @@ namespace AlternateEditor } /* - public ITextEditor TextEditor { - get { - return new TextEditorAdapter(rtb); - } - } - public IDocument GetDocumentForFile(OpenedFile file) { if (file == this.PrimaryFile) diff --git a/samples/DisplayBindings/HtmlPreview/HtmlPreview.csproj b/samples/DisplayBindings/HtmlPreview/HtmlPreview.csproj index 08ec8be8b0..3db3f97e11 100644 --- a/samples/DisplayBindings/HtmlPreview/HtmlPreview.csproj +++ b/samples/DisplayBindings/HtmlPreview/HtmlPreview.csproj @@ -19,7 +19,8 @@ Program ..\..\..\bin\SharpDevelop.exe ..\..\..\AddIns\Samples\HtmlPreview - v4.0 + v4.5 + False diff --git a/samples/DisplayBindings/HtmlPreview/HtmlPreview.sln b/samples/DisplayBindings/HtmlPreview/HtmlPreview.sln index 2185626d89..1163961b67 100644 --- a/samples/DisplayBindings/HtmlPreview/HtmlPreview.sln +++ b/samples/DisplayBindings/HtmlPreview/HtmlPreview.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.0.0.5571 +# SharpDevelop 5.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HtmlPreview", "HtmlPreview.csproj", "{BECEEB35-A81D-4545-AC8E-BC622451DB99}" EndProject Global @@ -10,9 +10,9 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Debug|Any CPU.Build.0 = Debug|Any CPU {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Release|Any CPU.Build.0 = Release|Any CPU + {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Debug|Any CPU.Build.0 = Debug|Any CPU {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/samples/DisplayBindings/HtmlPreview/Src/PreviewDisplayBinding.cs b/samples/DisplayBindings/HtmlPreview/Src/PreviewDisplayBinding.cs index 26a46bb7f8..5d8cc9012a 100644 --- a/samples/DisplayBindings/HtmlPreview/Src/PreviewDisplayBinding.cs +++ b/samples/DisplayBindings/HtmlPreview/Src/PreviewDisplayBinding.cs @@ -26,9 +26,8 @@ // OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. using System; -using ICSharpCode.Core; using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Workbench; namespace HtmlPreview { diff --git a/samples/DisplayBindings/HtmlPreview/Src/PreviewViewContent.cs b/samples/DisplayBindings/HtmlPreview/Src/PreviewViewContent.cs index 27e79990e2..b050703965 100755 --- a/samples/DisplayBindings/HtmlPreview/Src/PreviewViewContent.cs +++ b/samples/DisplayBindings/HtmlPreview/Src/PreviewViewContent.cs @@ -27,8 +27,9 @@ using System; using System.Windows.Forms; -using ICSharpCode.Core; +using ICSharpCode.SharpDevelop; using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Workbench; namespace HtmlPreview { diff --git a/samples/DisplayBindings/ImageViewer/ImageViewer.csproj b/samples/DisplayBindings/ImageViewer/ImageViewer.csproj index ac731525ca..760c8395fd 100644 --- a/samples/DisplayBindings/ImageViewer/ImageViewer.csproj +++ b/samples/DisplayBindings/ImageViewer/ImageViewer.csproj @@ -19,7 +19,8 @@ Program ..\..\..\bin\SharpDevelop.exe ..\..\..\AddIns\Samples\ImageViewer\ - v4.0 + v4.5 + False diff --git a/samples/DisplayBindings/ImageViewer/ImageViewer.sln b/samples/DisplayBindings/ImageViewer/ImageViewer.sln index 6802e03ef3..fd8edd64f8 100644 --- a/samples/DisplayBindings/ImageViewer/ImageViewer.sln +++ b/samples/DisplayBindings/ImageViewer/ImageViewer.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 -# SharpDevelop 4.3 +# SharpDevelop 5.0 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImageViewer", "ImageViewer.csproj", "{BECEEB35-A81D-4545-AC8E-BC622451DB99}" EndProject Global @@ -10,9 +10,9 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Debug|Any CPU.Build.0 = Debug|Any CPU {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Release|Any CPU.Build.0 = Release|Any CPU + {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Debug|Any CPU.Build.0 = Debug|Any CPU {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BECEEB35-A81D-4545-AC8E-BC622451DB99}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection EndGlobal diff --git a/samples/DisplayBindings/ImageViewer/Src/ImageViewContent.cs b/samples/DisplayBindings/ImageViewer/Src/ImageViewContent.cs index 10ee96b795..ead5cfa78b 100755 --- a/samples/DisplayBindings/ImageViewer/Src/ImageViewContent.cs +++ b/samples/DisplayBindings/ImageViewer/Src/ImageViewContent.cs @@ -30,9 +30,7 @@ using System.Drawing; using System.Drawing.Imaging; using System.IO; using System.Windows.Forms; -using ICSharpCode.Core; -using ICSharpCode.SharpDevelop; -using ICSharpCode.SharpDevelop.Gui; +using ICSharpCode.SharpDevelop.Workbench; namespace ImageViewer { diff --git a/samples/DisplayBindings/ImageViewer/Src/ImageViewerDisplayBinding.cs b/samples/DisplayBindings/ImageViewer/Src/ImageViewerDisplayBinding.cs index 71ceb55d6d..57660d93af 100644 --- a/samples/DisplayBindings/ImageViewer/Src/ImageViewerDisplayBinding.cs +++ b/samples/DisplayBindings/ImageViewer/Src/ImageViewerDisplayBinding.cs @@ -27,14 +27,14 @@ using System; using ICSharpCode.Core; -using ICSharpCode.SharpDevelop.Gui; using ICSharpCode.SharpDevelop; +using ICSharpCode.SharpDevelop.Workbench; namespace ImageViewer { public class ImageViewerDisplayBinding : IDisplayBinding { - public bool CanCreateContentForFile(string fileName) { + public bool CanCreateContentForFile(FileName fileName) { return true; } @@ -43,12 +43,12 @@ namespace ImageViewer return vc; } - public bool IsPreferredBindingForFile(string fileName) + public bool IsPreferredBindingForFile(FileName fileName) { return true; } - public double AutoDetectFileContent(string fileName, System.IO.Stream fileContent, string detectedMimeType) + public double AutoDetectFileContent(FileName fileName, System.IO.Stream fileContent, string detectedMimeType) { return 0; }