From c1d5e134331e6dd1a4b5ddf5cb1dafb99e99775a Mon Sep 17 00:00:00 2001 From: Matt Ward Date: Wed, 6 Sep 2006 17:56:03 +0000 Subject: [PATCH] Fixed SD2-697 - Creating a new file does not switch the current view. git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1770 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Src/CreateSchemaCommand.cs | 4 --- .../XmlEditor/Project/XmlEditor.csproj | 2 +- .../Base/Project/Src/Commands/FileCommands.cs | 30 +++---------------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs index 254c0f6ce6..3abaa5c800 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/Src/CreateSchemaCommand.cs @@ -40,10 +40,6 @@ namespace ICSharpCode.XmlEditor // Create a new file and display the generated schema. string fileName = GenerateSchemaFileName(xmlView.TitleName); OpenNewXmlFile(fileName, schema); - - if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) { - WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.SelectWindow(); - } } } diff --git a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj index 0c5978b6da..a890ef2972 100644 --- a/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj +++ b/src/AddIns/DisplayBindings/XmlEditor/Project/XmlEditor.csproj @@ -38,7 +38,7 @@ Full true - DEBUG%3bTRACE + DEBUG;TRACE None diff --git a/src/Main/Base/Project/Src/Commands/FileCommands.cs b/src/Main/Base/Project/Src/Commands/FileCommands.cs index 8f8d25b944..2a3a361f67 100644 --- a/src/Main/Base/Project/Src/Commands/FileCommands.cs +++ b/src/Main/Base/Project/Src/Commands/FileCommands.cs @@ -40,9 +40,6 @@ namespace ICSharpCode.SharpDevelop.Commands nfd.Owner = (Form)WorkbenchSingleton.Workbench; nfd.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm); } - if (WorkbenchSingleton.Workbench.ActiveWorkbenchWindow != null) { - WorkbenchSingleton.Workbench.ActiveWorkbenchWindow.SelectWindow(); - } } } @@ -75,8 +72,6 @@ namespace ICSharpCode.SharpDevelop.Commands SaveFileAs sfa = new SaveFileAs(); sfa.Run(); } else { - - ProjectService.MarkFileDirty(window.ViewContent.FileName); FileUtility.ObservedSave(new FileOperationDelegate(window.ViewContent.Save), window.ViewContent.FileName, FileErrorPolicy.ProvideAlternative); } @@ -90,9 +85,7 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; - if (window != null && window.ViewContent.FileName != null && !window.ViewContent.IsViewOnly) { - if (MessageService.AskQuestion("${res:ICSharpCode.SharpDevelop.Commands.ReloadFile.ReloadFileQuestion}")) { Properties memento = null; if (window.ViewContent is IMementoCapable) { @@ -112,7 +105,6 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; - if (window != null) { if (window.ViewContent.IsViewOnly) { return; @@ -136,17 +128,12 @@ namespace ICSharpCode.SharpDevelop.Commands } if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) { - string fileName = fdiag.FileName; - - - + string fileName = fdiag.FileName; if (!FileService.CheckFileName(fileName)) { return; - } - + } if (FileUtility.ObservedSave(new NamedFileOperationDelegate(window.ViewContent.Save), fileName) == FileOperationResult.OK) { - FileService.RecentOpen.AddLastFile(fileName); - + FileService.RecentOpen.AddLastFile(fileName); MessageService.ShowMessage(fileName, "${res:ICSharpCode.SharpDevelop.Commands.SaveFile.FileSaved}"); } } @@ -173,7 +160,6 @@ namespace ICSharpCode.SharpDevelop.Commands using (SaveFileDialog fdiag = new SaveFileDialog()) { fdiag.OverwritePrompt = true; fdiag.AddExtension = true; - fdiag.Filter = String.Join("|", (string[])(AddInTree.GetTreeNode("/SharpDevelop/Workbench/FileFilter").BuildChildItems(null)).ToArray(typeof(string))); if (fdiag.ShowDialog(ICSharpCode.SharpDevelop.Gui.WorkbenchSingleton.MainForm) == DialogResult.OK) { @@ -258,7 +244,6 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; - if (window != null) { if (window.ViewContent is IPrintable) { PrintDocument pdoc = ((IPrintable)window.ViewContent).PrintDocument; @@ -271,11 +256,9 @@ namespace ICSharpCode.SharpDevelop.Commands } } } else { - MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Commands.Print.CreatePrintDocumentError}"); } } else { - MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Commands.Print.CantPrintWindowContentError}"); } } @@ -288,7 +271,6 @@ namespace ICSharpCode.SharpDevelop.Commands { try { IWorkbenchWindow window = WorkbenchSingleton.Workbench.ActiveWorkbenchWindow; - if (window != null) { if (window.ViewContent is IPrintable) { using (PrintDocument pdoc = ((IPrintable)window.ViewContent).PrintDocument) { @@ -299,14 +281,12 @@ namespace ICSharpCode.SharpDevelop.Commands ppd.Document = pdoc; ppd.Show(); } else { - MessageService.ShowError("${res:ICSharpCode.SharpDevelop.Commands.Print.CreatePrintDocumentError}"); } } } } - } catch (System.Drawing.Printing.InvalidPrinterException) { - } + } catch (InvalidPrinterException) {} } } @@ -315,7 +295,6 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { try { - FileService.RecentOpen.ClearRecentFiles(); } catch {} } @@ -326,7 +305,6 @@ namespace ICSharpCode.SharpDevelop.Commands public override void Run() { try { - FileService.RecentOpen.ClearRecentProjects(); } catch {} }