From c4aeb0395da122908b8ec726845adfcd355ef347 Mon Sep 17 00:00:00 2001 From: alcexhim Date: Fri, 6 Jun 2014 09:28:17 -0400 Subject: [PATCH] Added NewProject/OpenProject and others --- .../Controls/SolutionExplorer.Designer.cs | 687 +++++++++--------- .../Controls/SolutionExplorer.cs | 52 +- .../MainWindow.Designer.cs | 5 + .../MainWindow.cs | 67 +- .../MainWindow.resx | 6 +- .../IHostApplicationWindow.cs | 6 +- 6 files changed, 482 insertions(+), 341 deletions(-) diff --git a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.Designer.cs b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.Designer.cs index 3b9df3e7..c0b6f626 100644 --- a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.Designer.cs +++ b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.Designer.cs @@ -29,48 +29,51 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SolutionExplorer)); - this.cbToolBar1 = new AwesomeControls.CommandBars.CBToolBar(); - this.tsbBack = new System.Windows.Forms.ToolStripButton(); - this.tsbForward = new System.Windows.Forms.ToolStripButton(); - this.tsbHome = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); - this.tsbFilter = new System.Windows.Forms.ToolStripSplitButton(); - this.pendingChangesFilterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openFilesFilterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.tsbRefresh = new System.Windows.Forms.ToolStripButton(); - this.tsbCollapseAll = new System.Windows.Forms.ToolStripButton(); - this.tsbShowAllFiles = new System.Windows.Forms.ToolStripButton(); - this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); - this.tsbViewCode = new System.Windows.Forms.ToolStripButton(); - this.tsbProperties = new System.Windows.Forms.ToolStripButton(); - this.tsbPreviewSelectedItems = new System.Windows.Forms.ToolStripButton(); - this.txtFilter = new AwesomeControls.TextBox.TextBoxControl(); - this.tv = new System.Windows.Forms.TreeView(); - this.mnuContext = new AwesomeControls.CommandBars.CBContextMenu(this.components); - this.mnuContextAdd = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuContextAddNewItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuContextAddExistingItem = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuContextAddSep1 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuContextAddNewFolder = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuContextSep1 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuContextCut = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuContextCopy = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuContextPaste = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); - this.mnuContextProperties = new System.Windows.Forms.ToolStripMenuItem(); - this.imlSmallIcons = new System.Windows.Forms.ImageList(this.components); - this.mnuContextAddSep2 = new System.Windows.Forms.ToolStripSeparator(); - this.cbToolBar1.SuspendLayout(); - this.mnuContext.SuspendLayout(); - this.SuspendLayout(); - // - // cbToolBar1 - // - this.cbToolBar1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; - this.cbToolBar1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.components = new System.ComponentModel.Container(); + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SolutionExplorer)); + this.cbToolBar1 = new AwesomeControls.CommandBars.CBToolBar(); + this.tsbBack = new System.Windows.Forms.ToolStripButton(); + this.tsbForward = new System.Windows.Forms.ToolStripButton(); + this.tsbHome = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbFilter = new System.Windows.Forms.ToolStripSplitButton(); + this.pendingChangesFilterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.openFilesFilterToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.tsbRefresh = new System.Windows.Forms.ToolStripButton(); + this.tsbCollapseAll = new System.Windows.Forms.ToolStripButton(); + this.tsbShowAllFiles = new System.Windows.Forms.ToolStripButton(); + this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator(); + this.tsbViewCode = new System.Windows.Forms.ToolStripButton(); + this.tsbProperties = new System.Windows.Forms.ToolStripButton(); + this.tsbPreviewSelectedItems = new System.Windows.Forms.ToolStripButton(); + this.txtFilter = new AwesomeControls.TextBox.TextBoxControl(); + this.tv = new System.Windows.Forms.TreeView(); + this.mnuContext = new AwesomeControls.CommandBars.CBContextMenu(this.components); + this.mnuContextAdd = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextAddNewItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextAddExistingItem = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextAddSep2 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuContextAddSep3 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuContextAddNewFolder = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextSep1 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuContextCut = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextCopy = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextPaste = new System.Windows.Forms.ToolStripMenuItem(); + this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); + this.toolStripMenuItem3 = new System.Windows.Forms.ToolStripSeparator(); + this.mnuContextProperties = new System.Windows.Forms.ToolStripMenuItem(); + this.imlSmallIcons = new System.Windows.Forms.ImageList(this.components); + this.mnuContextAddNewProject = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextAddExistingProject = new System.Windows.Forms.ToolStripMenuItem(); + this.mnuContextAddSep1 = new System.Windows.Forms.ToolStripSeparator(); + this.cbToolBar1.SuspendLayout(); + this.mnuContext.SuspendLayout(); + this.SuspendLayout(); + // + // cbToolBar1 + // + this.cbToolBar1.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden; + this.cbToolBar1.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.tsbBack, this.tsbForward, this.tsbHome, @@ -83,187 +86,187 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls this.tsbViewCode, this.tsbProperties, this.tsbPreviewSelectedItems}); - this.cbToolBar1.Location = new System.Drawing.Point(0, 0); - this.cbToolBar1.Name = "cbToolBar1"; - this.cbToolBar1.Size = new System.Drawing.Size(322, 25); - this.cbToolBar1.TabIndex = 0; - this.cbToolBar1.Text = "cbToolBar1"; - // - // tsbBack - // - this.tsbBack.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbBack.Image = ((System.Drawing.Image)(resources.GetObject("tsbBack.Image"))); - this.tsbBack.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbBack.Name = "tsbBack"; - this.tsbBack.Size = new System.Drawing.Size(23, 22); - this.tsbBack.Text = "Back"; - // - // tsbForward - // - this.tsbForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbForward.Image = ((System.Drawing.Image)(resources.GetObject("tsbForward.Image"))); - this.tsbForward.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbForward.Name = "tsbForward"; - this.tsbForward.Size = new System.Drawing.Size(23, 22); - this.tsbForward.Text = "Forward"; - // - // tsbHome - // - this.tsbHome.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbHome.Image = ((System.Drawing.Image)(resources.GetObject("tsbHome.Image"))); - this.tsbHome.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbHome.Name = "tsbHome"; - this.tsbHome.Size = new System.Drawing.Size(23, 22); - this.tsbHome.Text = "Home"; - // - // toolStripSeparator1 - // - this.toolStripSeparator1.Name = "toolStripSeparator1"; - this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); - // - // tsbFilter - // - this.tsbFilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbFilter.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.cbToolBar1.Location = new System.Drawing.Point(0, 0); + this.cbToolBar1.Name = "cbToolBar1"; + this.cbToolBar1.Size = new System.Drawing.Size(322, 25); + this.cbToolBar1.TabIndex = 0; + this.cbToolBar1.Text = "cbToolBar1"; + // + // tsbBack + // + this.tsbBack.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbBack.Image = ((System.Drawing.Image)(resources.GetObject("tsbBack.Image"))); + this.tsbBack.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbBack.Name = "tsbBack"; + this.tsbBack.Size = new System.Drawing.Size(23, 22); + this.tsbBack.Text = "Back"; + // + // tsbForward + // + this.tsbForward.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbForward.Image = ((System.Drawing.Image)(resources.GetObject("tsbForward.Image"))); + this.tsbForward.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbForward.Name = "tsbForward"; + this.tsbForward.Size = new System.Drawing.Size(23, 22); + this.tsbForward.Text = "Forward"; + // + // tsbHome + // + this.tsbHome.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbHome.Image = ((System.Drawing.Image)(resources.GetObject("tsbHome.Image"))); + this.tsbHome.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbHome.Name = "tsbHome"; + this.tsbHome.Size = new System.Drawing.Size(23, 22); + this.tsbHome.Text = "Home"; + // + // toolStripSeparator1 + // + this.toolStripSeparator1.Name = "toolStripSeparator1"; + this.toolStripSeparator1.Size = new System.Drawing.Size(6, 25); + // + // tsbFilter + // + this.tsbFilter.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbFilter.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { this.pendingChangesFilterToolStripMenuItem, this.openFilesFilterToolStripMenuItem}); - this.tsbFilter.Image = ((System.Drawing.Image)(resources.GetObject("tsbFilter.Image"))); - this.tsbFilter.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbFilter.Name = "tsbFilter"; - this.tsbFilter.Size = new System.Drawing.Size(32, 22); - this.tsbFilter.Text = "Pending Changes Filter"; - // - // pendingChangesFilterToolStripMenuItem - // - this.pendingChangesFilterToolStripMenuItem.Name = "pendingChangesFilterToolStripMenuItem"; - this.pendingChangesFilterToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.pendingChangesFilterToolStripMenuItem.Text = "Pending Changes Filter"; - // - // openFilesFilterToolStripMenuItem - // - this.openFilesFilterToolStripMenuItem.Name = "openFilesFilterToolStripMenuItem"; - this.openFilesFilterToolStripMenuItem.Size = new System.Drawing.Size(196, 22); - this.openFilesFilterToolStripMenuItem.Text = "Open Files Filter"; - // - // tsbRefresh - // - this.tsbRefresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbRefresh.Image = ((System.Drawing.Image)(resources.GetObject("tsbRefresh.Image"))); - this.tsbRefresh.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbRefresh.Name = "tsbRefresh"; - this.tsbRefresh.Size = new System.Drawing.Size(23, 22); - this.tsbRefresh.Text = "Refresh"; - // - // tsbCollapseAll - // - this.tsbCollapseAll.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbCollapseAll.Image = ((System.Drawing.Image)(resources.GetObject("tsbCollapseAll.Image"))); - this.tsbCollapseAll.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbCollapseAll.Name = "tsbCollapseAll"; - this.tsbCollapseAll.Size = new System.Drawing.Size(23, 22); - this.tsbCollapseAll.Text = "Collapse All"; - // - // tsbShowAllFiles - // - this.tsbShowAllFiles.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbShowAllFiles.Image = ((System.Drawing.Image)(resources.GetObject("tsbShowAllFiles.Image"))); - this.tsbShowAllFiles.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbShowAllFiles.Name = "tsbShowAllFiles"; - this.tsbShowAllFiles.Size = new System.Drawing.Size(23, 22); - this.tsbShowAllFiles.Text = "Show All Files"; - // - // toolStripSeparator2 - // - this.toolStripSeparator2.Name = "toolStripSeparator2"; - this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); - // - // tsbViewCode - // - this.tsbViewCode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbViewCode.Image = ((System.Drawing.Image)(resources.GetObject("tsbViewCode.Image"))); - this.tsbViewCode.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbViewCode.Name = "tsbViewCode"; - this.tsbViewCode.Size = new System.Drawing.Size(23, 22); - this.tsbViewCode.Text = "View Code"; - // - // tsbProperties - // - this.tsbProperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbProperties.Image = ((System.Drawing.Image)(resources.GetObject("tsbProperties.Image"))); - this.tsbProperties.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbProperties.Name = "tsbProperties"; - this.tsbProperties.Size = new System.Drawing.Size(23, 22); - this.tsbProperties.Text = "Properties"; - // - // tsbPreviewSelectedItems - // - this.tsbPreviewSelectedItems.CheckOnClick = true; - this.tsbPreviewSelectedItems.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; - this.tsbPreviewSelectedItems.Image = ((System.Drawing.Image)(resources.GetObject("tsbPreviewSelectedItems.Image"))); - this.tsbPreviewSelectedItems.ImageTransparentColor = System.Drawing.Color.Magenta; - this.tsbPreviewSelectedItems.Name = "tsbPreviewSelectedItems"; - this.tsbPreviewSelectedItems.Size = new System.Drawing.Size(23, 22); - this.tsbPreviewSelectedItems.Text = "Preview Selected Items"; - // - // txtFilter - // - this.txtFilter.AcceptReturn = true; - this.txtFilter.AutoIndentEnabled = true; - this.txtFilter.AutoSuggestFilter = true; - this.txtFilter.AutoSuggestMode = AwesomeControls.TextBox.TextBoxAutoSuggestMode.None; - this.txtFilter.BackColor = System.Drawing.SystemColors.Window; - this.txtFilter.CaretBlinkInterval = 530; - this.txtFilter.CaretColor = System.Drawing.Color.Black; - this.txtFilter.CaretOrientation = System.Windows.Forms.Orientation.Vertical; - this.txtFilter.CaretSize = 1; - this.txtFilter.CaseSensitive = true; - this.txtFilter.CharacterSpacing = 0; - this.txtFilter.Dock = System.Windows.Forms.DockStyle.Top; - this.txtFilter.EnableCaret = true; - this.txtFilter.EnableCaretBlink = true; - this.txtFilter.EnableMultiSelection = true; - this.txtFilter.EnableOutlining = false; - this.txtFilter.EnableOverwrite = false; - this.txtFilter.EnableOverwriteShortcut = true; - this.txtFilter.EnableSelection = true; - this.txtFilter.EnableSyntaxHighlight = false; - this.txtFilter.ForeColor = System.Drawing.SystemColors.WindowText; - this.txtFilter.HideSelection = true; - this.txtFilter.LineSeparator = AwesomeControls.TextBox.TextBoxLineSeparator.Default; - this.txtFilter.LineSeparatorString = "\r\n"; - this.txtFilter.Location = new System.Drawing.Point(0, 25); - this.txtFilter.Multiline = false; - this.txtFilter.Name = "txtFilter"; - this.txtFilter.PlaceholderText = ""; - this.txtFilter.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; - this.txtFilter.SelectionStart = 0; - this.txtFilter.Size = new System.Drawing.Size(322, 23); - this.txtFilter.TabIndex = 1; - this.txtFilter.WordSpacing = 0; - // - // tv - // - this.tv.ContextMenuStrip = this.mnuContext; - this.tv.Dock = System.Windows.Forms.DockStyle.Fill; - this.tv.FullRowSelect = true; - this.tv.HideSelection = false; - this.tv.ImageIndex = 0; - this.tv.ImageList = this.imlSmallIcons; - this.tv.LabelEdit = true; - this.tv.Location = new System.Drawing.Point(0, 48); - this.tv.Name = "tv"; - this.tv.SelectedImageIndex = 0; - this.tv.Size = new System.Drawing.Size(322, 331); - this.tv.TabIndex = 2; - this.tv.BeforeLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.tv_BeforeLabelEdit); - this.tv.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.tv_AfterLabelEdit); - this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect); - this.tv.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseDoubleClick); - this.tv.MouseDown += new System.Windows.Forms.MouseEventHandler(this.tv_MouseDown); - // - // mnuContext - // - this.mnuContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.tsbFilter.Image = ((System.Drawing.Image)(resources.GetObject("tsbFilter.Image"))); + this.tsbFilter.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbFilter.Name = "tsbFilter"; + this.tsbFilter.Size = new System.Drawing.Size(32, 22); + this.tsbFilter.Text = "Pending Changes Filter"; + // + // pendingChangesFilterToolStripMenuItem + // + this.pendingChangesFilterToolStripMenuItem.Name = "pendingChangesFilterToolStripMenuItem"; + this.pendingChangesFilterToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.pendingChangesFilterToolStripMenuItem.Text = "Pending Changes Filter"; + // + // openFilesFilterToolStripMenuItem + // + this.openFilesFilterToolStripMenuItem.Name = "openFilesFilterToolStripMenuItem"; + this.openFilesFilterToolStripMenuItem.Size = new System.Drawing.Size(196, 22); + this.openFilesFilterToolStripMenuItem.Text = "Open Files Filter"; + // + // tsbRefresh + // + this.tsbRefresh.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbRefresh.Image = ((System.Drawing.Image)(resources.GetObject("tsbRefresh.Image"))); + this.tsbRefresh.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbRefresh.Name = "tsbRefresh"; + this.tsbRefresh.Size = new System.Drawing.Size(23, 22); + this.tsbRefresh.Text = "Refresh"; + // + // tsbCollapseAll + // + this.tsbCollapseAll.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbCollapseAll.Image = ((System.Drawing.Image)(resources.GetObject("tsbCollapseAll.Image"))); + this.tsbCollapseAll.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbCollapseAll.Name = "tsbCollapseAll"; + this.tsbCollapseAll.Size = new System.Drawing.Size(23, 22); + this.tsbCollapseAll.Text = "Collapse All"; + // + // tsbShowAllFiles + // + this.tsbShowAllFiles.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbShowAllFiles.Image = ((System.Drawing.Image)(resources.GetObject("tsbShowAllFiles.Image"))); + this.tsbShowAllFiles.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbShowAllFiles.Name = "tsbShowAllFiles"; + this.tsbShowAllFiles.Size = new System.Drawing.Size(23, 22); + this.tsbShowAllFiles.Text = "Show All Files"; + // + // toolStripSeparator2 + // + this.toolStripSeparator2.Name = "toolStripSeparator2"; + this.toolStripSeparator2.Size = new System.Drawing.Size(6, 25); + // + // tsbViewCode + // + this.tsbViewCode.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbViewCode.Image = ((System.Drawing.Image)(resources.GetObject("tsbViewCode.Image"))); + this.tsbViewCode.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbViewCode.Name = "tsbViewCode"; + this.tsbViewCode.Size = new System.Drawing.Size(23, 22); + this.tsbViewCode.Text = "View Code"; + // + // tsbProperties + // + this.tsbProperties.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbProperties.Image = ((System.Drawing.Image)(resources.GetObject("tsbProperties.Image"))); + this.tsbProperties.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbProperties.Name = "tsbProperties"; + this.tsbProperties.Size = new System.Drawing.Size(23, 22); + this.tsbProperties.Text = "Properties"; + // + // tsbPreviewSelectedItems + // + this.tsbPreviewSelectedItems.CheckOnClick = true; + this.tsbPreviewSelectedItems.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image; + this.tsbPreviewSelectedItems.Image = ((System.Drawing.Image)(resources.GetObject("tsbPreviewSelectedItems.Image"))); + this.tsbPreviewSelectedItems.ImageTransparentColor = System.Drawing.Color.Magenta; + this.tsbPreviewSelectedItems.Name = "tsbPreviewSelectedItems"; + this.tsbPreviewSelectedItems.Size = new System.Drawing.Size(23, 22); + this.tsbPreviewSelectedItems.Text = "Preview Selected Items"; + // + // txtFilter + // + this.txtFilter.AcceptReturn = true; + this.txtFilter.AutoIndentEnabled = true; + this.txtFilter.AutoSuggestFilter = true; + this.txtFilter.AutoSuggestMode = AwesomeControls.TextBox.TextBoxAutoSuggestMode.None; + this.txtFilter.BackColor = System.Drawing.SystemColors.Window; + this.txtFilter.CaretBlinkInterval = 530; + this.txtFilter.CaretColor = System.Drawing.Color.Black; + this.txtFilter.CaretOrientation = System.Windows.Forms.Orientation.Vertical; + this.txtFilter.CaretSize = 1; + this.txtFilter.CaseSensitive = true; + this.txtFilter.CharacterSpacing = 0; + this.txtFilter.Dock = System.Windows.Forms.DockStyle.Top; + this.txtFilter.EnableCaret = true; + this.txtFilter.EnableCaretBlink = true; + this.txtFilter.EnableMultiSelection = true; + this.txtFilter.EnableOutlining = false; + this.txtFilter.EnableOverwrite = false; + this.txtFilter.EnableOverwriteShortcut = true; + this.txtFilter.EnableSelection = true; + this.txtFilter.EnableSyntaxHighlight = false; + this.txtFilter.ForeColor = System.Drawing.SystemColors.WindowText; + this.txtFilter.HideSelection = true; + this.txtFilter.LineSeparator = AwesomeControls.TextBox.TextBoxLineSeparator.Default; + this.txtFilter.LineSeparatorString = "\r\n"; + this.txtFilter.Location = new System.Drawing.Point(0, 25); + this.txtFilter.Multiline = false; + this.txtFilter.Name = "txtFilter"; + this.txtFilter.PlaceholderText = ""; + this.txtFilter.ScrollBars = System.Windows.Forms.RichTextBoxScrollBars.None; + this.txtFilter.SelectionStart = 0; + this.txtFilter.Size = new System.Drawing.Size(322, 23); + this.txtFilter.TabIndex = 1; + this.txtFilter.WordSpacing = 0; + // + // tv + // + this.tv.ContextMenuStrip = this.mnuContext; + this.tv.Dock = System.Windows.Forms.DockStyle.Fill; + this.tv.FullRowSelect = true; + this.tv.HideSelection = false; + this.tv.ImageIndex = 0; + this.tv.ImageList = this.imlSmallIcons; + this.tv.LabelEdit = true; + this.tv.Location = new System.Drawing.Point(0, 48); + this.tv.Name = "tv"; + this.tv.SelectedImageIndex = 0; + this.tv.Size = new System.Drawing.Size(322, 331); + this.tv.TabIndex = 2; + this.tv.BeforeLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.tv_BeforeLabelEdit); + this.tv.AfterLabelEdit += new System.Windows.Forms.NodeLabelEditEventHandler(this.tv_AfterLabelEdit); + this.tv.AfterSelect += new System.Windows.Forms.TreeViewEventHandler(this.tv_AfterSelect); + this.tv.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.tv_NodeMouseDoubleClick); + this.tv.MouseDown += new System.Windows.Forms.MouseEventHandler(this.tv_MouseDown); + // + // mnuContext + // + this.mnuContext.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { this.mnuContextAdd, this.mnuContextSep1, this.mnuContextCut, @@ -272,115 +275,140 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls this.deleteToolStripMenuItem, this.toolStripMenuItem3, this.mnuContextProperties}); - this.mnuContext.Name = "cbContextMenu1"; - this.mnuContext.Size = new System.Drawing.Size(194, 170); - this.mnuContext.Opening += new System.ComponentModel.CancelEventHandler(this.mnuContext_Opening); - // - // mnuContextAdd - // - this.mnuContextAdd.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuContext.Name = "cbContextMenu1"; + this.mnuContext.Size = new System.Drawing.Size(194, 170); + this.mnuContext.Opening += new System.ComponentModel.CancelEventHandler(this.mnuContext_Opening); + // + // mnuContextAdd + // + this.mnuContextAdd.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { + this.mnuContextAddNewProject, + this.mnuContextAddExistingProject, + this.mnuContextAddSep1, this.mnuContextAddNewItem, this.mnuContextAddExistingItem, - this.mnuContextAddSep1, this.mnuContextAddSep2, + this.mnuContextAddSep3, this.mnuContextAddNewFolder}); - this.mnuContextAdd.Name = "mnuContextAdd"; - this.mnuContextAdd.Size = new System.Drawing.Size(193, 22); - this.mnuContextAdd.Text = "A&dd"; - // - // mnuContextAddNewItem - // - this.mnuContextAddNewItem.Name = "mnuContextAddNewItem"; - this.mnuContextAddNewItem.Size = new System.Drawing.Size(152, 22); - this.mnuContextAddNewItem.Text = "Ne&w Item..."; - // - // mnuContextAddExistingItem - // - this.mnuContextAddExistingItem.Name = "mnuContextAddExistingItem"; - this.mnuContextAddExistingItem.Size = new System.Drawing.Size(152, 22); - this.mnuContextAddExistingItem.Text = "Existin&g Item..."; - // - // mnuContextAddSep1 - // - this.mnuContextAddSep1.Name = "mnuContextAddSep1"; - this.mnuContextAddSep1.Size = new System.Drawing.Size(149, 6); - // - // mnuContextAddNewFolder - // - this.mnuContextAddNewFolder.Name = "mnuContextAddNewFolder"; - this.mnuContextAddNewFolder.Size = new System.Drawing.Size(152, 22); - this.mnuContextAddNewFolder.Text = "New Fol&der"; - // - // mnuContextSep1 - // - this.mnuContextSep1.Name = "mnuContextSep1"; - this.mnuContextSep1.Size = new System.Drawing.Size(190, 6); - // - // mnuContextCut - // - this.mnuContextCut.Name = "mnuContextCut"; - this.mnuContextCut.ShortcutKeyDisplayString = "Ctrl+X"; - this.mnuContextCut.Size = new System.Drawing.Size(193, 22); - this.mnuContextCut.Text = "Cu&t"; - // - // mnuContextCopy - // - this.mnuContextCopy.Name = "mnuContextCopy"; - this.mnuContextCopy.ShortcutKeyDisplayString = "Ctrl+C"; - this.mnuContextCopy.Size = new System.Drawing.Size(193, 22); - this.mnuContextCopy.Text = "&Copy"; - // - // mnuContextPaste - // - this.mnuContextPaste.Name = "mnuContextPaste"; - this.mnuContextPaste.ShortcutKeyDisplayString = "Ctrl+V"; - this.mnuContextPaste.Size = new System.Drawing.Size(193, 22); - this.mnuContextPaste.Text = "&Paste"; - // - // deleteToolStripMenuItem - // - this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.ShortcutKeyDisplayString = "Del"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(193, 22); - this.deleteToolStripMenuItem.Text = "&Delete"; - // - // toolStripMenuItem3 - // - this.toolStripMenuItem3.Name = "toolStripMenuItem3"; - this.toolStripMenuItem3.Size = new System.Drawing.Size(190, 6); - // - // mnuContextProperties - // - this.mnuContextProperties.Name = "mnuContextProperties"; - this.mnuContextProperties.ShortcutKeyDisplayString = "Alt+Enter"; - this.mnuContextProperties.Size = new System.Drawing.Size(193, 22); - this.mnuContextProperties.Text = "P&roperties..."; - // - // imlSmallIcons - // - this.imlSmallIcons.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit; - this.imlSmallIcons.ImageSize = new System.Drawing.Size(16, 16); - this.imlSmallIcons.TransparentColor = System.Drawing.Color.Transparent; - // - // mnuContextAddSep2 - // - this.mnuContextAddSep2.Name = "mnuContextAddSep2"; - this.mnuContextAddSep2.Size = new System.Drawing.Size(149, 6); - // - // SolutionExplorer - // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Controls.Add(this.tv); - this.Controls.Add(this.txtFilter); - this.Controls.Add(this.cbToolBar1); - this.Name = "SolutionExplorer"; - this.Size = new System.Drawing.Size(322, 379); - this.cbToolBar1.ResumeLayout(false); - this.cbToolBar1.PerformLayout(); - this.mnuContext.ResumeLayout(false); - this.ResumeLayout(false); - this.PerformLayout(); + this.mnuContextAdd.Name = "mnuContextAdd"; + this.mnuContextAdd.Size = new System.Drawing.Size(193, 22); + this.mnuContextAdd.Text = "A&dd"; + // + // mnuContextAddNewItem + // + this.mnuContextAddNewItem.Name = "mnuContextAddNewItem"; + this.mnuContextAddNewItem.Size = new System.Drawing.Size(160, 22); + this.mnuContextAddNewItem.Text = "Ne&w Item..."; + this.mnuContextAddNewItem.Click += new System.EventHandler(this.mnuContextAddNewItem_Click); + // + // mnuContextAddExistingItem + // + this.mnuContextAddExistingItem.Name = "mnuContextAddExistingItem"; + this.mnuContextAddExistingItem.Size = new System.Drawing.Size(160, 22); + this.mnuContextAddExistingItem.Text = "Existin&g Item..."; + this.mnuContextAddExistingItem.Click += new System.EventHandler(this.mnuContextAddExistingItem_Click); + // + // mnuContextAddSep2 + // + this.mnuContextAddSep2.Name = "mnuContextAddSep2"; + this.mnuContextAddSep2.Size = new System.Drawing.Size(157, 6); + // + // mnuContextAddSep3 + // + this.mnuContextAddSep3.Name = "mnuContextAddSep3"; + this.mnuContextAddSep3.Size = new System.Drawing.Size(157, 6); + // + // mnuContextAddNewFolder + // + this.mnuContextAddNewFolder.Name = "mnuContextAddNewFolder"; + this.mnuContextAddNewFolder.Size = new System.Drawing.Size(160, 22); + this.mnuContextAddNewFolder.Text = "New Fol&der"; + this.mnuContextAddNewFolder.Click += new System.EventHandler(this.mnuContextAddNewFolder_Click); + // + // mnuContextSep1 + // + this.mnuContextSep1.Name = "mnuContextSep1"; + this.mnuContextSep1.Size = new System.Drawing.Size(190, 6); + // + // mnuContextCut + // + this.mnuContextCut.Name = "mnuContextCut"; + this.mnuContextCut.ShortcutKeyDisplayString = "Ctrl+X"; + this.mnuContextCut.Size = new System.Drawing.Size(193, 22); + this.mnuContextCut.Text = "Cu&t"; + // + // mnuContextCopy + // + this.mnuContextCopy.Name = "mnuContextCopy"; + this.mnuContextCopy.ShortcutKeyDisplayString = "Ctrl+C"; + this.mnuContextCopy.Size = new System.Drawing.Size(193, 22); + this.mnuContextCopy.Text = "&Copy"; + // + // mnuContextPaste + // + this.mnuContextPaste.Name = "mnuContextPaste"; + this.mnuContextPaste.ShortcutKeyDisplayString = "Ctrl+V"; + this.mnuContextPaste.Size = new System.Drawing.Size(193, 22); + this.mnuContextPaste.Text = "&Paste"; + // + // deleteToolStripMenuItem + // + this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; + this.deleteToolStripMenuItem.ShortcutKeyDisplayString = "Del"; + this.deleteToolStripMenuItem.Size = new System.Drawing.Size(193, 22); + this.deleteToolStripMenuItem.Text = "&Delete"; + // + // toolStripMenuItem3 + // + this.toolStripMenuItem3.Name = "toolStripMenuItem3"; + this.toolStripMenuItem3.Size = new System.Drawing.Size(190, 6); + // + // mnuContextProperties + // + this.mnuContextProperties.Name = "mnuContextProperties"; + this.mnuContextProperties.ShortcutKeyDisplayString = "Alt+Enter"; + this.mnuContextProperties.Size = new System.Drawing.Size(193, 22); + this.mnuContextProperties.Text = "P&roperties..."; + // + // imlSmallIcons + // + this.imlSmallIcons.ColorDepth = System.Windows.Forms.ColorDepth.Depth32Bit; + this.imlSmallIcons.ImageSize = new System.Drawing.Size(16, 16); + this.imlSmallIcons.TransparentColor = System.Drawing.Color.Transparent; + // + // mnuContextAddNewProject + // + this.mnuContextAddNewProject.Name = "mnuContextAddNewProject"; + this.mnuContextAddNewProject.Size = new System.Drawing.Size(160, 22); + this.mnuContextAddNewProject.Text = "&New Project..."; + this.mnuContextAddNewProject.Click += new System.EventHandler(this.mnuContextAddNewProject_Click); + // + // mnuContextAddExistingProject + // + this.mnuContextAddExistingProject.Name = "mnuContextAddExistingProject"; + this.mnuContextAddExistingProject.Size = new System.Drawing.Size(160, 22); + this.mnuContextAddExistingProject.Text = "&Existing Project.."; + this.mnuContextAddExistingProject.Click += new System.EventHandler(this.mnuContextAddExistingProject_Click); + // + // mnuContextAddSep1 + // + this.mnuContextAddSep1.Name = "mnuContextAddSep1"; + this.mnuContextAddSep1.Size = new System.Drawing.Size(157, 6); + // + // SolutionExplorer + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.tv); + this.Controls.Add(this.txtFilter); + this.Controls.Add(this.cbToolBar1); + this.Name = "SolutionExplorer"; + this.Size = new System.Drawing.Size(322, 379); + this.cbToolBar1.ResumeLayout(false); + this.cbToolBar1.PerformLayout(); + this.mnuContext.ResumeLayout(false); + this.ResumeLayout(false); + this.PerformLayout(); } @@ -407,7 +435,7 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls private System.Windows.Forms.ToolStripMenuItem mnuContextAdd; private System.Windows.Forms.ToolStripMenuItem mnuContextAddNewItem; private System.Windows.Forms.ToolStripMenuItem mnuContextAddExistingItem; - private System.Windows.Forms.ToolStripSeparator mnuContextAddSep1; + private System.Windows.Forms.ToolStripSeparator mnuContextAddSep2; private System.Windows.Forms.ToolStripMenuItem mnuContextAddNewFolder; private System.Windows.Forms.ToolStripSeparator mnuContextSep1; private System.Windows.Forms.ToolStripMenuItem mnuContextCut; @@ -417,6 +445,9 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls private System.Windows.Forms.ToolStripSeparator toolStripMenuItem3; private System.Windows.Forms.ToolStripMenuItem mnuContextProperties; private System.Windows.Forms.ImageList imlSmallIcons; - private System.Windows.Forms.ToolStripSeparator mnuContextAddSep2; + private System.Windows.Forms.ToolStripSeparator mnuContextAddSep3; + private System.Windows.Forms.ToolStripMenuItem mnuContextAddNewProject; + private System.Windows.Forms.ToolStripMenuItem mnuContextAddExistingProject; + private System.Windows.Forms.ToolStripSeparator mnuContextAddSep1; } } diff --git a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.cs b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.cs index 3c596b7b..91ee7bec 100644 --- a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.cs +++ b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/Controls/SolutionExplorer.cs @@ -91,6 +91,8 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls tnSolution.Nodes.Add(tnProject); } tv.Nodes.Add(tnSolution); + + tnSolution.Expand(); } private void LoadFileSystem(ProjectFileSystem pfs, TreeNode tnParent) @@ -221,7 +223,7 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls mnuContextAdd.DropDownItems.Clear(); mnuContextAdd.DropDownItems.Add(mnuContextAddNewItem); mnuContextAdd.DropDownItems.Add(mnuContextAddExistingItem); - mnuContextAdd.DropDownItems.Add(mnuContextAddSep1); + mnuContextAdd.DropDownItems.Add(mnuContextAddSep2); mnuContextAdd.DropDownItems.Add(mnuContextAddNewFolder); if (tv.SelectedNode.Tag is SolutionObjectModel) { @@ -241,7 +243,7 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls { if (proj.ProjectType.ItemShortcuts.Count > 0) { - mnuContextAdd.DropDownItems.Add(mnuContextAddSep2); + mnuContextAdd.DropDownItems.Add(mnuContextAddSep3); foreach (ProjectTypeItemShortcut its in proj.ProjectType.ItemShortcuts) { ToolStripMenuItem tsmi = new ToolStripMenuItem(); @@ -261,5 +263,51 @@ namespace UniversalEditor.UserInterface.WindowsForms.Controls WindowsFormsEngine.LastWindow.NewFile(); } + + private void mnuContextAddNewProject_Click(object sender, EventArgs e) + { + ParentWindow.AddSolutionProjectNew(); + } + + private void mnuContextAddExistingProject_Click(object sender, EventArgs e) + { + ParentWindow.AddSolutionProjectExisting(); + } + + private void mnuContextAddNewItem_Click(object sender, EventArgs e) + { + if (tv.SelectedNode.Tag is SolutionObjectModel) + { + // we add a new project to the solution + ParentWindow.AddSolutionProjectNew(); + } + else + { + // we add a new item to the project + ParentWindow.AddProjectItemNew(); + } + } + + private void mnuContextAddExistingItem_Click(object sender, EventArgs e) + { + if (tv.SelectedNode.Tag is SolutionObjectModel) + { + ParentWindow.AddSolutionProjectExisting(); + } + else + { + ParentWindow.AddProjectItemExisting(); + } + } + + private void mnuContextAddNewFolder_Click(object sender, EventArgs e) + { + TreeNode tn = new TreeNode(); + tn.Text = "NewFolder1"; + tv.SelectedNode.Nodes.Add(tn); + tv.SelectedNode = tn; + + tn.BeginEdit(); + } } } diff --git a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.Designer.cs b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.Designer.cs index bba18fdb..b40159e2 100644 --- a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.Designer.cs +++ b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.Designer.cs @@ -784,6 +784,7 @@ namespace UniversalEditor.UserInterface.WindowsForms | System.Windows.Forms.Keys.A))); this.mnuProjectAddNewItem.Size = new System.Drawing.Size(245, 22); this.mnuProjectAddNewItem.Text = "Add Ne&w Item..."; + this.mnuProjectAddNewItem.Click += new System.EventHandler(this.mnuProjectAddNewItem_Click); // // mnuProjectAddExistingItem // @@ -792,6 +793,7 @@ namespace UniversalEditor.UserInterface.WindowsForms | System.Windows.Forms.Keys.A))); this.mnuProjectAddExistingItem.Size = new System.Drawing.Size(245, 22); this.mnuProjectAddExistingItem.Text = "Add Existin&g Item..."; + this.mnuProjectAddExistingItem.Click += new System.EventHandler(this.mnuProjectAddExistingItem_Click); // // mnuProjectSep1 // @@ -803,12 +805,14 @@ namespace UniversalEditor.UserInterface.WindowsForms this.mnuProjectExclude.Name = "mnuProjectExclude"; this.mnuProjectExclude.Size = new System.Drawing.Size(245, 22); this.mnuProjectExclude.Text = "Exclude from Pro&ject"; + this.mnuProjectExclude.Click += new System.EventHandler(this.mnuProjectExclude_Click); // // mnuProjectShowAllFiles // this.mnuProjectShowAllFiles.Name = "mnuProjectShowAllFiles"; this.mnuProjectShowAllFiles.Size = new System.Drawing.Size(245, 22); this.mnuProjectShowAllFiles.Text = "Sh&ow All Files"; + this.mnuProjectShowAllFiles.Click += new System.EventHandler(this.mnuProjectShowAllFiles_Click); // // mnuProjectSep2 // @@ -820,6 +824,7 @@ namespace UniversalEditor.UserInterface.WindowsForms this.mnuProjectProperties.Name = "mnuProjectProperties"; this.mnuProjectProperties.Size = new System.Drawing.Size(245, 22); this.mnuProjectProperties.Text = "Project &Properties..."; + this.mnuProjectProperties.Click += new System.EventHandler(this.mnuProjectProperties_Click); // // mnuBookmarks // diff --git a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs index 03dfc7ea..a24f0bd7 100644 --- a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs +++ b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.cs @@ -531,10 +531,11 @@ namespace UniversalEditor.UserInterface.WindowsForms */ } } - public void NewProject() + public void NewProject(bool combineObjects = false) { NewDialog dlg = new NewDialog(); dlg.Mode = NewDialogMode.Project; + dlg.CombineObjects = combineObjects; if (dlg.ShowDialog() == System.Windows.Forms.DialogResult.OK) { SolutionObjectModel solution = null; @@ -817,7 +818,7 @@ namespace UniversalEditor.UserInterface.WindowsForms } */ - public void OpenProject() + public void OpenProject(bool combineObjects = false) { SolutionObjectModel solution = new SolutionObjectModel(); OpenFileDialog ofd = new OpenFileDialog(); @@ -825,12 +826,22 @@ namespace UniversalEditor.UserInterface.WindowsForms ofd.Multiselect = false; if (ofd.ShowDialog() == System.Windows.Forms.DialogResult.OK) { - OpenProject(ofd.FileName); + OpenProject(ofd.FileName, combineObjects); } } - public void OpenProject(string FileName) + public void OpenProject(string FileName, bool combineObjects = false) { - CurrentSolution = UniversalEditor.Common.Reflection.GetAvailableObjectModel(FileName); + SolutionObjectModel solution = UniversalEditor.Common.Reflection.GetAvailableObjectModel(FileName); + if (combineObjects) + { + SolutionObjectModel oldsolution = CurrentSolution; + solution.CopyTo(oldsolution); + CurrentSolution = oldsolution; + } + else + { + CurrentSolution = solution; + } } public void SaveFile() @@ -1165,6 +1176,26 @@ namespace UniversalEditor.UserInterface.WindowsForms } return current; } + + + #region Project + public void AddSolutionProjectNew() + { + NewProject(true); + } + public void AddSolutionProjectExisting() + { + OpenProject(true); + } + public void AddProjectItemNew() + { + + } + public void AddProjectItemExisting() + { + + } + #endregion #endregion #region Event Handlers @@ -1373,6 +1404,32 @@ namespace UniversalEditor.UserInterface.WindowsForms private void mnuViewStartPage_Click(object sender, EventArgs e) { ShowStartPage(); + } + #endregion + #region Project + private void mnuProjectAddNewItem_Click(object sender, EventArgs e) + { + AddProjectItemNew(); + } + + private void mnuProjectAddExistingItem_Click(object sender, EventArgs e) + { + AddProjectItemExisting(); + } + + private void mnuProjectExclude_Click(object sender, EventArgs e) + { + + } + + private void mnuProjectShowAllFiles_Click(object sender, EventArgs e) + { + + } + + private void mnuProjectProperties_Click(object sender, EventArgs e) + { + } #endregion #endregion diff --git a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.resx b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.resx index 4e5dfb4c..e52c47de 100644 --- a/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.resx +++ b/CSharp/Environments/WindowsForms/Engines/UniversalEditor.UserInterface.WindowsForms.DesktopApplication/MainWindow.resx @@ -123,6 +123,9 @@ 226, 17 + + 460, 17 + @@ -226,9 +229,6 @@ 77KY4E9xSLm2WvAvzeuz/a3oB0747y0N60d/AAAAAElFTkSuQmCC - - 460, 17 - iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 diff --git a/CSharp/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs b/CSharp/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs index cd267b75..d2ce83d6 100644 --- a/CSharp/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs +++ b/CSharp/Libraries/UniversalEditor.UserInterface/IHostApplicationWindow.cs @@ -8,12 +8,12 @@ namespace UniversalEditor.UserInterface public interface IHostApplicationWindow { void NewFile(); - void NewProject(); + void NewProject(bool combineObjects = false); void OpenFile(); void OpenFile(params string[] FileNames); - void OpenProject(); - void OpenProject(string FileName); + void OpenProject(bool combineObjects = false); + void OpenProject(string FileName, bool combineObjects = false); void SaveFile(); void SaveFileAs();