diff options
Diffstat (limited to 'main/src/addins/MonoDevelop.HexEditor')
4 files changed, 11 insertions, 23 deletions
diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj index 90f243d1ab..62f6447fdc 100644 --- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj +++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor.csproj @@ -93,11 +93,6 @@ <Folder Include="MonoDevelop.HexEditor\" /> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\core\Mono.Texteditor\Mono.TextEditor.csproj"> - <Project>{A2329308-3751-4DBD-9A75-5F7B8B024625}</Project> - <Name>Mono.TextEditor</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\..\core\MonoDevelop.Core\MonoDevelop.Core.csproj"> <Project>{7525BB88-6142-4A26-93B9-A30C6983390A}</Project> <Name>MonoDevelop.Core</Name> @@ -108,11 +103,6 @@ <Name>MonoDevelop.Ide</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj"> - <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project> - <Name>MonoDevelop.SourceEditor</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\MonoDevelop.Debugger\MonoDevelop.Debugger.csproj"> <Project>{2357AABD-08C7-4808-A495-8FF2D3CDFDB0}</Project> <Name>MonoDevelop.Debugger</Name> @@ -133,11 +123,6 @@ <Name>MonoDevelop.AssemblyBrowser</Name> <Private>False</Private> </ProjectReference> - <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj"> - <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project> - <Name>ICSharpCode.NRefactory</Name> - <Private>False</Private> - </ProjectReference> <ProjectReference Include="..\CSharpBinding\CSharpBinding.csproj"> <Project>{07CC7654-27D6-421D-A64C-0FFA40456FA2}</Project> <Name>CSharpBinding</Name> diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs index b4f8bc4820..44fc7fac18 100644 --- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs +++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorView.cs @@ -32,6 +32,7 @@ using Mono.MHex.Data; using MonoDevelop.Ide.Gui.Content; using Xwt; using MonoDevelop.Ide.Fonts; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.HexEditor { @@ -50,7 +51,7 @@ namespace MonoDevelop.HexEditor { hexEditor.HexEditorStyle = new MonoDevelopHexEditorStyle (hexEditor); SetOptions (); - MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.Changed += delegate { + DefaultSourceEditorOptions.Instance.Changed += delegate { SetOptions (); }; hexEditor.HexEditorData.Replaced += delegate { @@ -67,15 +68,16 @@ namespace MonoDevelop.HexEditor hexEditor.Repaint (); } - public override void Save (string fileName) + public override void Save (FileSaveInformation fileSaveInformation) { - File.WriteAllBytes (fileName, hexEditor.HexEditorData.Bytes); - ContentName = fileName; + File.WriteAllBytes (fileSaveInformation.FileName, hexEditor.HexEditorData.Bytes); + ContentName = fileSaveInformation.FileName; this.IsDirty = false; } - public override void Load (string fileName) + public override void Load (FileOpenInformation fileOpenInformation) { + var fileName = fileOpenInformation.FileName; using (Stream stream = File.OpenRead (fileName)) { hexEditor.HexEditorData.Buffer = ArrayBuffer.Load (stream); } diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs index e63dee04d6..7897809fdd 100644 --- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs +++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/HexEditorVisualizer.cs @@ -33,6 +33,7 @@ using MonoDevelop.Debugger; using MonoDevelop.Core; using Mono.MHex.Data; +using MonoDevelop.Ide.Editor; namespace MonoDevelop.HexEditor { @@ -82,7 +83,7 @@ namespace MonoDevelop.HexEditor void SetHexEditorOptions () { - hexEditor.Options.FontName = MonoDevelop.SourceEditor.DefaultSourceEditorOptions.Instance.FontName; + hexEditor.Options.FontName = DefaultSourceEditorOptions.Instance.FontName; hexEditor.PurgeLayoutCaches (); hexEditor.Repaint (); } diff --git a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs index 24d4bb1105..10ec8b0986 100644 --- a/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs +++ b/main/src/addins/MonoDevelop.HexEditor/MonoDevelop.HexEditor/MonoDevelopHexEditorStyle.cs @@ -25,13 +25,13 @@ // THE SOFTWARE. using System; -using Mono.TextEditor.Highlighting; using Mono.MHex.Rendering; using Xwt; using MonoDevelop.Core; using MonoDevelop.Ide; -using Mono.TextEditor; using Xwt.Drawing; +using MonoDevelop.Ide.Editor; +using MonoDevelop.Ide.Editor.Highlighting; namespace MonoDevelop.HexEditor { |